jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356174 )
Change subject: Change the entire client/includes/… folder to PSR-4
......................................................................
Change the entire client/includes/… folder to PSR-4
We need to start somewhere and make new code fail if the namespace is
not compatible. The client/includes/… directory is the smallest one
(92 classes) and almost fully converted in previous patches, followed
by lib/includes/… (130), and repo/includes/… (199).
I checked all moved classes if they appear in strings (before …::class
was possible) and @covers tags.
Change-Id: I91800898cebaeb2f27c3f8bf60cab6d5ee6fbf06
---
M client/WikibaseClient.php
M client/includes/ChangeNotificationJob.php
M client/includes/Hooks/BeforePageDisplayHandler.php
M client/includes/Hooks/InfoActionHookHandler.php
M client/includes/Hooks/MagicWordHookHandlers.php
M client/includes/Hooks/NoLangLinkHandler.php
M client/includes/Hooks/ParserOutputUpdateHookHandlers.php
M client/includes/Hooks/SidebarHookHandlers.php
M client/includes/Hooks/UpdateRepoHookHandlers.php
M client/includes/LangLinkHandler.php
M client/includes/Modules/SiteModule.php
M client/includes/NamespaceChecker.php
M client/includes/RepoItemLinkGenerator.php
M client/includes/Specials/SpecialUnconnectedPages.php
M client/includes/Store/ClientStore.php
M client/includes/Store/Sql/DirectSqlStore.php
M client/includes/WikibaseClient.php
M client/resources/Resources.php
M client/tests/phpunit/MockClientStore.php
M client/tests/phpunit/includes/ChangeNotificationJobTest.php
M client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
M client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
M client/tests/phpunit/includes/Hooks/NoLangLinkHandlerTest.php
M client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
M client/tests/phpunit/includes/Hooks/SidebarHookHandlersTest.php
M client/tests/phpunit/includes/Hooks/UpdateRepoHookHandlersTest.php
M client/tests/phpunit/includes/LangLinkHandlerTest.php
M client/tests/phpunit/includes/Modules/SiteModuleTest.php
M client/tests/phpunit/includes/NamespaceCheckerTest.php
M client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php
M client/tests/phpunit/includes/Specials/SpecialUnconnectedPagesTest.php
M client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
M client/tests/phpunit/includes/WikibaseClientTest.php
M composer.json
34 files changed, 58 insertions(+), 51 deletions(-)
Approvals:
Aleksey Bekh-Ivanov (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php
index 72c8be2..210f076 100644
--- a/client/WikibaseClient.php
+++ b/client/WikibaseClient.php
@@ -176,7 +176,7 @@
// job classes
$wgJobClasses['wikibase-addUsagesForPage'] =
Wikibase\Client\Store\AddUsagesForPageJob::class;
- $wgJobClasses['ChangeNotification'] =
Wikibase\ChangeNotificationJob::class;
+ $wgJobClasses['ChangeNotification'] =
Wikibase\Client\ChangeNotificationJob::class;
// api modules
$wgAPIMetaModules['wikibase'] = array(
diff --git a/client/includes/ChangeNotificationJob.php
b/client/includes/ChangeNotificationJob.php
index 40c0ec2..67cb579 100644
--- a/client/includes/ChangeNotificationJob.php
+++ b/client/includes/ChangeNotificationJob.php
@@ -1,11 +1,12 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Client;
use Job;
use Title;
use Wikibase\Client\Changes\ChangeHandler;
use Wikibase\Client\WikibaseClient;
+use Wikibase\EntityChange;
use Wikimedia\Assert\Assert;
/**
diff --git a/client/includes/Hooks/BeforePageDisplayHandler.php
b/client/includes/Hooks/BeforePageDisplayHandler.php
index 82b4c58..7af0eea 100644
--- a/client/includes/Hooks/BeforePageDisplayHandler.php
+++ b/client/includes/Hooks/BeforePageDisplayHandler.php
@@ -5,7 +5,7 @@
use OutputPage;
use Title;
use User;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
/**
* @license GPL-2.0+
diff --git a/client/includes/Hooks/InfoActionHookHandler.php
b/client/includes/Hooks/InfoActionHookHandler.php
index f881504..fc9a5c2 100644
--- a/client/includes/Hooks/InfoActionHookHandler.php
+++ b/client/includes/Hooks/InfoActionHookHandler.php
@@ -11,7 +11,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
/**
* @license GPL-2.0+
diff --git a/client/includes/Hooks/MagicWordHookHandlers.php
b/client/includes/Hooks/MagicWordHookHandlers.php
index a9e64cd..d73bfd3 100644
--- a/client/includes/Hooks/MagicWordHookHandlers.php
+++ b/client/includes/Hooks/MagicWordHookHandlers.php
@@ -6,7 +6,7 @@
use Message;
use Parser;
use ResourceLoaderContext;
-use Wikibase\NoLangLinkHandler;
+use Wikibase\Client\Hooks\NoLangLinkHandler;
use Wikibase\SettingsArray;
use Wikibase\Client\WikibaseClient;
diff --git a/client/includes/Hooks/NoLangLinkHandler.php
b/client/includes/Hooks/NoLangLinkHandler.php
index 7dc43bf..8536d64 100644
--- a/client/includes/Hooks/NoLangLinkHandler.php
+++ b/client/includes/Hooks/NoLangLinkHandler.php
@@ -1,10 +1,11 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Client\Hooks;
use Parser;
use ParserOutput;
use Wikibase\Client\WikibaseClient;
+use Wikibase\Client\NamespaceChecker;
/**
* Handles the NOEXTERNALLANGLINKS parser function.
diff --git a/client/includes/Hooks/ParserOutputUpdateHookHandlers.php
b/client/includes/Hooks/ParserOutputUpdateHookHandlers.php
index 8418b63..3de8d11 100644
--- a/client/includes/Hooks/ParserOutputUpdateHookHandlers.php
+++ b/client/includes/Hooks/ParserOutputUpdateHookHandlers.php
@@ -8,8 +8,8 @@
use Title;
use Wikibase\Client\ParserOutput\ClientParserOutputDataUpdater;
use Wikibase\Client\WikibaseClient;
-use Wikibase\LangLinkHandler;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\LangLinkHandler;
+use Wikibase\Client\NamespaceChecker;
/**
* @license GPL-2.0+
diff --git a/client/includes/Hooks/SidebarHookHandlers.php
b/client/includes/Hooks/SidebarHookHandlers.php
index 1ba2749..8f19877 100644
--- a/client/includes/Hooks/SidebarHookHandlers.php
+++ b/client/includes/Hooks/SidebarHookHandlers.php
@@ -8,8 +8,8 @@
use Skin;
use Title;
use Wikibase\Client\WikibaseClient;
-use Wikibase\NamespaceChecker;
-use Wikibase\NoLangLinkHandler;
+use Wikibase\Client\NamespaceChecker;
+use Wikibase\Client\Hooks\NoLangLinkHandler;
/**
* ParserOutput related hook handlers.
diff --git a/client/includes/Hooks/UpdateRepoHookHandlers.php
b/client/includes/Hooks/UpdateRepoHookHandlers.php
index e85a0ff..aaf87ee 100644
--- a/client/includes/Hooks/UpdateRepoHookHandlers.php
+++ b/client/includes/Hooks/UpdateRepoHookHandlers.php
@@ -12,7 +12,7 @@
use Wikibase\Client\UpdateRepo\UpdateRepoOnMove;
use Wikibase\Client\WikibaseClient;
use Wikibase\Lib\Store\SiteLinkLookup;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
use WikiPage;
/**
diff --git a/client/includes/LangLinkHandler.php
b/client/includes/LangLinkHandler.php
index 7709917..4f065b4 100644
--- a/client/includes/LangLinkHandler.php
+++ b/client/includes/LangLinkHandler.php
@@ -1,12 +1,13 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Client;
use ParserOutput;
use Site;
use SiteLookup;
use Title;
use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay;
+use Wikibase\Client\Hooks\NoLangLinkHandler;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Services\Lookup\EntityLookup;
use Wikibase\DataModel\SiteLink;
diff --git a/client/includes/Modules/SiteModule.php
b/client/includes/Modules/SiteModule.php
index 2c5d2d6..08d9257 100644
--- a/client/includes/Modules/SiteModule.php
+++ b/client/includes/Modules/SiteModule.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Client\Modules;
use MediaWikiSite;
use ResourceLoader;
diff --git a/client/includes/NamespaceChecker.php
b/client/includes/NamespaceChecker.php
index 328c859..c5ef5f5 100644
--- a/client/includes/NamespaceChecker.php
+++ b/client/includes/NamespaceChecker.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Client;
use InvalidArgumentException;
use MWNamespace;
diff --git a/client/includes/RepoItemLinkGenerator.php
b/client/includes/RepoItemLinkGenerator.php
index 84ab0bf..75927c7 100644
--- a/client/includes/RepoItemLinkGenerator.php
+++ b/client/includes/RepoItemLinkGenerator.php
@@ -6,7 +6,7 @@
use Title;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdParser;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
/**
* @license GPL-2.0+
diff --git a/client/includes/Specials/SpecialUnconnectedPages.php
b/client/includes/Specials/SpecialUnconnectedPages.php
index 5283cb4..4797c7a 100644
--- a/client/includes/Specials/SpecialUnconnectedPages.php
+++ b/client/includes/Specials/SpecialUnconnectedPages.php
@@ -8,7 +8,7 @@
use Skin;
use Title;
use Wikibase\Client\WikibaseClient;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
use Wikimedia\Rdbms\Database;
use Wikimedia\Rdbms\FakeResultWrapper;
use Wikimedia\Rdbms\ResultWrapper;
diff --git a/client/includes/Store/ClientStore.php
b/client/includes/Store/ClientStore.php
index 5a861ff..8a64d6e 100644
--- a/client/includes/Store/ClientStore.php
+++ b/client/includes/Store/ClientStore.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Client\Store;
use Wikibase\Client\RecentChanges\RecentChangesDuplicateDetector;
use Wikibase\Client\Store\UsageUpdater;
@@ -15,6 +15,7 @@
use Wikibase\Lib\Store\PropertyInfoLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Store\EntityIdLookup;
+use Wikibase\TermIndex;
/**
* Client store interface.
diff --git a/client/includes/Store/Sql/DirectSqlStore.php
b/client/includes/Store/Sql/DirectSqlStore.php
index 431b7f1..60b1019 100644
--- a/client/includes/Store/Sql/DirectSqlStore.php
+++ b/client/includes/Store/Sql/DirectSqlStore.php
@@ -1,13 +1,17 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Client\Store\Sql;
use HashBagOStuff;
use ObjectCache;
use Wikibase\Client\RecentChanges\RecentChangesDuplicateDetector;
-use Wikibase\Client\Store\Sql\PagePropsEntityIdLookup;
+use Wikibase\Client\Store\ClientStore;
use Wikibase\Lib\Store\CachingPropertyInfoLookup;
use Wikibase\Lib\Store\PropertyInfoLookup;
+use Wikibase\StringNormalizer;
+use Wikibase\TermIndex;
+use Wikibase\TermPropertyLabelResolver;
+use Wikibase\TermSqlIndex;
use Wikimedia\Rdbms\SessionConsistentConnectionManager;
use Wikibase\Client\Store\UsageUpdater;
use Wikibase\Client\Usage\Sql\SqlSubscriptionManager;
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index 33b7578..e4cb7de 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -44,7 +44,7 @@
use Wikibase\Client\RecentChanges\RecentChangeFactory;
use Wikibase\Client\Serializer\ForbiddenSerializer;
use Wikibase\Client\Store\TitleFactory;
-use Wikibase\ClientStore;
+use Wikibase\Client\Store\ClientStore;
use Wikibase\DataAccess\DispatchingServiceFactory;
use Wikibase\DataAccess\EntityDataRetrievalServiceFactory;
use Wikibase\DataAccess\RepositoryServiceContainerFactory;
@@ -64,10 +64,10 @@
use Wikibase\DataModel\Services\Lookup\RestrictedEntityLookup;
use Wikibase\DataModel\Services\Lookup\TermLookup;
use Wikibase\DataModel\Services\Term\TermBuffer;
-use Wikibase\DirectSqlStore;
+use Wikibase\Client\Store\Sql\DirectSqlStore;
use Wikibase\InternalSerialization\DeserializerFactory as
InternalDeserializerFactory;
use Wikibase\ItemChange;
-use Wikibase\LangLinkHandler;
+use Wikibase\Client\LangLinkHandler;
use Wikibase\LanguageFallbackChain;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\Changes\EntityChangeFactory;
@@ -94,7 +94,7 @@
use Wikibase\Lib\Store\WikiPagePropertyOrderProvider;
use Wikibase\Lib\WikibaseSnakFormatterBuilders;
use Wikibase\Lib\WikibaseValueFormatterBuilders;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
use Wikibase\SettingsArray;
use Wikibase\Client\RecentChanges\SiteLinkCommentCreator;
use Wikibase\StringNormalizer;
diff --git a/client/resources/Resources.php b/client/resources/Resources.php
index f36a5ce..44ea6cb 100644
--- a/client/resources/Resources.php
+++ b/client/resources/Resources.php
@@ -1,6 +1,6 @@
<?php
-use Wikibase\SiteModule;
+use Wikibase\Client\Modules\SiteModule;
return call_user_func( function() {
preg_match( '+' . preg_quote( DIRECTORY_SEPARATOR ) .
'(?:vendor|extensions)'
diff --git a/client/tests/phpunit/MockClientStore.php
b/client/tests/phpunit/MockClientStore.php
index 5c459be..0f030b7 100644
--- a/client/tests/phpunit/MockClientStore.php
+++ b/client/tests/phpunit/MockClientStore.php
@@ -6,7 +6,7 @@
use Wikibase\Client\Store\UsageUpdater;
use Wikibase\Client\Usage\NullSubscriptionManager;
use Wikibase\Client\Usage\NullUsageTracker;
-use Wikibase\ClientStore;
+use Wikibase\Client\Store\ClientStore;
use Wikibase\DataModel\Services\Entity\NullEntityPrefetcher;
use Wikibase\DataModel\Services\Lookup\EntityLookup;
use Wikibase\Lib\Store\PropertyInfoLookup;
diff --git a/client/tests/phpunit/includes/ChangeNotificationJobTest.php
b/client/tests/phpunit/includes/ChangeNotificationJobTest.php
index 3294069..220f4cb 100644
--- a/client/tests/phpunit/includes/ChangeNotificationJobTest.php
+++ b/client/tests/phpunit/includes/ChangeNotificationJobTest.php
@@ -4,10 +4,10 @@
use MediaWikiTestCase;
use Title;
-use Wikibase\ChangeNotificationJob;
+use Wikibase\Client\ChangeNotificationJob;
/**
- * @covers Wikibase\ChangeNotificationJob
+ * @covers Wikibase\Client\ChangeNotificationJob
*
* @group Wikibase
* @group WikibaseChange
diff --git
a/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
b/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
index 5fdd6da..1a622f8 100644
--- a/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
+++ b/client/tests/phpunit/includes/Hooks/BeforePageDisplayHandlerTest.php
@@ -8,7 +8,7 @@
use Title;
use User;
use Wikibase\Client\Hooks\BeforePageDisplayHandler;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
/**
* @covers Wikibase\Client\Hooks\BeforePageDisplayHandler
diff --git a/client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
b/client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
index 6615910..1b1e255 100644
--- a/client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
+++ b/client/tests/phpunit/includes/Hooks/InfoActionHookHandlerTest.php
@@ -17,7 +17,7 @@
use Wikibase\Lib\Store\LanguageFallbackLabelDescriptionLookupFactory;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Client\Usage\EntityUsage;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
/**
* @covers Wikibase\Client\Hooks\InfoActionHookHandler
diff --git a/client/tests/phpunit/includes/Hooks/NoLangLinkHandlerTest.php
b/client/tests/phpunit/includes/Hooks/NoLangLinkHandlerTest.php
index 7112219..283137c 100644
--- a/client/tests/phpunit/includes/Hooks/NoLangLinkHandlerTest.php
+++ b/client/tests/phpunit/includes/Hooks/NoLangLinkHandlerTest.php
@@ -6,11 +6,11 @@
use ParserOptions;
use ParserOutput;
use Wikibase\Client\WikibaseClient;
-use Wikibase\NamespaceChecker;
-use Wikibase\NoLangLinkHandler;
+use Wikibase\Client\NamespaceChecker;
+use Wikibase\Client\Hooks\NoLangLinkHandler;
/**
- * @covers Wikibase\NoLangLinkHandler
+ * @covers Wikibase\Client\Hooks\NoLangLinkHandler
*
* @group WikibaseClient
* @group Wikibase
diff --git
a/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
b/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
index 534c9dd..1ee25f5 100644
--- a/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
+++ b/client/tests/phpunit/includes/Hooks/ParserOutputUpdateHookHandlersTest.php
@@ -22,9 +22,9 @@
use Wikibase\DataModel\SiteLink;
use Wikibase\DataModel\SiteLinkList;
use Wikibase\DataModel\Term\Term;
-use Wikibase\LangLinkHandler;
+use Wikibase\Client\LangLinkHandler;
use Wikibase\Lib\Store\SiteLinkLookup;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
use Wikibase\Settings;
use Wikibase\SettingsArray;
use Wikibase\Lib\Tests\MockRepository;
diff --git a/client/tests/phpunit/includes/Hooks/SidebarHookHandlersTest.php
b/client/tests/phpunit/includes/Hooks/SidebarHookHandlersTest.php
index c11918c..c5da3ad 100644
--- a/client/tests/phpunit/includes/Hooks/SidebarHookHandlersTest.php
+++ b/client/tests/phpunit/includes/Hooks/SidebarHookHandlersTest.php
@@ -15,7 +15,7 @@
use Wikibase\Client\Hooks\SidebarHookHandlers;
use Wikibase\Client\WikibaseClient;
use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
use Wikibase\SettingsArray;
/**
diff --git a/client/tests/phpunit/includes/Hooks/UpdateRepoHookHandlersTest.php
b/client/tests/phpunit/includes/Hooks/UpdateRepoHookHandlersTest.php
index 9f3c9c5..1ec6506 100644
--- a/client/tests/phpunit/includes/Hooks/UpdateRepoHookHandlersTest.php
+++ b/client/tests/phpunit/includes/Hooks/UpdateRepoHookHandlersTest.php
@@ -12,7 +12,7 @@
use Wikibase\Client\Hooks\UpdateRepoHookHandlers;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\Lib\Store\SiteLinkLookup;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
/**
* @covers Wikibase\Client\Hooks\UpdateRepoHookHandlers
diff --git a/client/tests/phpunit/includes/LangLinkHandlerTest.php
b/client/tests/phpunit/includes/LangLinkHandlerTest.php
index 237a94a..88ce5a1 100644
--- a/client/tests/phpunit/includes/LangLinkHandlerTest.php
+++ b/client/tests/phpunit/includes/LangLinkHandlerTest.php
@@ -11,13 +11,13 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\SiteLink;
-use Wikibase\LangLinkHandler;
-use Wikibase\NamespaceChecker;
-use Wikibase\NoLangLinkHandler;
+use Wikibase\Client\LangLinkHandler;
+use Wikibase\Client\NamespaceChecker;
+use Wikibase\Client\Hooks\NoLangLinkHandler;
use Wikibase\Lib\Tests\MockRepository;
/**
- * @covers Wikibase\LangLinkHandler
+ * @covers Wikibase\Client\LangLinkHandler
*
* @group WikibaseClient
* @group Wikibase
diff --git a/client/tests/phpunit/includes/Modules/SiteModuleTest.php
b/client/tests/phpunit/includes/Modules/SiteModuleTest.php
index b24b956..be29cc0 100644
--- a/client/tests/phpunit/includes/Modules/SiteModuleTest.php
+++ b/client/tests/phpunit/includes/Modules/SiteModuleTest.php
@@ -4,10 +4,10 @@
use PHPUnit_Framework_TestCase;
use ResourceLoaderContext;
-use Wikibase\SiteModule;
+use Wikibase\Client\Modules\SiteModule;
/**
- * @covers Wikibase\SiteModule
+ * @covers Wikibase\Client\Modules\SiteModule
*
* @group Wikibase
* @group WikibaseClient
diff --git a/client/tests/phpunit/includes/NamespaceCheckerTest.php
b/client/tests/phpunit/includes/NamespaceCheckerTest.php
index 2bf6aae..89999dc 100644
--- a/client/tests/phpunit/includes/NamespaceCheckerTest.php
+++ b/client/tests/phpunit/includes/NamespaceCheckerTest.php
@@ -4,10 +4,10 @@
use InvalidArgumentException;
use MWNamespace;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
/**
- * @covers Wikibase\NamespaceChecker
+ * @covers Wikibase\Client\NamespaceChecker
*
* @group WikibaseClient
* @group Wikibase
diff --git a/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php
b/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php
index 48e7731..d5d60fd 100644
--- a/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php
+++ b/client/tests/phpunit/includes/RepoItemLinkGeneratorTest.php
@@ -7,7 +7,7 @@
use Wikibase\Client\RepoItemLinkGenerator;
use Wikibase\Client\RepoLinker;
use Wikibase\DataModel\Entity\ItemIdParser;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
/**
* @covers Wikibase\Client\RepoItemLinkGenerator
diff --git
a/client/tests/phpunit/includes/Specials/SpecialUnconnectedPagesTest.php
b/client/tests/phpunit/includes/Specials/SpecialUnconnectedPagesTest.php
index 2b11d5a..3078dda 100644
--- a/client/tests/phpunit/includes/Specials/SpecialUnconnectedPagesTest.php
+++ b/client/tests/phpunit/includes/Specials/SpecialUnconnectedPagesTest.php
@@ -5,7 +5,7 @@
use SpecialPageTestBase;
use Title;
use Wikibase\Client\Specials\SpecialUnconnectedPages;
-use Wikibase\NamespaceChecker;
+use Wikibase\Client\NamespaceChecker;
/**
* @covers Wikibase\Client\Specials\SpecialUnconnectedPages
diff --git a/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
b/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
index a5a435d..62c5c5c 100644
--- a/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
+++ b/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
@@ -14,7 +14,7 @@
use Wikibase\DataModel\Services\Entity\NullEntityPrefetcher;
use Wikibase\DataModel\Services\Lookup\EntityLookup;
use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
-use Wikibase\DirectSqlStore;
+use Wikibase\Client\Store\Sql\DirectSqlStore;
use Wikibase\Lib\Changes\EntityChangeFactory;
use Wikibase\Lib\EntityIdComposer;
use Wikibase\Lib\RepositoryDefinitions;
@@ -29,7 +29,7 @@
use Wikibase\WikibaseSettings;
/**
- * @covers Wikibase\DirectSqlStore
+ * @covers Wikibase\Client\Store\Sql\DirectSqlStore
*
* @group Database
* @group Wikibase
diff --git a/client/tests/phpunit/includes/WikibaseClientTest.php
b/client/tests/phpunit/includes/WikibaseClientTest.php
index 31b5a26..28e500d 100644
--- a/client/tests/phpunit/includes/WikibaseClientTest.php
+++ b/client/tests/phpunit/includes/WikibaseClientTest.php
@@ -19,14 +19,14 @@
use Wikibase\Client\ParserOutput\ClientParserOutputDataUpdater;
use Wikibase\Client\RepoLinker;
use Wikibase\Client\WikibaseClient;
-use Wikibase\ClientStore;
+use Wikibase\Client\Store\ClientStore;
use Wikibase\DataModel\DeserializerFactory;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
use Wikibase\DataModel\Services\Lookup\RestrictedEntityLookup;
use Wikibase\InternalSerialization\DeserializerFactory as
InternalDeserializerFactory;
-use Wikibase\LangLinkHandler;
+use Wikibase\Client\LangLinkHandler;
use Wikibase\LanguageFallbackChain;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\Changes\EntityChangeFactory;
diff --git a/composer.json b/composer.json
index 6586cab..ed4e2bc 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,6 @@
},
"autoload": {
"classmap": [
- "client/includes/",
"client/WikibaseClient.hooks.php",
"client/tests/phpunit/MockClientStore.php",
"lib/includes/",
--
To view, visit https://gerrit.wikimedia.org/r/356174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91800898cebaeb2f27c3f8bf60cab6d5ee6fbf06
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Legoktm <[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
