[Serializer] replaced "and" to "&&"

diversantvlz · diversantvlz · commit 3b6f28a0d80b · 2017-12-20T14:18:39.000+03:00
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonDecode.php b/src/Symfony/Component/Serializer/Encoder/JsonDecode.php
@@ -95,7 +95,7 @@ public function decode($data, $format, array $context = array())
             $decodedData = json_decode($data, $associative, $recursionDepth);
         }
 
-        if (JSON_ERROR_NONE !== $this->lastError = json_last_error() and false === $decodedData) {
+        if (JSON_ERROR_NONE !== $this->lastError = json_last_error() && false === $decodedData) {
             throw new UnexpectedValueException(sprintf('Json decode error #%s: %s', json_last_error(), json_last_error_msg()));
         }
 
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -55,7 +55,7 @@ public function encode($data, $format, array $context = array())
 
         $encodedJson = json_encode($data, $context['json_encode_options']);
 
-        if (JSON_ERROR_NONE !== $this->lastError and false === $encodedJson) {
+        if (JSON_ERROR_NONE !== $this->lastError && false === $encodedJson) {
             throw new UnexpectedValueException(sprintf('Json encode error #%s: %s', json_last_error(), json_last_error_msg()));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function decode($data, $format, array $context = array())`
`95`	`95`	`$decodedData = json_decode($data, $associative, $recursionDepth);`
`96`	`96`	`}`
`97`	`97`
`98`		`- if (JSON_ERROR_NONE !== $this->lastError = json_last_error() and false === $decodedData) {`
	`98`	`+ if (JSON_ERROR_NONE !== $this->lastError = json_last_error() && false === $decodedData) {`
`99`	`99`	`throw new UnexpectedValueException(sprintf('Json decode error #%s: %s', json_last_error(), json_last_error_msg()));`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function encode($data, $format, array $context = array())`
`55`	`55`
`56`	`56`	`$encodedJson = json_encode($data, $context['json_encode_options']);`
`57`	`57`
`58`		`- if (JSON_ERROR_NONE !== $this->lastError and false === $encodedJson) {`
	`58`	`+ if (JSON_ERROR_NONE !== $this->lastError && false === $encodedJson) {`
`59`	`59`	`throw new UnexpectedValueException(sprintf('Json encode error #%s: %s', json_last_error(), json_last_error_msg()));`
`60`	`60`	`}`
`61`	`61`