Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/163156
Change subject: Move EntityPerPage-related classes into namespaces
......................................................................
Move EntityPerPage-related classes into namespaces
Change-Id: Idd5096880f6c3ceab2cdb7b7edc734bf00689f4b
(cherry picked from commit eb4dffd77b51c287f68c35d5574a3193a0d2b9e1)
---
M repo/includes/Dumpers/JsonDumpGenerator.php
R repo/includes/IO/EntityIdReader.php
R repo/includes/IO/LineReader.php
M repo/includes/content/EntityHandler.php
M repo/includes/content/ItemHandler.php
M repo/includes/content/PropertyHandler.php
M repo/includes/store/EntityIdPager.php
M repo/includes/store/EntityPerPage.php
M repo/includes/store/Store.php
M repo/includes/store/sql/EntityPerPageBuilder.php
M repo/includes/store/sql/EntityPerPageIdPager.php
M repo/includes/store/sql/EntityPerPageTable.php
M repo/includes/store/sql/ItemsPerSiteBuilder.php
M repo/includes/store/sql/SqlStore.php
M repo/includes/store/sql/WikiPageEntityStore.php
M repo/maintenance/dumpJson.php
M repo/maintenance/rebuildEntityPerPage.php
M repo/maintenance/rebuildItemsPerSite.php
M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
R repo/tests/phpunit/includes/IO/EntityIdReaderTest.bad.txt
R repo/tests/phpunit/includes/IO/EntityIdReaderTest.php
R repo/tests/phpunit/includes/IO/EntityIdReaderTest.txt
R repo/tests/phpunit/includes/IO/LineReaderTest.php
R repo/tests/phpunit/includes/IO/LineReaderTest.txt
M repo/tests/phpunit/includes/UpdateRepoOnMoveJobTest.php
M repo/tests/phpunit/includes/store/sql/EntityPerPageBuilderTest.php
M repo/tests/phpunit/includes/store/sql/EntityPerPageIdPagerTest.php
M repo/tests/phpunit/includes/store/sql/EntityPerPageTableTest.php
M repo/tests/phpunit/includes/store/sql/ItemsPerSiteBuilderTest.php
M repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
30 files changed, 71 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/56/163156/1
diff --git a/repo/includes/Dumpers/JsonDumpGenerator.php
b/repo/includes/Dumpers/JsonDumpGenerator.php
index 30f0d3f..d443213 100644
--- a/repo/includes/Dumpers/JsonDumpGenerator.php
+++ b/repo/includes/Dumpers/JsonDumpGenerator.php
@@ -6,7 +6,6 @@
use MWContentSerializationException;
use MWException;
use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\EntityIdPager;
use Wikibase\Lib\Reporting\ExceptionHandler;
use Wikibase\Lib\Reporting\MessageReporter;
use Wikibase\Lib\Reporting\NullMessageReporter;
@@ -14,6 +13,7 @@
use Wikibase\Lib\Serializers\Serializer;
use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\StorageException;
+use Wikibase\Repo\Store\EntityIdPager;
/**
* JsonDumpGenerator generates an JSON dump of a given set of entities.
diff --git a/lib/includes/IO/EntityIdReader.php
b/repo/includes/IO/EntityIdReader.php
similarity index 97%
rename from lib/includes/IO/EntityIdReader.php
rename to repo/includes/IO/EntityIdReader.php
index 29fe597..e2b3a7d 100644
--- a/lib/includes/IO/EntityIdReader.php
+++ b/repo/includes/IO/EntityIdReader.php
@@ -1,14 +1,14 @@
<?php
-namespace Wikibase\IO;
+namespace Wikibase\Repo\IO;
use Disposable;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParsingException;
-use Wikibase\EntityIdPager;
use Wikibase\Lib\Reporting\ExceptionHandler;
use Wikibase\Lib\Reporting\RethrowingExceptionHandler;
+use Wikibase\Repo\Store\EntityIdPager;
/**
* EntityIdReader reads entity IDs from a file, one per line.
@@ -150,4 +150,4 @@
return $ids;
}
-}
\ No newline at end of file
+}
diff --git a/lib/includes/IO/LineReader.php b/repo/includes/IO/LineReader.php
similarity index 98%
rename from lib/includes/IO/LineReader.php
rename to repo/includes/IO/LineReader.php
index ed2e054..6ec1519 100644
--- a/lib/includes/IO/LineReader.php
+++ b/repo/includes/IO/LineReader.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\IO;
+namespace Wikibase\Repo\IO;
use Disposable;
use Iterator;
diff --git a/repo/includes/content/EntityHandler.php
b/repo/includes/content/EntityHandler.php
index ef24453..9b3d7f2 100644
--- a/repo/includes/content/EntityHandler.php
+++ b/repo/includes/content/EntityHandler.php
@@ -22,10 +22,10 @@
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\EntityContent;
-use Wikibase\EntityPerPage;
use Wikibase\Lib\Store\EntityContentDataCodec;
use Wikibase\Lib\Store\EntityRedirect;
use Wikibase\NamespaceUtils;
+use Wikibase\Repo\Store\EntityPerPage;
use Wikibase\TermIndex;
use Wikibase\Updates\DataUpdateAdapter;
use Wikibase\Validators\EntityValidator;
diff --git a/repo/includes/content/ItemHandler.php
b/repo/includes/content/ItemHandler.php
index 3f8c5d3..acdef3a 100644
--- a/repo/includes/content/ItemHandler.php
+++ b/repo/includes/content/ItemHandler.php
@@ -8,9 +8,9 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\EntityContent;
-use Wikibase\EntityPerPage;
use Wikibase\Lib\Store\EntityContentDataCodec;
use Wikibase\Lib\Store\SiteLinkCache;
+use Wikibase\Repo\Store\EntityPerPage;
use Wikibase\TermIndex;
use Wikibase\Updates\DataUpdateAdapter;
use Wikibase\Validators\EntityValidator;
diff --git a/repo/includes/content/PropertyHandler.php
b/repo/includes/content/PropertyHandler.php
index 2e9d074..3b7f83c 100644
--- a/repo/includes/content/PropertyHandler.php
+++ b/repo/includes/content/PropertyHandler.php
@@ -10,10 +10,10 @@
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\EntityContent;
-use Wikibase\EntityPerPage;
use Wikibase\Lib\Store\EntityContentDataCodec;
use Wikibase\PropertyContent;
use Wikibase\PropertyInfoStore;
+use Wikibase\Repo\Store\EntityPerPage;
use Wikibase\TermIndex;
use Wikibase\Updates\DataUpdateAdapter;
use Wikibase\Validators\EntityValidator;
diff --git a/repo/includes/store/EntityIdPager.php
b/repo/includes/store/EntityIdPager.php
index 3cdc16d..0ffe74e 100644
--- a/repo/includes/store/EntityIdPager.php
+++ b/repo/includes/store/EntityIdPager.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Store;
/**
* A cursor for paging through EntityIds.
diff --git a/repo/includes/store/EntityPerPage.php
b/repo/includes/store/EntityPerPage.php
index 1502411..32b053f 100644
--- a/repo/includes/store/EntityPerPage.php
+++ b/repo/includes/store/EntityPerPage.php
@@ -1,8 +1,9 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Store;
use InvalidArgumentException;
+use Wikibase\DataModel\Entity\EntityId;
/**
* Interface to a table that join wiki pages and entities.
diff --git a/repo/includes/store/Store.php b/repo/includes/store/Store.php
index b1e6c84..f980cc0 100644
--- a/repo/includes/store/Store.php
+++ b/repo/includes/store/Store.php
@@ -8,6 +8,7 @@
use Wikibase\Lib\Store\EntityStore;
use Wikibase\Lib\Store\EntityStoreWatcher;
use Wikibase\Lib\Store\SiteLinkCache;
+use Wikibase\Repo\Store\EntityPerPage;
/**
* Store interface. All interaction with store Wikibase does on top
diff --git a/repo/includes/store/sql/EntityPerPageBuilder.php
b/repo/includes/store/sql/EntityPerPageBuilder.php
index 6fad0e5..e3f4434 100644
--- a/repo/includes/store/sql/EntityPerPageBuilder.php
+++ b/repo/includes/store/sql/EntityPerPageBuilder.php
@@ -1,10 +1,13 @@
<?php
-namespace Wikibase;
+
+namespace Wikibase\Repo\Store\SQL;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\Lib\Reporting\MessageReporter;
+use Wikibase\NamespaceUtils;
use Wikibase\Repo\Content\EntityContentFactory;
+use Wikibase\Repo\Store\EntityPerPage;
/**
* Utility class for rebuilding the wb_entity_per_page table.
diff --git a/repo/includes/store/sql/EntityPerPageIdPager.php
b/repo/includes/store/sql/EntityPerPageIdPager.php
index 8c27e3e..1068f11 100644
--- a/repo/includes/store/sql/EntityPerPageIdPager.php
+++ b/repo/includes/store/sql/EntityPerPageIdPager.php
@@ -1,6 +1,10 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Store\SQL;
+
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\Repo\Store\EntityPerPage;
/**
* EntityPerPageIdPager is a cursor for iterating over batches of EntityIds
from an
@@ -60,4 +64,4 @@
return $ids;
}
-}
\ No newline at end of file
+}
diff --git a/repo/includes/store/sql/EntityPerPageTable.php
b/repo/includes/store/sql/EntityPerPageTable.php
index 98455ef..ae86eab 100644
--- a/repo/includes/store/sql/EntityPerPageTable.php
+++ b/repo/includes/store/sql/EntityPerPageTable.php
@@ -1,14 +1,17 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Store\SQL;
use DatabaseBase;
use DBError;
use InvalidArgumentException;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\LegacyIdInterpreter;
use Wikibase\Lib\Store\StorageException;
+use Wikibase\Repo\Store\EntityPerPage;
/**
* Represents a lookup database table that make the link between entities and
pages.
diff --git a/repo/includes/store/sql/ItemsPerSiteBuilder.php
b/repo/includes/store/sql/ItemsPerSiteBuilder.php
index faab184..5ff6c4a 100644
--- a/repo/includes/store/sql/ItemsPerSiteBuilder.php
+++ b/repo/includes/store/sql/ItemsPerSiteBuilder.php
@@ -1,10 +1,12 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Store\SQL;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\Lib\Reporting\MessageReporter;
use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\SiteLinkTable;
+use Wikibase\Repo\Store\EntityIdPager;
/**
* Utility class for rebuilding the wb_items_per_site table.
diff --git a/repo/includes/store/sql/SqlStore.php
b/repo/includes/store/sql/SqlStore.php
index 41d4b77..20d0863 100644
--- a/repo/includes/store/sql/SqlStore.php
+++ b/repo/includes/store/sql/SqlStore.php
@@ -24,7 +24,9 @@
use Wikibase\Lib\Store\Sql\SqlEntityInfoBuilderFactory;
use Wikibase\Lib\Store\WikiPageEntityRevisionLookup;
use Wikibase\Repo\Store\DispatchingEntityStoreWatcher;
+use Wikibase\Repo\Store\EntityPerPage;
use Wikibase\Repo\Store\WikiPageEntityStore;
+use Wikibase\Repo\Store\SQL\EntityPerPageTable;
use Wikibase\Repo\WikibaseRepo;
use WikiPage;
@@ -359,7 +361,10 @@
$this->getUpdateScriptPath( 'AddEntityPerPage',
$db->getType() )
);
- $updater->addPostDatabaseUpdateMaintenance(
'Wikibase\RebuildEntityPerPage' );
+ $updater->addPostDatabaseUpdateMaintenance(
+ 'Wikibase\Repo\Maintenance\RebuildEntityPerPage'
+ );
+
} elseif ( $this->useRedirectTargetColumn ) {
$updater->addExtensionField(
'wb_entity_per_page',
diff --git a/repo/includes/store/sql/WikiPageEntityStore.php
b/repo/includes/store/sql/WikiPageEntityStore.php
index 2caee79..4b17ee6 100644
--- a/repo/includes/store/sql/WikiPageEntityStore.php
+++ b/repo/includes/store/sql/WikiPageEntityStore.php
@@ -11,7 +11,6 @@
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\EntityContent;
-use Wikibase\EntityPerPage;
use Wikibase\EntityRevision;
use Wikibase\IdGenerator;
use Wikibase\Lib\Store\EntityRedirect;
@@ -20,6 +19,7 @@
use Wikibase\Lib\Store\StorageException;
use Wikibase\Repo\Content\EntityContentFactory;
use Wikibase\Repo\GenericEventDispatcher;
+use Wikibase\Repo\Store\EntityPerPage;
use WikiPage;
/**
diff --git a/repo/maintenance/dumpJson.php b/repo/maintenance/dumpJson.php
index e8649d3..3ef1ff9 100644
--- a/repo/maintenance/dumpJson.php
+++ b/repo/maintenance/dumpJson.php
@@ -7,8 +7,6 @@
use MWException;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\Dumpers\JsonDumpGenerator;
-use Wikibase\IO\EntityIdReader;
-use Wikibase\IO\LineReader;
use Wikibase\Lib\Reporting\ExceptionHandler;
use Wikibase\Lib\Reporting\ObservableMessageReporter;
use Wikibase\Lib\Reporting\ReportingExceptionHandler;
@@ -17,6 +15,9 @@
use Wikibase\Lib\Serializers\Serializer;
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Lib\Store\EntityLookup;
+use Wikibase\Repo\IO\EntityIdReader;
+use Wikibase\Repo\IO\LineReader;
+use Wikibase\Repo\Store\EntityIdPager;
use Wikibase\Repo\WikibaseRepo;
$basePath = getenv( 'MW_INSTALL_PATH' ) !== false ? getenv( 'MW_INSTALL_PATH'
) : __DIR__ . '/../../../..';
diff --git a/repo/maintenance/rebuildEntityPerPage.php
b/repo/maintenance/rebuildEntityPerPage.php
index 486d7d9..78bda61 100644
--- a/repo/maintenance/rebuildEntityPerPage.php
+++ b/repo/maintenance/rebuildEntityPerPage.php
@@ -1,9 +1,10 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Maintenance;
use LoggedUpdateMaintenance;
use Wikibase\Lib\Reporting\ObservableMessageReporter;
+use Wikibase\Repo\Store\SQL\EntityPerPageBuilder;
use Wikibase\Repo\WikibaseRepo;
$basePath = getenv( 'MW_INSTALL_PATH' ) !== false ? getenv( 'MW_INSTALL_PATH'
) : __DIR__ . '/../../../..';
@@ -87,10 +88,10 @@
* @return string
*/
public function getUpdateKey() {
- return 'Wikibase\RebuildEntityPerPage';
+ return 'Wikibase\Repo\Maintenance\RebuildEntityPerPage';
}
}
-$maintClass = 'Wikibase\RebuildEntityPerPage';
+$maintClass = 'Wikibase\Repo\Maintenance\RebuildEntityPerPage';
require_once( RUN_MAINTENANCE_IF_MAIN );
diff --git a/repo/maintenance/rebuildItemsPerSite.php
b/repo/maintenance/rebuildItemsPerSite.php
index 1bd5da4..9f25119 100644
--- a/repo/maintenance/rebuildItemsPerSite.php
+++ b/repo/maintenance/rebuildItemsPerSite.php
@@ -1,10 +1,13 @@
<?php
-namespace Wikibase;
+namespace Wikibase\Repo\Maintenance;
use Maintenance;
use Wikibase\Lib\Reporting\ObservableMessageReporter;
use Wikibase\Lib\Store\SiteLinkTable;
+use Wikibase\Repo\Store\SQL\EntityPerPageIdPager;
+use Wikibase\Repo\Store\SQL\EntityPerPageTable;
+use Wikibase\Repo\Store\SQL\ItemsPerSiteBuilder;
use Wikibase\Repo\WikibaseRepo;
$basePath = getenv( 'MW_INSTALL_PATH' ) !== false ? getenv( 'MW_INSTALL_PATH'
) : __DIR__ . '/../../../..';
@@ -81,5 +84,5 @@
}
}
-$maintClass = 'Wikibase\RebuildItemsPerSite';
+$maintClass = 'Wikibase\Repo\Maintenance\RebuildItemsPerSite';
require_once( RUN_MAINTENANCE_IF_MAIN );
diff --git a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
index 6868f33..d9dc02d 100644
--- a/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
+++ b/repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
@@ -13,10 +13,10 @@
use Wikibase\DataModel\SiteLink;
use Wikibase\Dumpers\JsonDumpGenerator;
use Wikibase\EntityFactory;
-use Wikibase\EntityIdPager;
use Wikibase\Lib\Serializers\DispatchingEntitySerializer;
use Wikibase\Lib\Serializers\SerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
+use Wikibase\Repo\Store\EntityIdPager;
/**
* @covers Wikibase\Dumpers\JsonDumpGenerator
@@ -149,7 +149,7 @@
* @return EntityIdPager
*/
protected function makeIdPager( array $ids, $entityType = null ) {
- $pager = $this->getMock( 'Wikibase\EntityIdPager' );
+ $pager = $this->getMock( 'Wikibase\Repo\Store\EntityIdPager' );
$this_ = $this;
$offset = 0;
diff --git a/lib/tests/phpunit/IO/EntityIdReaderTest.bad.txt
b/repo/tests/phpunit/includes/IO/EntityIdReaderTest.bad.txt
similarity index 100%
rename from lib/tests/phpunit/IO/EntityIdReaderTest.bad.txt
rename to repo/tests/phpunit/includes/IO/EntityIdReaderTest.bad.txt
diff --git a/lib/tests/phpunit/IO/EntityIdReaderTest.php
b/repo/tests/phpunit/includes/IO/EntityIdReaderTest.php
similarity index 95%
rename from lib/tests/phpunit/IO/EntityIdReaderTest.php
rename to repo/tests/phpunit/includes/IO/EntityIdReaderTest.php
index b3b3cc4..a70ad23 100644
--- a/lib/tests/phpunit/IO/EntityIdReaderTest.php
+++ b/repo/tests/phpunit/includes/IO/EntityIdReaderTest.php
@@ -8,14 +8,14 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\Property;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\IO\EntityIdReader;
-use Wikibase\IO\LineReader;
+use Wikibase\Repo\IO\EntityIdReader;
+use Wikibase\Repo\IO\LineReader;
/**
- * @covers Wikibase\IO\EntityIdReader
+ * @covers Wikibase\Repo\IO\EntityIdReader
*
* @group Wikibase
- * @group WikibaseLib
+ * @group WikibaseRepo
* @group WikibaseIO
*
* @license GPL 2+
diff --git a/lib/tests/phpunit/IO/EntityIdReaderTest.txt
b/repo/tests/phpunit/includes/IO/EntityIdReaderTest.txt
similarity index 100%
rename from lib/tests/phpunit/IO/EntityIdReaderTest.txt
rename to repo/tests/phpunit/includes/IO/EntityIdReaderTest.txt
diff --git a/lib/tests/phpunit/IO/LineReaderTest.php
b/repo/tests/phpunit/includes/IO/LineReaderTest.php
similarity index 87%
rename from lib/tests/phpunit/IO/LineReaderTest.php
rename to repo/tests/phpunit/includes/IO/LineReaderTest.php
index e723a37..c594516 100644
--- a/lib/tests/phpunit/IO/LineReaderTest.php
+++ b/repo/tests/phpunit/includes/IO/LineReaderTest.php
@@ -2,13 +2,13 @@
namespace Wikibase\Test\IO;
-use Wikibase\IO\LineReader;
+use Wikibase\Repo\IO\LineReader;
/**
- * @covers Wikibase\IO\LineReader
+ * @covers Wikibase\Repo\IO\LineReader
*
* @group Wikibase
- * @group WikibaseLib
+ * @group WikibaseRepo
* @group WikibaseIO
*
* @license GPL 2+
diff --git a/lib/tests/phpunit/IO/LineReaderTest.txt
b/repo/tests/phpunit/includes/IO/LineReaderTest.txt
similarity index 100%
rename from lib/tests/phpunit/IO/LineReaderTest.txt
rename to repo/tests/phpunit/includes/IO/LineReaderTest.txt
diff --git a/repo/tests/phpunit/includes/UpdateRepoOnMoveJobTest.php
b/repo/tests/phpunit/includes/UpdateRepoOnMoveJobTest.php
index 6d37dbc..d721be0 100644
--- a/repo/tests/phpunit/includes/UpdateRepoOnMoveJobTest.php
+++ b/repo/tests/phpunit/includes/UpdateRepoOnMoveJobTest.php
@@ -8,8 +8,8 @@
use Wikibase\UpdateRepoOnMoveJob;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\DataModel\Entity\Item;
+use Wikibase\Repo\Store\SQL\EntityPerPageTable;
use Wikibase\Repo\Store\WikiPageEntityStore;
-use Wikibase\EntityPerPageTable;
/**
* @covers Wikibase\UpdateRepoOnMoveJob
diff --git a/repo/tests/phpunit/includes/store/sql/EntityPerPageBuilderTest.php
b/repo/tests/phpunit/includes/store/sql/EntityPerPageBuilderTest.php
index 941aaca..6e8a82e 100644
--- a/repo/tests/phpunit/includes/store/sql/EntityPerPageBuilderTest.php
+++ b/repo/tests/phpunit/includes/store/sql/EntityPerPageBuilderTest.php
@@ -5,14 +5,14 @@
use ContentHandler;
use RuntimeException;
use Wikibase\DataModel\Entity\Item;
-use Wikibase\EntityPerPage;
-use Wikibase\EntityPerPageBuilder;
use Wikibase\Lib\Store\EntityRedirect;
+use Wikibase\Repo\Store\EntityPerPage;
+use Wikibase\Repo\Store\SQL\EntityPerPageBuilder;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\SettingsArray;
/**
- * @covers Wikibase\EntityPerPageBuilder
+ * @covers Wikibase\Repo\Store\SQL\EntityPerPageBuilder
*
* @group Wikibase
* @group WikibaseRepo
diff --git a/repo/tests/phpunit/includes/store/sql/EntityPerPageIdPagerTest.php
b/repo/tests/phpunit/includes/store/sql/EntityPerPageIdPagerTest.php
index ca276ac..dfbbea1 100644
--- a/repo/tests/phpunit/includes/store/sql/EntityPerPageIdPagerTest.php
+++ b/repo/tests/phpunit/includes/store/sql/EntityPerPageIdPagerTest.php
@@ -6,10 +6,10 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\EntityPerPageIdPager;
+use Wikibase\Repo\Store\SQL\EntityPerPageIdPager;
/**
- * @covers Wikibase\EntityPerPageIdPager
+ * @covers Wikibase\Repo\Store\SQL\EntityPerPageIdPager
*
* @group Wikibase
* @group WikibaseRepo
@@ -61,7 +61,7 @@
return $result;
};
- $epp = $this->getMock( 'Wikibase\EntityPerPage' );
+ $epp = $this->getMock( 'Wikibase\Repo\Store\EntityPerPage' );
$epp->expects( $this->any() )
->method( 'listEntities' )
diff --git a/repo/tests/phpunit/includes/store/sql/EntityPerPageTableTest.php
b/repo/tests/phpunit/includes/store/sql/EntityPerPageTableTest.php
index 55f2a63..44ea1c5 100644
--- a/repo/tests/phpunit/includes/store/sql/EntityPerPageTableTest.php
+++ b/repo/tests/phpunit/includes/store/sql/EntityPerPageTableTest.php
@@ -6,11 +6,11 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\Property;
-use Wikibase\EntityPerPageTable;
+use Wikibase\Repo\Store\SQL\EntityPerPageTable;
use Wikibase\Repo\WikibaseRepo;
/**
- * @covers Wikibase\EntityPerPageTable
+ * @covers Wikibase\Repo\Store\SQL\EntityPerPageTable
*
* @group Wikibase
* @group WikibaseRepo
diff --git a/repo/tests/phpunit/includes/store/sql/ItemsPerSiteBuilderTest.php
b/repo/tests/phpunit/includes/store/sql/ItemsPerSiteBuilderTest.php
index 13db70f..d04b516 100644
--- a/repo/tests/phpunit/includes/store/sql/ItemsPerSiteBuilderTest.php
+++ b/repo/tests/phpunit/includes/store/sql/ItemsPerSiteBuilderTest.php
@@ -4,13 +4,13 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
-use Wikibase\EntityIdPager;
use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\ItemsPerSiteBuilder;
use Wikibase\Lib\Store\SiteLinkTable;
+use Wikibase\Repo\Store\EntityIdPager;
+use Wikibase\Repo\Store\SQL\ItemsPerSiteBuilder;
/**
- * @covers Wikibase\ItemsPerSiteBuilder
+ * @covers Wikibase\Repo\Store\SQL\ItemsPerSiteBuilder
*
* @license GPL 2+
*
@@ -97,7 +97,7 @@
* @return EntityIdPager
*/
private function getEntityIdPager() {
- $entityIdPager = $this->getMock( 'Wikibase\EntityIdPager' );
+ $entityIdPager = $this->getMock(
'Wikibase\Repo\Store\EntityIdPager' );
$itemIds = array(
$this->getTestItemId(),
diff --git a/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
b/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
index 7155eec..c0a15ae 100644
--- a/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
+++ b/repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
@@ -11,7 +11,6 @@
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
-use Wikibase\EntityPerPageTable;
use Wikibase\Lib\Store\EntityRedirect;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
@@ -19,6 +18,7 @@
use Wikibase\Lib\Store\WikiPageEntityRevisionLookup;
use Wikibase\Repo\Content\EntityContentFactory;
use Wikibase\Repo\Store\WikiPageEntityStore;
+use Wikibase\Repo\Store\SQL\EntityPerPageTable;
use Wikibase\Repo\WikibaseRepo;
use Wikibase\SqlIdGenerator;
--
To view, visit https://gerrit.wikimedia.org/r/163156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd5096880f6c3ceab2cdb7b7edc734bf00689f4b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: wmf/1.25wmf1
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
