jenkins-bot has submitted this change and it was merged.
Change subject: Move ChangeHandler and friends to new namespace.
......................................................................
Move ChangeHandler and friends to new namespace.
This introduces the Wikibase\Client\Changes namespace
Change-Id: I7ef4c2004825c54e2f22c2326eae4096f9f8955a
---
M client/WikibaseClient.hooks.php
R client/includes/Changes/AffectedPagesFinder.php
R client/includes/Changes/ChangeHandler.php
R client/includes/Changes/PageUpdater.php
R client/includes/Changes/WikiPageUpdater.php
M client/includes/WikibaseClient.php
R client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
R client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
R client/tests/phpunit/includes/Changes/MockPageUpdater.php
M client/tests/phpunit/includes/WikibaseClientTest.php
M lib/includes/ChangeNotificationJob.php
11 files changed, 29 insertions(+), 18 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php
index 3879270..b7eccc6 100644
--- a/client/WikibaseClient.hooks.php
+++ b/client/WikibaseClient.hooks.php
@@ -24,6 +24,7 @@
use Title;
use UnexpectedValueException;
use User;
+use Wikibase\Client\Changes\ChangeHandler;
use Wikibase\Client\Hooks\BaseTemplateAfterPortletHandler;
use Wikibase\Client\Hooks\BeforePageDisplayHandler;
use Wikibase\Client\Hooks\ChangesPageWikibaseFilterHandler;
diff --git a/client/includes/AffectedPagesFinder.php
b/client/includes/Changes/AffectedPagesFinder.php
similarity index 100%
rename from client/includes/AffectedPagesFinder.php
rename to client/includes/Changes/AffectedPagesFinder.php
diff --git a/client/includes/ChangeHandler.php
b/client/includes/Changes/ChangeHandler.php
similarity index 98%
rename from client/includes/ChangeHandler.php
rename to client/includes/Changes/ChangeHandler.php
index 98a192b..5ff4576 100644
--- a/client/includes/ChangeHandler.php
+++ b/client/includes/Changes/ChangeHandler.php
@@ -1,15 +1,20 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Client\Changes;
use InvalidArgumentException;
use MWException;
use Title;
+use Wikibase\Change;
use Wikibase\Client\Changes\AffectedPagesFinder;
+use Wikibase\Client\Changes\PageUpdater;
use Wikibase\DataModel\Entity\Diff\EntityDiff;
use Wikibase\DataModel\Entity\Diff\ItemDiff;
+use Wikibase\EntityChange;
+use Wikibase\ItemChange;
use Wikibase\Lib\Changes\EntityChangeFactory;
use Wikibase\Lib\Store\EntityRevisionLookup;
+use Wikibase\SiteLinkCommentCreator;
/**
* Interface for change handling. Whenever a change is detected,
@@ -344,7 +349,7 @@
$coalesced = array_merge( $coalesced, $entityChanges );
}
- usort( $coalesced,
'Wikibase\ChangeHandler::compareChangesByTimestamp' );
+ usort( $coalesced,
'Wikibase\Client\Changes\ChangeHandler::compareChangesByTimestamp' );
wfDebugLog( __CLASS__, __METHOD__ . ": coalesced "
. count( $changes ) . " into " . count( $coalesced ) .
" changes" );
diff --git a/client/includes/PageUpdater.php
b/client/includes/Changes/PageUpdater.php
similarity index 96%
rename from client/includes/PageUpdater.php
rename to client/includes/Changes/PageUpdater.php
index 9e02a72..5246cce 100644
--- a/client/includes/PageUpdater.php
+++ b/client/includes/Changes/PageUpdater.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Client\Changes;
/**
* Service interface for triggering different kinds of page updates
diff --git a/client/includes/WikiPageUpdater.php
b/client/includes/Changes/WikiPageUpdater.php
similarity index 98%
rename from client/includes/WikiPageUpdater.php
rename to client/includes/Changes/WikiPageUpdater.php
index 2f7a02f..17efb69 100644
--- a/client/includes/WikiPageUpdater.php
+++ b/client/includes/Changes/WikiPageUpdater.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Client\Changes;
use Job;
use JobQueueGroup;
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 8ca252d..89dfc4d 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -14,7 +14,7 @@
use SiteSQLStore;
use SiteStore;
use ValueFormatters\FormatterOptions;
-use Wikibase\ChangeHandler;
+use Wikibase\Client\Changes\ChangeHandler;
use Wikibase\Client\Changes\AffectedPagesFinder;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator;
@@ -52,7 +52,7 @@
use Wikibase\Settings;
use Wikibase\SettingsArray;
use Wikibase\StringNormalizer;
-use Wikibase\WikiPageUpdater;
+use Wikibase\Client\Changes\WikiPageUpdater;
/**
* Top level factory for the WikibaseClient extension.
diff --git a/client/tests/phpunit/includes/AffectedPagesFinderTest.php
b/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
similarity index 98%
rename from client/tests/phpunit/includes/AffectedPagesFinderTest.php
rename to client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
index 63fd376..e28d88a 100644
--- a/client/tests/phpunit/includes/AffectedPagesFinderTest.php
+++ b/client/tests/phpunit/includes/Changes/AffectedPagesFinderTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Client\Tests\Changes;
use ArrayIterator;
use Title;
@@ -11,6 +11,7 @@
use Wikibase\ItemChange;
use Wikibase\Lib\Store\StorageException;
use Wikibase\Client\Changes\AffectedPagesFinder;
+use Wikibase\Test\TestChanges;
/**
* @covers Wikibase\Client\Changes\AffectedPagesFinder
diff --git a/client/tests/phpunit/includes/ChangeHandlerTest.php
b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
similarity index 98%
rename from client/tests/phpunit/includes/ChangeHandlerTest.php
rename to client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
index ff07189..ca77828 100644
--- a/client/tests/phpunit/includes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Client\Tests\Changes;
use ArrayIterator;
use Diff\Differ\MapDiffer;
@@ -8,7 +8,7 @@
use SiteList;
use Title;
use Wikibase\Change;
-use Wikibase\ChangeHandler;
+use Wikibase\Client\Changes\ChangeHandler;
use Wikibase\ChangesTable;
use Wikibase\Client\Changes\AffectedPagesFinder;
use Wikibase\Client\Store\TitleFactory;
@@ -23,10 +23,13 @@
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Lib\Store\StorageException;
use Wikibase\NamespaceChecker;
-use Wikibase\PageUpdater;
+use Wikibase\Client\Changes\PageUpdater;
+use Wikibase\Client\Tests\Changes\MockPageUpdater;
+use Wikibase\Test\MockRepository;
+use Wikibase\Test\TestChanges;
/**
- * @covers Wikibase\ChangeHandler
+ * @covers Wikibase\Client\Changes\ChangeHandler
*
* @group Wikibase
* @group WikibaseClient
@@ -776,7 +779,7 @@
$handleChangeCallCount = 0;
$handleChangesCallCount = 0;
- $changeHandler = $this->getMockBuilder(
'Wikibase\ChangeHandler' )
+ $changeHandler = $this->getMockBuilder(
'Wikibase\Client\Changes\ChangeHandler' )
->disableOriginalConstructor()->setMethods( array(
'coalesceChanges', 'handleChange' ) )->getMock();
$changeHandler->expects( $this->once() )
diff --git a/client/tests/phpunit/MockPageUpdater.php
b/client/tests/phpunit/includes/Changes/MockPageUpdater.php
similarity index 94%
rename from client/tests/phpunit/MockPageUpdater.php
rename to client/tests/phpunit/includes/Changes/MockPageUpdater.php
index c44e6c4..5cc70d7 100644
--- a/client/tests/phpunit/MockPageUpdater.php
+++ b/client/tests/phpunit/includes/Changes/MockPageUpdater.php
@@ -1,9 +1,9 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Client\Tests\Changes;
use Title;
-use Wikibase\PageUpdater;
+use Wikibase\Client\Changes\PageUpdater;
/**
* Mock version of the service object for triggering different kinds of page
updates
diff --git a/client/tests/phpunit/includes/WikibaseClientTest.php
b/client/tests/phpunit/includes/WikibaseClientTest.php
index 75b1416..03b378a 100644
--- a/client/tests/phpunit/includes/WikibaseClientTest.php
+++ b/client/tests/phpunit/includes/WikibaseClientTest.php
@@ -1,18 +1,18 @@
<?php
-namespace Wikibase\Test;
+namespace Wikibase\Client;
use Language;
use MediaWikiSite;
use SiteStore;
use ValueFormatters\FormatterOptions;
-use Wikibase\Client\WikibaseClient;
use Wikibase\DataModel\Entity\Item;
use Wikibase\Lib\SnakFormatter;
use Wikibase\SettingsArray;
+use Wikibase\Test\MockSiteStore;
/**
- * @covers Wikibase\Client\WikibaseClient
+ * @covers Wikibase\Client\Changes\WikibaseClient
*
* @group Wikibase
* @group WikibaseClient
@@ -214,7 +214,7 @@
public function testGetChangeHandler() {
$handler = $this->getDefaultInstance()->getChangeHandler();
- $this->assertInstanceOf( 'Wikibase\ChangeHandler', $handler );
+ $this->assertInstanceOf(
'Wikibase\Client\Changes\ChangeHandler', $handler );
}
public function testGetParserFunctionRegistrant() {
diff --git a/lib/includes/ChangeNotificationJob.php
b/lib/includes/ChangeNotificationJob.php
index b9f8f9d..fdc8be4 100644
--- a/lib/includes/ChangeNotificationJob.php
+++ b/lib/includes/ChangeNotificationJob.php
@@ -2,6 +2,7 @@
namespace Wikibase;
+use Wikibase\Client\Changes\ChangeHandler;
use Wikibase\Client\WikibaseClient;
/**
--
To view, visit https://gerrit.wikimedia.org/r/170967
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ef4c2004825c54e2f22c2326eae4096f9f8955a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Adrian Lang <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
