Daniel Werner has submitted this change and it was merged. Change subject: Match renaming changes in Serialization component. ......................................................................
Match renaming changes in Serialization component. This needs Serialization 2.x (https://gerrit.wikimedia.org/r/82860) Change-Id: I752f8efc5bf320c869de785a226656c01ba1a87b --- M Tests/Phpunit/DeserializerFactoryTest.php M Tests/Phpunit/Deserializers/DescriptionDeserializerTest.php M Tests/Phpunit/Deserializers/DispatchingDeserializerTest.php M Tests/Phpunit/Deserializers/QueryDeserializerTest.php M Tests/Phpunit/Deserializers/QueryOptionsDeserializerTest.php M Tests/Phpunit/Deserializers/SelectionRequestDeserializerTest.php M Tests/Phpunit/Deserializers/SortExpressionDeserializerTest.php M Tests/Phpunit/SerializerFactoryTest.php M Tests/Phpunit/Serializers/DescriptionSerializerTest.php M Tests/Phpunit/Serializers/DispatchingSerializerTest.php M Tests/Phpunit/Serializers/QueryOptionsSerializerTest.php M Tests/Phpunit/Serializers/QuerySerializerTest.php M Tests/Phpunit/Serializers/SelectionRequestSerializerTest.php M Tests/Phpunit/Serializers/SortExpressionSerializerTest.php M composer.json M src/Ask/Deserializers/DescriptionDeserializer.php M src/Ask/Deserializers/SelectionRequestDeserializer.php M src/Ask/Deserializers/SortExpressionDeserializer.php M src/Ask/Serializers/DescriptionSerializer.php M src/Ask/Serializers/QueryOptionsSerializer.php M src/Ask/Serializers/QuerySerializer.php M src/Ask/Serializers/SelectionRequestSerializer.php M src/Ask/Serializers/SortExpressionSerializer.php 23 files changed, 67 insertions(+), 62 deletions(-) Approvals: Daniel Werner: Looks good to me, approved jenkins-bot: Verified diff --git a/Tests/Phpunit/DeserializerFactoryTest.php b/Tests/Phpunit/DeserializerFactoryTest.php index 06c15ec..ee43f7a 100644 --- a/Tests/Phpunit/DeserializerFactoryTest.php +++ b/Tests/Phpunit/DeserializerFactoryTest.php @@ -44,7 +44,7 @@ } protected function assertDeserializerThatCanDeserializeObject( Deserializer $deserializer, $object ) { - $this->assertTrue( $deserializer->canDeserialize( $object ) ); + $this->assertTrue( $deserializer->isDeserializerFor( $object ) ); } public function testCanGetDescriptionDeserializer() { diff --git a/Tests/Phpunit/Deserializers/DescriptionDeserializerTest.php b/Tests/Phpunit/Deserializers/DescriptionDeserializerTest.php index 88884b3..026a52c 100644 --- a/Tests/Phpunit/Deserializers/DescriptionDeserializerTest.php +++ b/Tests/Phpunit/Deserializers/DescriptionDeserializerTest.php @@ -39,7 +39,7 @@ public function testCannotDeserializeWithInvalidObjectType( $notADescription ) { $serializer = $this->newDescriptionDeserializer(); - $this->assertFalse( $serializer->canDeserialize( $notADescription ) ); + $this->assertFalse( $serializer->isDeserializerFor( $notADescription ) ); $this->setExpectedException( 'Deserializers\Exceptions\UnsupportedTypeException' ); $serializer->deserialize( $notADescription ); @@ -87,7 +87,7 @@ public function testCannotDeserilaizeWithoutObjectType( $notADescription ) { $serializer = $this->newDescriptionDeserializer(); - $this->assertFalse( $serializer->canDeserialize( $notADescription ) ); + $this->assertFalse( $serializer->isDeserializerFor( $notADescription ) ); $this->setExpectedException( 'Deserializers\Exceptions\MissingTypeException' ); $serializer->deserialize( $notADescription ); diff --git a/Tests/Phpunit/Deserializers/DispatchingDeserializerTest.php b/Tests/Phpunit/Deserializers/DispatchingDeserializerTest.php index f3cf549..732d125 100644 --- a/Tests/Phpunit/Deserializers/DispatchingDeserializerTest.php +++ b/Tests/Phpunit/Deserializers/DispatchingDeserializerTest.php @@ -32,24 +32,24 @@ $subDeserializer = $this->getMock( 'Deserializers\Deserializer' ); $subDeserializer->expects( $this->exactly( 4 ) ) - ->method( 'canDeserialize' ) + ->method( 'isDeserializerFor' ) ->will( $this->returnCallback( function( $value ) { return $value > 9000; } ) ); $serializer = new DispatchingDeserializer( array( $subDeserializer ) ); - $this->assertFalse( $serializer->canDeserialize( 0 ) ); - $this->assertFalse( $serializer->canDeserialize( 42 ) ); - $this->assertTrue( $serializer->canDeserialize( 9001 ) ); - $this->assertTrue( $serializer->canDeserialize( 31337 ) ); + $this->assertFalse( $serializer->isDeserializerFor( 0 ) ); + $this->assertFalse( $serializer->isDeserializerFor( 42 ) ); + $this->assertTrue( $serializer->isDeserializerFor( 9001 ) ); + $this->assertTrue( $serializer->isDeserializerFor( 31337 ) ); } public function testDeserializeWithDeserializableValues() { $subDeserializer = $this->getMock( 'Deserializers\Deserializer' ); $subDeserializer->expects( $this->any() ) - ->method( 'canDeserialize' ) + ->method( 'isDeserializerFor' ) ->will( $this->returnValue( true ) ); $subDeserializer->expects( $this->any() ) @@ -66,7 +66,7 @@ $subDeserializer = $this->getMock( 'Deserializers\Deserializer' ); $subDeserializer->expects( $this->once() ) - ->method( 'canDeserialize' ) + ->method( 'isDeserializerFor' ) ->will( $this->returnValue( false ) ); $serializer = new DispatchingDeSerializer( array( $subDeserializer ) ); @@ -79,7 +79,7 @@ $subDeserializer0 = $this->getMock( 'Deserializers\Deserializer' ); $subDeserializer0->expects( $this->any() ) - ->method( 'canDeserialize' ) + ->method( 'isDeserializerFor' ) ->will( $this->returnValue( true ) ); $subDeserializer0->expects( $this->any() ) @@ -89,7 +89,7 @@ $subDeserializer1 = $this->getMock( 'Deserializers\Deserializer' ); $subDeserializer1->expects( $this->any() ) - ->method( 'canDeserialize' ) + ->method( 'isDeserializerFor' ) ->will( $this->returnValue( false ) ); $subDeserializer2 = clone $subDeserializer1; @@ -105,7 +105,7 @@ $subDeserializer = $this->getMock( 'Deserializers\Deserializer' ); $subDeserializer->expects( $this->any() ) - ->method( 'canDeserialize' ) + ->method( 'isDeserializerFor' ) ->will( $this->returnValue( true ) ); $subDeserializer->expects( $this->any() ) diff --git a/Tests/Phpunit/Deserializers/QueryDeserializerTest.php b/Tests/Phpunit/Deserializers/QueryDeserializerTest.php index 57950c2..a77f670 100644 --- a/Tests/Phpunit/Deserializers/QueryDeserializerTest.php +++ b/Tests/Phpunit/Deserializers/QueryDeserializerTest.php @@ -43,7 +43,7 @@ public function testCannotDeserializeWithInvalidObjectType( $notAQuery ) { $serializer = $this->newQueryDeserializer(); - $this->assertFalse( $serializer->canDeserialize( $notAQuery ) ); + $this->assertFalse( $serializer->isDeserializerFor( $notAQuery ) ); $this->setExpectedException( 'Deserializers\Exceptions\UnsupportedTypeException' ); $serializer->deserialize( $notAQuery ); @@ -81,7 +81,7 @@ public function testCannotDeserilaizeWithoutObjectType( $notAQuery ) { $serializer = $this->newQueryDeserializer(); - $this->assertFalse( $serializer->canDeserialize( $notAQuery ) ); + $this->assertFalse( $serializer->isDeserializerFor( $notAQuery ) ); $this->setExpectedException( 'Deserializers\Exceptions\MissingTypeException' ); $serializer->deserialize( $notAQuery ); diff --git a/Tests/Phpunit/Deserializers/QueryOptionsDeserializerTest.php b/Tests/Phpunit/Deserializers/QueryOptionsDeserializerTest.php index f231ed9..9f0cfa7 100644 --- a/Tests/Phpunit/Deserializers/QueryOptionsDeserializerTest.php +++ b/Tests/Phpunit/Deserializers/QueryOptionsDeserializerTest.php @@ -35,7 +35,7 @@ public function testCannotDeserializeWithInvalidObjectType( $notQueryOptions ) { $serializer = $this->newQueryOptionsDeserializer(); - $this->assertFalse( $serializer->canDeserialize( $notQueryOptions ) ); + $this->assertFalse( $serializer->isDeserializerFor( $notQueryOptions ) ); $this->setExpectedException( 'Deserializers\Exceptions\UnsupportedTypeException' ); $serializer->deserialize( $notQueryOptions ); @@ -78,7 +78,7 @@ public function testCannotDeserilaizeWithoutObjectType( $notQueryOptions ) { $serializer = $this->newQueryOptionsDeserializer(); - $this->assertFalse( $serializer->canDeserialize( $notQueryOptions ) ); + $this->assertFalse( $serializer->isDeserializerFor( $notQueryOptions ) ); $this->setExpectedException( 'Deserializers\Exceptions\MissingTypeException' ); $serializer->deserialize( $notQueryOptions ); diff --git a/Tests/Phpunit/Deserializers/SelectionRequestDeserializerTest.php b/Tests/Phpunit/Deserializers/SelectionRequestDeserializerTest.php index e603d53..a21eaf7 100644 --- a/Tests/Phpunit/Deserializers/SelectionRequestDeserializerTest.php +++ b/Tests/Phpunit/Deserializers/SelectionRequestDeserializerTest.php @@ -33,7 +33,7 @@ public function testCannotDeserializeWithInvalidObjectType( $notASelectionRequest ) { $serializer = $this->newSelectionRequestDeserializer(); - $this->assertFalse( $serializer->canDeserialize( $notASelectionRequest ) ); + $this->assertFalse( $serializer->isDeserializerFor( $notASelectionRequest ) ); $this->setExpectedException( 'Deserializers\Exceptions\UnsupportedTypeException' ); $serializer->deserialize( $notASelectionRequest ); @@ -81,7 +81,7 @@ public function testCannotDeserilaizeWithoutObjectType( $notASelectionRequest ) { $serializer = $this->newSelectionRequestDeserializer(); - $this->assertFalse( $serializer->canDeserialize( $notASelectionRequest ) ); + $this->assertFalse( $serializer->isDeserializerFor( $notASelectionRequest ) ); $this->setExpectedException( 'Deserializers\Exceptions\MissingTypeException' ); $serializer->deserialize( $notASelectionRequest ); diff --git a/Tests/Phpunit/Deserializers/SortExpressionDeserializerTest.php b/Tests/Phpunit/Deserializers/SortExpressionDeserializerTest.php index 84a5838..41d3055 100644 --- a/Tests/Phpunit/Deserializers/SortExpressionDeserializerTest.php +++ b/Tests/Phpunit/Deserializers/SortExpressionDeserializerTest.php @@ -37,7 +37,7 @@ public function testCannotDeserializeWithInvalidObjectType( $notADescription ) { $serializer = $this->newSortExpressionDeserializer(); - $this->assertFalse( $serializer->canDeserialize( $notADescription ) ); + $this->assertFalse( $serializer->isDeserializerFor( $notADescription ) ); $this->setExpectedException( 'Deserializers\Exceptions\UnsupportedTypeException' ); $serializer->deserialize( $notADescription ); @@ -85,7 +85,7 @@ public function testCannotDeserilaizeWithoutObjectType( $notASortExpression ) { $serializer = $this->newSortExpressionDeserializer(); - $this->assertFalse( $serializer->canDeserialize( $notASortExpression ) ); + $this->assertFalse( $serializer->isDeserializerFor( $notASortExpression ) ); $this->setExpectedException( 'Deserializers\Exceptions\MissingTypeException' ); $serializer->deserialize( $notASortExpression ); diff --git a/Tests/Phpunit/SerializerFactoryTest.php b/Tests/Phpunit/SerializerFactoryTest.php index a28da9d..f7b57d4 100644 --- a/Tests/Phpunit/SerializerFactoryTest.php +++ b/Tests/Phpunit/SerializerFactoryTest.php @@ -32,7 +32,7 @@ } protected function assertSerializerThatCanSerializeObject( Serializer $serializer, $object ) { - $this->assertTrue( $serializer->canSerialize( $object ) ); + $this->assertTrue( $serializer->isSerializerFor( $object ) ); } public function testCanGetDescriptionSerializer() { diff --git a/Tests/Phpunit/Serializers/DescriptionSerializerTest.php b/Tests/Phpunit/Serializers/DescriptionSerializerTest.php index 1d5d1c9..ac7043f 100644 --- a/Tests/Phpunit/Serializers/DescriptionSerializerTest.php +++ b/Tests/Phpunit/Serializers/DescriptionSerializerTest.php @@ -28,7 +28,7 @@ public function testCannotSerializeNonDescriptions( $notADescription ) { $serializer = new DescriptionSerializer(); - $this->assertFalse( $serializer->canSerialize( $notADescription ) ); + $this->assertFalse( $serializer->isSerializerFor( $notADescription ) ); $this->setExpectedException( 'Serializers\Exceptions\UnsupportedObjectException' ); $serializer->serialize( $notADescription ); diff --git a/Tests/Phpunit/Serializers/DispatchingSerializerTest.php b/Tests/Phpunit/Serializers/DispatchingSerializerTest.php index 3e56082..f7dc6e7 100644 --- a/Tests/Phpunit/Serializers/DispatchingSerializerTest.php +++ b/Tests/Phpunit/Serializers/DispatchingSerializerTest.php @@ -21,8 +21,8 @@ public function testConstructWithNoSerializers() { $serializer = new DispatchingSerializer( array() ); - $this->assertFalse( $serializer->canSerialize( 'foo' ) ); - $this->assertFalse( $serializer->canSerialize( null ) ); + $this->assertFalse( $serializer->isSerializerFor( 'foo' ) ); + $this->assertFalse( $serializer->isSerializerFor( null ) ); $this->setExpectedException( 'Serializers\Exceptions\UnsupportedObjectException' ); @@ -38,24 +38,24 @@ $subSerializer = $this->getMock( 'Serializers\Serializer' ); $subSerializer->expects( $this->exactly( 4 ) ) - ->method( 'canSerialize' ) + ->method( 'isSerializerFor' ) ->will( $this->returnCallback( function( $value ) { return $value > 9000; } ) ); $serializer = new DispatchingSerializer( array( $subSerializer ) ); - $this->assertFalse( $serializer->canSerialize( 0 ) ); - $this->assertFalse( $serializer->canSerialize( 42 ) ); - $this->assertTrue( $serializer->canSerialize( 9001 ) ); - $this->assertTrue( $serializer->canSerialize( 31337 ) ); + $this->assertFalse( $serializer->isSerializerFor( 0 ) ); + $this->assertFalse( $serializer->isSerializerFor( 42 ) ); + $this->assertTrue( $serializer->isSerializerFor( 9001 ) ); + $this->assertTrue( $serializer->isSerializerFor( 31337 ) ); } public function testSerializeWithSerializableValues() { $subSerializer = $this->getMock( 'Serializers\Serializer' ); $subSerializer->expects( $this->any() ) - ->method( 'canSerialize' ) + ->method( 'isSerializerFor' ) ->will( $this->returnValue( true ) ); $subSerializer->expects( $this->any() ) @@ -72,7 +72,7 @@ $subSerializer = $this->getMock( 'Serializers\Serializer' ); $subSerializer->expects( $this->once() ) - ->method( 'canSerialize' ) + ->method( 'isSerializerFor' ) ->will( $this->returnValue( false ) ); $serializer = new DispatchingSerializer( array( $subSerializer ) ); @@ -85,7 +85,7 @@ $subSerializer0 = $this->getMock( 'Serializers\Serializer' ); $subSerializer0->expects( $this->any() ) - ->method( 'canSerialize' ) + ->method( 'isSerializerFor' ) ->will( $this->returnValue( true ) ); $subSerializer0->expects( $this->any() ) @@ -95,7 +95,7 @@ $subSerializer1 = $this->getMock( 'Serializers\Serializer' ); $subSerializer1->expects( $this->any() ) - ->method( 'canSerialize' ) + ->method( 'isSerializerFor' ) ->will( $this->returnValue( false ) ); $subSerializer2 = clone $subSerializer1; @@ -111,7 +111,7 @@ $subSerializer = $this->getMock( 'Serializers\Serializer' ); $subSerializer->expects( $this->any() ) - ->method( 'canSerialize' ) + ->method( 'isSerializerFor' ) ->will( $this->returnValue( true ) ); $subSerializer->expects( $this->any() ) diff --git a/Tests/Phpunit/Serializers/QueryOptionsSerializerTest.php b/Tests/Phpunit/Serializers/QueryOptionsSerializerTest.php index 8d17f37..cc75e4c 100644 --- a/Tests/Phpunit/Serializers/QueryOptionsSerializerTest.php +++ b/Tests/Phpunit/Serializers/QueryOptionsSerializerTest.php @@ -62,7 +62,7 @@ public function testCannotSerializeNonDescriptions( $notSerializable ) { $serializer = $this->newQueryOptionsSerializer(); - $this->assertFalse( $serializer->canSerialize( $notSerializable ) ); + $this->assertFalse( $serializer->isSerializerFor( $notSerializable ) ); $this->setExpectedException( 'Serializers\Exceptions\UnsupportedObjectException' ); $serializer->serialize( $notSerializable ); diff --git a/Tests/Phpunit/Serializers/QuerySerializerTest.php b/Tests/Phpunit/Serializers/QuerySerializerTest.php index a2c647d..f30594a 100644 --- a/Tests/Phpunit/Serializers/QuerySerializerTest.php +++ b/Tests/Phpunit/Serializers/QuerySerializerTest.php @@ -63,7 +63,7 @@ $dispatchingSerializer = $this->getMock( 'Serializers\Serializer' ); $serializer = new QuerySerializer( $dispatchingSerializer ); - $this->assertFalse( $serializer->canSerialize( $notAQuery ) ); + $this->assertFalse( $serializer->isSerializerFor( $notAQuery ) ); $this->setExpectedException( 'Serializers\Exceptions\UnsupportedObjectException' ); $serializer->serialize( $notAQuery ); diff --git a/Tests/Phpunit/Serializers/SelectionRequestSerializerTest.php b/Tests/Phpunit/Serializers/SelectionRequestSerializerTest.php index e8b7b6f..98e9225 100644 --- a/Tests/Phpunit/Serializers/SelectionRequestSerializerTest.php +++ b/Tests/Phpunit/Serializers/SelectionRequestSerializerTest.php @@ -25,8 +25,8 @@ public function testConstructWithNoSerializers() { $serializer = new SelectionRequestSerializer(); - $this->assertFalse( $serializer->canSerialize( 'foo' ) ); - $this->assertFalse( $serializer->canSerialize( null ) ); + $this->assertFalse( $serializer->isSerializerFor( 'foo' ) ); + $this->assertFalse( $serializer->isSerializerFor( null ) ); $this->setExpectedException( 'Serializers\Exceptions\UnsupportedObjectException' ); diff --git a/Tests/Phpunit/Serializers/SortExpressionSerializerTest.php b/Tests/Phpunit/Serializers/SortExpressionSerializerTest.php index 8495af3..7c9940a 100644 --- a/Tests/Phpunit/Serializers/SortExpressionSerializerTest.php +++ b/Tests/Phpunit/Serializers/SortExpressionSerializerTest.php @@ -24,8 +24,8 @@ public function testConstructWithNoSerializers() { $serializer = new SortExpressionSerializer(); - $this->assertFalse( $serializer->canSerialize( 'foo' ) ); - $this->assertFalse( $serializer->canSerialize( null ) ); + $this->assertFalse( $serializer->isSerializerFor( 'foo' ) ); + $this->assertFalse( $serializer->isSerializerFor( null ) ); $this->setExpectedException( 'Serializers\Exceptions\UnsupportedObjectException' ); diff --git a/composer.json b/composer.json index d424c7f..9f9d146 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,12 @@ "name": "ask/ask", "type": "library", "description": "Library containing a PHP implementation of the Ask query language", - "keywords": ["ask", "wikidata", "SMW", "Semantic MediaWiki"], + "keywords": [ + "ask", + "wikidata", + "SMW", + "Semantic MediaWiki" + ], "homepage": "https://www.mediawiki.org/wiki/Extension:Ask";, "license": "GPL-2.0+", "authors": [ @@ -27,7 +32,7 @@ "require": { "php": ">=5.3.0", "data-values/data-values": "@dev", - "serialization/serialization": ">=1.0" + "serialization/serialization": "~2.0" }, "require-dev": { "satooshi/php-coveralls": "dev-master" diff --git a/src/Ask/Deserializers/DescriptionDeserializer.php b/src/Ask/Deserializers/DescriptionDeserializer.php index b7d6886..36b321e 100644 --- a/src/Ask/Deserializers/DescriptionDeserializer.php +++ b/src/Ask/Deserializers/DescriptionDeserializer.php @@ -61,7 +61,7 @@ } /** - * @see Deserializer::canDeserialize + * @see Deserializer::isDeserializerFor * * @since 1.0 * @@ -69,8 +69,8 @@ * * @return boolean */ - public function canDeserialize( $serialization ) { - return $this->deserializer->canDeserialize( $serialization ); + public function isDeserializerFor( $serialization ) { + return $this->deserializer->isDeserializerFor( $serialization ); } } diff --git a/src/Ask/Deserializers/SelectionRequestDeserializer.php b/src/Ask/Deserializers/SelectionRequestDeserializer.php index a61a71e..2362916 100644 --- a/src/Ask/Deserializers/SelectionRequestDeserializer.php +++ b/src/Ask/Deserializers/SelectionRequestDeserializer.php @@ -53,7 +53,7 @@ } /** - * @see Deserializer::canDeserialize + * @see Deserializer::isDeserializerFor * * @since 1.0 * @@ -61,8 +61,8 @@ * * @return boolean */ - public function canDeserialize( $serialization ) { - return $this->deserializer->canDeserialize( $serialization ); + public function isDeserializerFor( $serialization ) { + return $this->deserializer->isDeserializerFor( $serialization ); } } diff --git a/src/Ask/Deserializers/SortExpressionDeserializer.php b/src/Ask/Deserializers/SortExpressionDeserializer.php index d124190..411f9b0 100644 --- a/src/Ask/Deserializers/SortExpressionDeserializer.php +++ b/src/Ask/Deserializers/SortExpressionDeserializer.php @@ -50,7 +50,7 @@ } /** - * @see Deserializer::canDeserialize + * @see Deserializer::isDeserializerFor * * @since 1.0 * @@ -58,8 +58,8 @@ * * @return boolean */ - public function canDeserialize( $serialization ) { - return $this->deserializer->canDeserialize( $serialization ); + public function isDeserializerFor( $serialization ) { + return $this->deserializer->isDeserializerFor( $serialization ); } } diff --git a/src/Ask/Serializers/DescriptionSerializer.php b/src/Ask/Serializers/DescriptionSerializer.php index 18762af..ecb4feb 100644 --- a/src/Ask/Serializers/DescriptionSerializer.php +++ b/src/Ask/Serializers/DescriptionSerializer.php @@ -86,12 +86,12 @@ } protected function assertCanSerialize( $askObject ) { - if ( !$this->canSerialize( $askObject ) ) { + if ( !$this->isSerializerFor( $askObject ) ) { throw new UnsupportedObjectException( $askObject ); } } - public function canSerialize( $askObject ) { + public function isSerializerFor( $askObject ) { return $askObject instanceof Description; } diff --git a/src/Ask/Serializers/QueryOptionsSerializer.php b/src/Ask/Serializers/QueryOptionsSerializer.php index 8478295..1cf1817 100644 --- a/src/Ask/Serializers/QueryOptionsSerializer.php +++ b/src/Ask/Serializers/QueryOptionsSerializer.php @@ -34,7 +34,7 @@ } protected function assertCanSerialize( $askObject ) { - if ( !$this->canSerialize( $askObject ) ) { + if ( !$this->isSerializerFor( $askObject ) ) { throw new UnsupportedObjectException( $askObject ); } } @@ -59,7 +59,7 @@ ); } - public function canSerialize( $askObject ) { + public function isSerializerFor( $askObject ) { return $askObject instanceof QueryOptions; } diff --git a/src/Ask/Serializers/QuerySerializer.php b/src/Ask/Serializers/QuerySerializer.php index 9fec99c..3723d3f 100644 --- a/src/Ask/Serializers/QuerySerializer.php +++ b/src/Ask/Serializers/QuerySerializer.php @@ -34,12 +34,12 @@ } protected function assertCanSerialize( $askObject ) { - if ( !$this->canSerialize( $askObject ) ) { + if ( !$this->isSerializerFor( $askObject ) ) { throw new UnsupportedObjectException( $askObject ); } } - public function canSerialize( $askObject ) { + public function isSerializerFor( $askObject ) { return $askObject instanceof Query; } diff --git a/src/Ask/Serializers/SelectionRequestSerializer.php b/src/Ask/Serializers/SelectionRequestSerializer.php index 7ef1254..d66f10a 100644 --- a/src/Ask/Serializers/SelectionRequestSerializer.php +++ b/src/Ask/Serializers/SelectionRequestSerializer.php @@ -25,7 +25,7 @@ } protected function assertCanSerialize( $askObject ) { - if ( !$this->canSerialize( $askObject ) ) { + if ( !$this->isSerializerFor( $askObject ) ) { throw new UnsupportedObjectException( $askObject ); } } @@ -52,7 +52,7 @@ throw new UnsupportedObjectException( $request ); } - public function canSerialize( $askObject ) { + public function isSerializerFor( $askObject ) { return $askObject instanceof SelectionRequest; } diff --git a/src/Ask/Serializers/SortExpressionSerializer.php b/src/Ask/Serializers/SortExpressionSerializer.php index 0b561b7..52a4ac9 100644 --- a/src/Ask/Serializers/SortExpressionSerializer.php +++ b/src/Ask/Serializers/SortExpressionSerializer.php @@ -24,7 +24,7 @@ } protected function assertCanSerialize( $askObject ) { - if ( !$this->canSerialize( $askObject ) ) { + if ( !$this->isSerializerFor( $askObject ) ) { throw new UnsupportedObjectException( $askObject ); } } @@ -56,7 +56,7 @@ throw new UnsupportedObjectException( $expression ); } - public function canSerialize( $askObject ) { + public function isSerializerFor( $askObject ) { return $askObject instanceof SortExpression; } -- To view, visit https://gerrit.wikimedia.org/r/82861 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I752f8efc5bf320c869de785a226656c01ba1a87b Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Ask Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw <[email protected]> Gerrit-Reviewer: Daniel Werner <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
