Denny Vrandecic has submitted this change and it was merged.
Change subject: Remove Serializer from SerializationException
......................................................................
Remove Serializer from SerializationException
Change-Id: I7e3be7547c14b2c7c4d9d2102a1f0ae8031aaf39
---
M Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
M src/Ask/Serializers/DescriptionSerializer.php
M src/Ask/Serializers/DispatchingSerializer.php
M src/Ask/Serializers/Exceptions/SerializationException.php
M src/Ask/Serializers/Exceptions/UnsupportedObjectException.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
9 files changed, 17 insertions(+), 36 deletions(-)
Approvals:
Denny Vrandecic: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
b/Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
index 5b67a5f..5b4a3f1 100644
--- a/Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
+++ b/Tests/Phpunit/Serializers/Exceptions/UnsupportedObjectExceptionTest.php
@@ -20,29 +20,26 @@
public function testConstructorWithOnlyRequiredArguments() {
$object = (object)array( 'the' => 'game' );
- $serializer = $this->getMock( 'Ask\Serializers\Serializer' );
- $exception = new UnsupportedObjectException( $object,
$serializer );
+ $exception = new UnsupportedObjectException( $object );
- $this->assertRequiredFieldsAreSet( $exception, $object,
$serializer );
+ $this->assertRequiredFieldsAreSet( $exception, $object );
}
public function testConstructorWithAllArguments() {
$object = (object)array( 'the' => 'game' );
- $serializer = $this->getMock( 'Ask\Serializers\Serializer' );
$message = 'NyanData all the way across the sky!';
$previous = new \Exception( 'Onoez!' );
- $exception = new UnsupportedObjectException( $object,
$serializer, $message, $previous );
+ $exception = new UnsupportedObjectException( $object, $message,
$previous );
- $this->assertRequiredFieldsAreSet( $exception, $object,
$serializer );
+ $this->assertRequiredFieldsAreSet( $exception, $object );
$this->assertEquals( $message, $exception->getMessage() );
$this->assertEquals( $previous, $exception->getPrevious() );
}
- protected function assertRequiredFieldsAreSet(
UnsupportedObjectException $exception, $object, $serializer ) {
+ protected function assertRequiredFieldsAreSet(
UnsupportedObjectException $exception, $object ) {
$this->assertEquals( $object,
$exception->getUnsupportedObject() );
- $this->assertEquals( $serializer, $exception->getSerializer() );
}
}
diff --git a/src/Ask/Serializers/DescriptionSerializer.php
b/src/Ask/Serializers/DescriptionSerializer.php
index 40bf0a6..a998fe3 100644
--- a/src/Ask/Serializers/DescriptionSerializer.php
+++ b/src/Ask/Serializers/DescriptionSerializer.php
@@ -66,12 +66,12 @@
);
}
- throw new UnsupportedObjectException( $description, $this );
+ throw new UnsupportedObjectException( $description );
}
protected function assertCanSerialize( $askObject ) {
if ( !$this->canSerialize( $askObject ) ) {
- throw new UnsupportedObjectException( $askObject, $this
);
+ throw new UnsupportedObjectException( $askObject );
}
}
diff --git a/src/Ask/Serializers/DispatchingSerializer.php
b/src/Ask/Serializers/DispatchingSerializer.php
index db9a9ac..7f1aab2 100644
--- a/src/Ask/Serializers/DispatchingSerializer.php
+++ b/src/Ask/Serializers/DispatchingSerializer.php
@@ -44,7 +44,7 @@
}
}
- throw new UnsupportedObjectException( $askObject, $this );
+ throw new UnsupportedObjectException( $askObject );
}
public function canSerialize( $askObject ) {
diff --git a/src/Ask/Serializers/Exceptions/SerializationException.php
b/src/Ask/Serializers/Exceptions/SerializationException.php
index d7ac062..6593eb6 100644
--- a/src/Ask/Serializers/Exceptions/SerializationException.php
+++ b/src/Ask/Serializers/Exceptions/SerializationException.php
@@ -2,8 +2,6 @@
namespace Ask\Serializers\Exceptions;
-use Ask\Serializers\Serializer;
-
/**
* @since 0.1
*
@@ -15,19 +13,8 @@
*/
abstract class SerializationException extends \RuntimeException {
- protected $serializer;
-
- public function __construct( Serializer $deserializer, $message = '',
\Exception $previous = null ) {
- $this->serializer = $deserializer;
-
+ public function __construct( $message = '', \Exception $previous = null
) {
parent::__construct( $message, 0, $previous );
- }
-
- /**
- * @return Serializer
- */
- public function getSerializer() {
- return $this->serializer;
}
}
diff --git a/src/Ask/Serializers/Exceptions/UnsupportedObjectException.php
b/src/Ask/Serializers/Exceptions/UnsupportedObjectException.php
index 0284026..5a0f10d 100644
--- a/src/Ask/Serializers/Exceptions/UnsupportedObjectException.php
+++ b/src/Ask/Serializers/Exceptions/UnsupportedObjectException.php
@@ -2,8 +2,6 @@
namespace Ask\Serializers\Exceptions;
-use Ask\Serializers\Serializer;
-
/**
* @since 0.1
*
@@ -19,14 +17,13 @@
/**
* @param mixed $unsupportedObject
- * @param Serializer $deserializer
* @param string $message
* @param \Exception $previous
*/
- public function __construct( $unsupportedObject, Serializer
$deserializer, $message = '', \Exception $previous = null ) {
+ public function __construct( $unsupportedObject, $message = '',
\Exception $previous = null ) {
$this->unsupportedObject = $unsupportedObject;
- parent::__construct( $deserializer, $message, $previous );
+ parent::__construct( $message, $previous );
}
/**
diff --git a/src/Ask/Serializers/QueryOptionsSerializer.php
b/src/Ask/Serializers/QueryOptionsSerializer.php
index bb37936..34a79f1 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 ) ) {
- throw new UnsupportedObjectException( $askObject, $this
);
+ throw new UnsupportedObjectException( $askObject );
}
}
diff --git a/src/Ask/Serializers/QuerySerializer.php
b/src/Ask/Serializers/QuerySerializer.php
index 3073a05..4672ea8 100644
--- a/src/Ask/Serializers/QuerySerializer.php
+++ b/src/Ask/Serializers/QuerySerializer.php
@@ -34,7 +34,7 @@
protected function assertCanSerialize( $askObject ) {
if ( !$this->canSerialize( $askObject ) ) {
- throw new UnsupportedObjectException( $askObject, $this
);
+ throw new UnsupportedObjectException( $askObject );
}
}
diff --git a/src/Ask/Serializers/SelectionRequestSerializer.php
b/src/Ask/Serializers/SelectionRequestSerializer.php
index 0f86c2c..352303f 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 ) ) {
- throw new UnsupportedObjectException( $askObject, $this
);
+ throw new UnsupportedObjectException( $askObject );
}
}
@@ -48,7 +48,7 @@
return null;
}
- throw new UnsupportedObjectException( $request, $this );
+ throw new UnsupportedObjectException( $request );
}
public function canSerialize( $askObject ) {
diff --git a/src/Ask/Serializers/SortExpressionSerializer.php
b/src/Ask/Serializers/SortExpressionSerializer.php
index 31cd423..3313aeb 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 ) ) {
- throw new UnsupportedObjectException( $askObject, $this
);
+ throw new UnsupportedObjectException( $askObject );
}
}
@@ -52,7 +52,7 @@
);
}
- throw new UnsupportedObjectException( $expression, $this );
+ throw new UnsupportedObjectException( $expression );
}
public function canSerialize( $askObject ) {
--
To view, visit https://gerrit.wikimedia.org/r/72717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e3be7547c14b2c7c4d9d2102a1f0ae8031aaf39
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Ask
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Denny Vrandecic <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
