jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371059 )

Change subject: Make trivial classes in the lib/includes/Store folder PSR-4 
compatible
......................................................................


Make trivial classes in the lib/includes/Store folder PSR-4 compatible

This is split from I8ff9c1f, but focuses on classes that are exclusively
used in the Wikibase.git code base. I made sure no other code base is
affected (you can see a full list in T172368).

While I8ff9c1f is still heavily WIP, this patch here can be merged ASAP.

Bug: T172368
Change-Id: I0e085a49e11d19c68d9ab90f9e86a0fa79c7de4a
---
M client/includes/Store/Sql/DirectSqlStore.php
M lib/includes/Formatters/WikibaseSnakFormatterBuilders.php
M lib/includes/PropertyInfoSnakUrlExpander.php
M lib/includes/Store/ChunkAccess.php
M lib/includes/Store/ChunkCache.php
M lib/includes/Store/FieldPropertyInfoProvider.php
M lib/includes/Store/PropertyInfoProvider.php
M lib/includes/Store/RedirectRevision.php
M lib/includes/Store/Sql/EntityChangeLookup.php
M lib/includes/Store/TermPropertyLabelResolver.php
M lib/tests/phpunit/MockRepository.php
M lib/tests/phpunit/PropertyInfoSnakUrlExpanderTest.php
M lib/tests/phpunit/Store/ChunkCacheTest.php
M lib/tests/phpunit/Store/FieldPropertyInfoProviderTest.php
M lib/tests/phpunit/Store/MockChunkAccess.php
M lib/tests/phpunit/Store/RedirectRevisionTest.php
M lib/tests/phpunit/Store/TermPropertyLabelResolverTest.php
M repo/includes/ChangeDispatcher.php
M repo/includes/LinkedData/EntityDataRequestHandler.php
M repo/includes/LinkedData/EntityDataSerializationService.php
M repo/maintenance/dispatchChanges.php
M repo/tests/phpunit/includes/ChangeDispatcherTest.php
M repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
23 files changed, 29 insertions(+), 29 deletions(-)

Approvals:
  Ladsgroup: Looks good to me, approved
  Lucas Werkmeister (WMDE): Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/client/includes/Store/Sql/DirectSqlStore.php 
b/client/includes/Store/Sql/DirectSqlStore.php
index dc31f47..be8e622 100644
--- a/client/includes/Store/Sql/DirectSqlStore.php
+++ b/client/includes/Store/Sql/DirectSqlStore.php
@@ -10,7 +10,7 @@
 use Wikibase\Lib\Store\PropertyInfoLookup;
 use Wikibase\StringNormalizer;
 use Wikibase\TermIndex;
-use Wikibase\TermPropertyLabelResolver;
+use Wikibase\Lib\Store\TermPropertyLabelResolver;
 use Wikibase\Lib\Store\Sql\TermSqlIndex;
 use Wikimedia\Rdbms\SessionConsistentConnectionManager;
 use Wikibase\Client\Store\UsageUpdater;
diff --git a/lib/includes/Formatters/WikibaseSnakFormatterBuilders.php 
b/lib/includes/Formatters/WikibaseSnakFormatterBuilders.php
index c49d004..9a7c227 100644
--- a/lib/includes/Formatters/WikibaseSnakFormatterBuilders.php
+++ b/lib/includes/Formatters/WikibaseSnakFormatterBuilders.php
@@ -8,6 +8,7 @@
 use Wikibase\DataModel\Services\Lookup\PropertyDataTypeLookup;
 use Wikibase\Lib\Formatters\HtmlExternalIdentifierFormatter;
 use Wikibase\Lib\Formatters\WikitextExternalIdentifierFormatter;
+use Wikibase\Lib\Store\FieldPropertyInfoProvider;
 use Wikibase\Lib\Store\PropertyInfoLookup;
 
 /**
diff --git a/lib/includes/PropertyInfoSnakUrlExpander.php 
b/lib/includes/PropertyInfoSnakUrlExpander.php
index 2352628..f7c4bcf 100644
--- a/lib/includes/PropertyInfoSnakUrlExpander.php
+++ b/lib/includes/PropertyInfoSnakUrlExpander.php
@@ -4,6 +4,7 @@
 
 use DataValues\StringValue;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
+use Wikibase\Lib\Store\PropertyInfoProvider;
 use Wikimedia\Assert\Assert;
 
 /**
diff --git a/lib/includes/Store/ChunkAccess.php 
b/lib/includes/Store/ChunkAccess.php
index 2201033..e02a170 100644
--- a/lib/includes/Store/ChunkAccess.php
+++ b/lib/includes/Store/ChunkAccess.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase;
+namespace Wikibase\Lib\Store;
 
 /**
  * Interface for DAO objects providing chunked access based on sequential 
indexes.
diff --git a/lib/includes/Store/ChunkCache.php 
b/lib/includes/Store/ChunkCache.php
index aa9a8ab..c2d335a 100644
--- a/lib/includes/Store/ChunkCache.php
+++ b/lib/includes/Store/ChunkCache.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase;
+namespace Wikibase\Lib\Store;
 
 use MWException;
 
diff --git a/lib/includes/Store/FieldPropertyInfoProvider.php 
b/lib/includes/Store/FieldPropertyInfoProvider.php
index 11ac004..851fde5 100644
--- a/lib/includes/Store/FieldPropertyInfoProvider.php
+++ b/lib/includes/Store/FieldPropertyInfoProvider.php
@@ -1,10 +1,8 @@
 <?php
 
-namespace Wikibase\Lib;
+namespace Wikibase\Lib\Store;
 
 use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Lib\Store\PropertyInfoLookup;
-use Wikibase\Lib\Store\StorageException;
 use Wikimedia\Assert\Assert;
 
 /**
diff --git a/lib/includes/Store/PropertyInfoProvider.php 
b/lib/includes/Store/PropertyInfoProvider.php
index dabeae9..b32373c 100644
--- a/lib/includes/Store/PropertyInfoProvider.php
+++ b/lib/includes/Store/PropertyInfoProvider.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace Wikibase\Lib;
+namespace Wikibase\Lib\Store;
 
 use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Lib\Store\StorageException;
 
 /**
  * Service for providing a specific information about properties.
diff --git a/lib/includes/Store/RedirectRevision.php 
b/lib/includes/Store/RedirectRevision.php
index 4ae90f9..41dae74 100644
--- a/lib/includes/Store/RedirectRevision.php
+++ b/lib/includes/Store/RedirectRevision.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wikibase;
+namespace Wikibase\Lib\Store;
 
 use InvalidArgumentException;
 use Wikibase\DataModel\Entity\EntityRedirect;
diff --git a/lib/includes/Store/Sql/EntityChangeLookup.php 
b/lib/includes/Store/Sql/EntityChangeLookup.php
index d44968e..24d601b 100644
--- a/lib/includes/Store/Sql/EntityChangeLookup.php
+++ b/lib/includes/Store/Sql/EntityChangeLookup.php
@@ -3,7 +3,7 @@
 namespace Wikibase\Lib\Store\Sql;
 
 use DBAccessBase;
-use Wikibase\ChunkAccess;
+use Wikibase\Lib\Store\ChunkAccess;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\EntityChange;
 use Wikibase\Lib\Changes\EntityChangeFactory;
diff --git a/lib/includes/Store/TermPropertyLabelResolver.php 
b/lib/includes/Store/TermPropertyLabelResolver.php
index fbba202..d3218d4 100644
--- a/lib/includes/Store/TermPropertyLabelResolver.php
+++ b/lib/includes/Store/TermPropertyLabelResolver.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Wikibase;
+namespace Wikibase\Lib\Store;
 
 use BagOStuff;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\Property;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
-use Wikibase\Lib\Store\TermIndexSearchCriteria;
+use Wikibase\TermIndex;
 
 /**
  * Resolves property labels (which are unique per language) into entity IDs
diff --git a/lib/tests/phpunit/MockRepository.php 
b/lib/tests/phpunit/MockRepository.php
index 6ad526e..81f2075 100644
--- a/lib/tests/phpunit/MockRepository.php
+++ b/lib/tests/phpunit/MockRepository.php
@@ -31,7 +31,7 @@
 use Wikibase\Lib\Store\SiteLinkStore;
 use Wikibase\Lib\Store\StorageException;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
-use Wikibase\RedirectRevision;
+use Wikibase\Lib\Store\RedirectRevision;
 
 /**
  * @deprecated Try to use a simpler fake. The complexity and coupling of this
diff --git a/lib/tests/phpunit/PropertyInfoSnakUrlExpanderTest.php 
b/lib/tests/phpunit/PropertyInfoSnakUrlExpanderTest.php
index f7cfd05..b46f59d 100644
--- a/lib/tests/phpunit/PropertyInfoSnakUrlExpanderTest.php
+++ b/lib/tests/phpunit/PropertyInfoSnakUrlExpanderTest.php
@@ -6,8 +6,8 @@
 use Wikibase\DataModel\Entity\EntityIdValue;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
-use Wikibase\Lib\FieldPropertyInfoProvider;
-use Wikibase\Lib\PropertyInfoProvider;
+use Wikibase\Lib\Store\FieldPropertyInfoProvider;
+use Wikibase\Lib\Store\PropertyInfoProvider;
 use Wikibase\Lib\PropertyInfoSnakUrlExpander;
 use Wikibase\Lib\Store\PropertyInfoLookup;
 use Wikibase\Lib\Tests\Store\MockPropertyInfoLookup;
diff --git a/lib/tests/phpunit/Store/ChunkCacheTest.php 
b/lib/tests/phpunit/Store/ChunkCacheTest.php
index 9548dab..041489e 100644
--- a/lib/tests/phpunit/Store/ChunkCacheTest.php
+++ b/lib/tests/phpunit/Store/ChunkCacheTest.php
@@ -2,10 +2,10 @@
 
 namespace Wikibase\Lib\Tests\Store;
 
-use Wikibase\ChunkCache;
+use Wikibase\Lib\Store\ChunkCache;
 
 /**
- * @covers Wikibase\ChunkCache
+ * @covers Wikibase\Lib\Store\ChunkCache
  *
  * @group Wikibase
  *
diff --git a/lib/tests/phpunit/Store/FieldPropertyInfoProviderTest.php 
b/lib/tests/phpunit/Store/FieldPropertyInfoProviderTest.php
index 8b11e96..e1ae396 100644
--- a/lib/tests/phpunit/Store/FieldPropertyInfoProviderTest.php
+++ b/lib/tests/phpunit/Store/FieldPropertyInfoProviderTest.php
@@ -4,11 +4,11 @@
 
 use PHPUnit_Framework_TestCase;
 use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\Lib\FieldPropertyInfoProvider;
+use Wikibase\Lib\Store\FieldPropertyInfoProvider;
 use Wikibase\Lib\Store\PropertyInfoLookup;
 
 /**
- * @covers Wikibase\Lib\FieldPropertyInfoProvider
+ * @covers Wikibase\Lib\Store\FieldPropertyInfoProvider
  *
  * @group Wikibase
  * @group WikibaseStore
diff --git a/lib/tests/phpunit/Store/MockChunkAccess.php 
b/lib/tests/phpunit/Store/MockChunkAccess.php
index a2a564e..908621c 100644
--- a/lib/tests/phpunit/Store/MockChunkAccess.php
+++ b/lib/tests/phpunit/Store/MockChunkAccess.php
@@ -2,7 +2,7 @@
 
 namespace Wikibase\Lib\Tests\Store;
 
-use Wikibase\ChunkAccess;
+use Wikibase\Lib\Store\ChunkAccess;
 
 /**
  * Mock implementation of the ChunkAccess interface
diff --git a/lib/tests/phpunit/Store/RedirectRevisionTest.php 
b/lib/tests/phpunit/Store/RedirectRevisionTest.php
index 9cb87b7..e170afe 100644
--- a/lib/tests/phpunit/Store/RedirectRevisionTest.php
+++ b/lib/tests/phpunit/Store/RedirectRevisionTest.php
@@ -6,10 +6,10 @@
 use PHPUnit_Framework_TestCase;
 use Wikibase\DataModel\Entity\EntityRedirect;
 use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\RedirectRevision;
+use Wikibase\Lib\Store\RedirectRevision;
 
 /**
- * @covers Wikibase\RedirectRevision
+ * @covers Wikibase\Lib\Store\RedirectRevision
  *
  * @group Wikibase
  * @group WikibaseStore
diff --git a/lib/tests/phpunit/Store/TermPropertyLabelResolverTest.php 
b/lib/tests/phpunit/Store/TermPropertyLabelResolverTest.php
index 49d1737..0b81739 100644
--- a/lib/tests/phpunit/Store/TermPropertyLabelResolverTest.php
+++ b/lib/tests/phpunit/Store/TermPropertyLabelResolverTest.php
@@ -7,10 +7,10 @@
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\DataModel\Services\Term\PropertyLabelResolver;
 use Wikibase\TermIndexEntry;
-use Wikibase\TermPropertyLabelResolver;
+use Wikibase\Lib\Store\TermPropertyLabelResolver;
 
 /**
- * @covers Wikibase\TermPropertyLabelResolver
+ * @covers Wikibase\Lib\Store\TermPropertyLabelResolver
  *
  * @group Wikibase
  * @group WikibaseStore
diff --git a/repo/includes/ChangeDispatcher.php 
b/repo/includes/ChangeDispatcher.php
index a4d7835..4eaa80a 100644
--- a/repo/includes/ChangeDispatcher.php
+++ b/repo/includes/ChangeDispatcher.php
@@ -4,7 +4,7 @@
 
 use MWException;
 use Wikibase\Change;
-use Wikibase\ChunkAccess;
+use Wikibase\Lib\Store\ChunkAccess;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\EntityChange;
 use Wikibase\ItemChange;
diff --git a/repo/includes/LinkedData/EntityDataRequestHandler.php 
b/repo/includes/LinkedData/EntityDataRequestHandler.php
index 53fbc1a..ce5dfa9 100644
--- a/repo/includes/LinkedData/EntityDataRequestHandler.php
+++ b/repo/includes/LinkedData/EntityDataRequestHandler.php
@@ -19,7 +19,7 @@
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Store\StorageException;
 use Wikibase\Lib\Store\RevisionedUnresolvedRedirectException;
-use Wikibase\RedirectRevision;
+use Wikibase\Lib\Store\RedirectRevision;
 use Wikimedia\Http\HttpAcceptNegotiator;
 use Wikimedia\Http\HttpAcceptParser;
 
diff --git a/repo/includes/LinkedData/EntityDataSerializationService.php 
b/repo/includes/LinkedData/EntityDataSerializationService.php
index 02ba28b..2c09146 100644
--- a/repo/includes/LinkedData/EntityDataSerializationService.php
+++ b/repo/includes/LinkedData/EntityDataSerializationService.php
@@ -26,7 +26,7 @@
 use Wikibase\Rdf\RdfBuilder;
 use Wikibase\Rdf\RdfProducer;
 use Wikibase\Rdf\RdfVocabulary;
-use Wikibase\RedirectRevision;
+use Wikibase\Lib\Store\RedirectRevision;
 use Wikibase\Repo\Api\ResultBuilder;
 use Wikimedia\Purtle\RdfWriterFactory;
 
diff --git a/repo/maintenance/dispatchChanges.php 
b/repo/maintenance/dispatchChanges.php
index e0343dc..9c994e4 100644
--- a/repo/maintenance/dispatchChanges.php
+++ b/repo/maintenance/dispatchChanges.php
@@ -10,6 +10,7 @@
 use MWExceptionHandler;
 use Wikibase\Lib\Reporting\ObservableMessageReporter;
 use Wikibase\Lib\Reporting\ReportingExceptionHandler;
+use Wikibase\Lib\Store\ChunkCache;
 use Wikibase\Lib\Store\Sql\EntityChangeLookup;
 use Wikibase\Repo\ChangeDispatcher;
 use Wikibase\Repo\Notifications\JobQueueChangeNotificationSender;
diff --git a/repo/tests/phpunit/includes/ChangeDispatcherTest.php 
b/repo/tests/phpunit/includes/ChangeDispatcherTest.php
index 8a04468..75b833d 100644
--- a/repo/tests/phpunit/includes/ChangeDispatcherTest.php
+++ b/repo/tests/phpunit/includes/ChangeDispatcherTest.php
@@ -9,7 +9,7 @@
 use Diff\DiffOp\DiffOpRemove;
 use PHPUnit_Framework_MockObject_Matcher_Invocation;
 use Wikibase\Change;
-use Wikibase\ChunkAccess;
+use Wikibase\Lib\Store\ChunkAccess;
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
diff --git 
a/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php 
b/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
index ac53aa4..52a0175 100644
--- 
a/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
+++ 
b/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
@@ -20,7 +20,7 @@
 use Wikibase\Lib\Store\EntityTitleLookup;
 use Wikibase\Lib\Tests\MockRepository;
 use Wikibase\Rdf\RdfVocabulary;
-use Wikibase\RedirectRevision;
+use Wikibase\Lib\Store\RedirectRevision;
 use Wikibase\Repo\LinkedData\EntityDataFormatProvider;
 use Wikibase\Repo\LinkedData\EntityDataSerializationService;
 use Wikibase\Repo\WikibaseRepo;

-- 
To view, visit https://gerrit.wikimedia.org/r/371059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e085a49e11d19c68d9ab90f9e86a0fa79c7de4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo M├Ąttig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Lucas Werkmeister (WMDE) <lucas.werkmeis...@wikimedia.de>
Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to