[Serializer] fixed CS

fabpot · fabpot · commit a1ab939c3540 · 2013-12-28T13:20:23.000+01:00
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
@@ -55,7 +55,8 @@ public function __construct($associative = false, $depth = 512)
      *
      * @return integer
      *
-     * @deprecated decode() throws an exception if error found
+     * @deprecated since 2.5, decode() throws an exception if error found, will be removed in 3.0
+     *
      * @see http://php.net/manual/en/function.json-last-error.php json_last_error
      */
     public function getLastError()
@@ -105,8 +106,7 @@ public function decode($data, $format, array $context = array())
         }
 
         if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
-            $message = JsonEncoder::getLastErrorMessage();
-            throw new UnexpectedValueException($message);
+            throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());
         }
 
         return $decodedData;
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -33,7 +33,8 @@ public function __construct($bitmask = 0)
      *
      * @return integer
      *
-     * @deprecated encode() throws an exception if error found
+     * @deprecated since 2.5, encode() throws an exception if error found, will be removed in 3.0
+     *
      * @see http://php.net/manual/en/function.json-last-error.php json_last_error
      */
     public function getLastError()
@@ -53,8 +54,7 @@ public function encode($data, $format, array $context = array())
         $encodedJson = json_encode($data, $context['json_encode_options']);
 
         if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
-            $message = JsonEncoder::getLastErrorMessage();
-            throw new UnexpectedValueException($message);
+            throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());
         }
 
         return $encodedJson;
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php b/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
@@ -37,25 +37,23 @@ public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodin
     }
 
     /**
-     *
      * Returns the last encoding error (if any)
      *
      * @return integer
      *
-     * @deprecated JsonEncode throws exception if an error is found
+     * @deprecated since 2.5, JsonEncode throws exception if an error is found, will be removed in 3.0
      */
     public function getLastEncodingError()
     {
         return $this->encodingImpl->getLastError();
     }
 
     /**
-     *
      * Returns the last decoding error (if any)
      *
      * @return integer
      *
-     * @deprecated JsonDecode throws exception if an error is found
+     * @deprecated since 2.5, JsonDecode throws exception if an error is found, will be removed in 3.0
      */
     public function getLastDecodingError()
     {
@@ -95,7 +93,7 @@ public function supportsDecoding($format)
     }
 
     /**
-     * Resolves json_last_error message
+     * Resolves json_last_error message.
      *
      * @return string
      */

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ public function __construct($associative = false, $depth = 512)`
`55`	`55`	`*`
`56`	`56`	`* @return integer`
`57`	`57`	`*`
`58`		`- * @deprecated decode() throws an exception if error found`
	`58`	`+ * @deprecated since 2.5, decode() throws an exception if error found, will be removed in 3.0`
	`59`	`+ *`
`59`	`60`	`* @see http://php.net/manual/en/function.json-last-error.php json_last_error`
`60`	`61`	`*/`
`61`	`62`	`public function getLastError()`
`@@ -105,8 +106,7 @@ public function decode($data, $format, array $context = array())`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {`
`108`		`- $message = JsonEncoder::getLastErrorMessage();`
`109`		`- throw new UnexpectedValueException($message);`
	`109`	`+ throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`return $decodedData;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ public function __construct($bitmask = 0)`
`33`	`33`	`*`
`34`	`34`	`* @return integer`
`35`	`35`	`*`
`36`		`- * @deprecated encode() throws an exception if error found`
	`36`	`+ * @deprecated since 2.5, encode() throws an exception if error found, will be removed in 3.0`
	`37`	`+ *`
`37`	`38`	`* @see http://php.net/manual/en/function.json-last-error.php json_last_error`
`38`	`39`	`*/`
`39`	`40`	`public function getLastError()`
`@@ -53,8 +54,7 @@ public function encode($data, $format, array $context = array())`
`53`	`54`	`$encodedJson = json_encode($data, $context['json_encode_options']);`
`54`	`55`
`55`	`56`	`if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {`
`56`		`- $message = JsonEncoder::getLastErrorMessage();`
`57`		`- throw new UnexpectedValueException($message);`
	`57`	`+ throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`return $encodedJson;`
Original file line number	Diff line number	Diff line change
`@@ -37,25 +37,23 @@ public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodin`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
`40`		`- *`
`41`	`40`	`* Returns the last encoding error (if any)`
`42`	`41`	`*`
`43`	`42`	`* @return integer`
`44`	`43`	`*`
`45`		`- * @deprecated JsonEncode throws exception if an error is found`
	`44`	`+ * @deprecated since 2.5, JsonEncode throws exception if an error is found, will be removed in 3.0`
`46`	`45`	`*/`
`47`	`46`	`public function getLastEncodingError()`
`48`	`47`	`{`
`49`	`48`	`return $this->encodingImpl->getLastError();`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`/**`
`53`		`- *`
`54`	`52`	`* Returns the last decoding error (if any)`
`55`	`53`	`*`
`56`	`54`	`* @return integer`
`57`	`55`	`*`
`58`		`- * @deprecated JsonDecode throws exception if an error is found`
	`56`	`+ * @deprecated since 2.5, JsonDecode throws exception if an error is found, will be removed in 3.0`
`59`	`57`	`*/`
`60`	`58`	`public function getLastDecodingError()`
`61`	`59`	`{`
`@@ -95,7 +93,7 @@ public function supportsDecoding($format)`
`95`	`93`	`}`
`96`	`94`
`97`	`95`	`/**`
`98`		`- * Resolves json_last_error message`
	`96`	`+ * Resolves json_last_error message.`
`99`	`97`	`*`
`100`	`98`	`* @return string`
`101`	`99`	`*/`