WMDE-leszek has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/373289 )
Change subject: Move ForbiddenSerializer to DataAccess component ...................................................................... Move ForbiddenSerializer to DataAccess component As it is no longer used in Client. Change-Id: I8761ae96701fc373770509f8214a4012697eb870 --- M data-access/src/RepositoryServiceWiring.php R data-access/src/Serializer/ForbiddenSerializer.php M data-access/tests/phpunit/NoReverseDependencyTest.php R data-access/tests/phpunit/Serializer/ForbiddenSerializerTest.php 4 files changed, 6 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/89/373289/1 diff --git a/data-access/src/RepositoryServiceWiring.php b/data-access/src/RepositoryServiceWiring.php index 543d07c..39a257a 100644 --- a/data-access/src/RepositoryServiceWiring.php +++ b/data-access/src/RepositoryServiceWiring.php @@ -1,6 +1,6 @@ <?php -use Wikibase\Client\Serializer\ForbiddenSerializer; +use Wikibase\DataAccess\Serializer\ForbiddenSerializer; use Wikibase\DataAccess\DataAccessSettings; use Wikibase\DataAccess\GenericServices; use Wikibase\DataAccess\RepositoryServiceContainer; diff --git a/client/includes/Serializer/ForbiddenSerializer.php b/data-access/src/Serializer/ForbiddenSerializer.php similarity index 93% rename from client/includes/Serializer/ForbiddenSerializer.php rename to data-access/src/Serializer/ForbiddenSerializer.php index e20648c..3f323d8 100644 --- a/client/includes/Serializer/ForbiddenSerializer.php +++ b/data-access/src/Serializer/ForbiddenSerializer.php @@ -1,6 +1,6 @@ <?php -namespace Wikibase\Client\Serializer; +namespace Wikibase\DataAccess\Serializer; use RuntimeException; use Serializers\Serializer; diff --git a/data-access/tests/phpunit/NoReverseDependencyTest.php b/data-access/tests/phpunit/NoReverseDependencyTest.php index 55b32c8..b5a380a 100644 --- a/data-access/tests/phpunit/NoReverseDependencyTest.php +++ b/data-access/tests/phpunit/NoReverseDependencyTest.php @@ -13,16 +13,8 @@ */ class NoReverseDependencyTest extends \PHPUnit_Framework_TestCase { - /** - * TODO: Make it impossible to use a class from Wikibase\\Client\\ once the only dependency is removed - */ public function testNoClientDependency() { - $this->assertEquals( - [ - 'RepositoryServiceWiring.php', - ], - $this->getFilesContainingString( 'Wikibase\\Client\\', __DIR__ . '/../../src/' ) - ); + $this->assertEmpty( $this->getFilesContainingString( 'Wikibase\\Client\\', __DIR__ . '/../../src/' ) ); } public function testNoRepoDependency() { diff --git a/client/tests/phpunit/includes/Serializer/ForbiddenSerializerTest.php b/data-access/tests/phpunit/Serializer/ForbiddenSerializerTest.php similarity index 69% rename from client/tests/phpunit/includes/Serializer/ForbiddenSerializerTest.php rename to data-access/tests/phpunit/Serializer/ForbiddenSerializerTest.php index 7218f9a..5b55462 100644 --- a/client/tests/phpunit/includes/Serializer/ForbiddenSerializerTest.php +++ b/data-access/tests/phpunit/Serializer/ForbiddenSerializerTest.php @@ -1,15 +1,14 @@ <?php -namespace Wikibase\Client\Tests\Serializer; +namespace Wikibase\DataAccess\Tests\Serializer; use PHPUnit_Framework_TestCase; use RuntimeException; -use Wikibase\Client\Serializer\ForbiddenSerializer; +use Wikibase\DataAccess\Serializer\ForbiddenSerializer; /** - * @covers Wikibase\Client\Serializer\ForbiddenSerializer + * @covers Wikibase\DataAccess\Serializer\ForbiddenSerializer * - * @group WikibaseClient * @group Wikibase * * @license GPL-2.0+ -- To view, visit https://gerrit.wikimedia.org/r/373289 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8761ae96701fc373770509f8214a4012697eb870 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: WMDE-leszek <leszek.mani...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits