Avoid yoda-style comparisons within the codebase. (#41175)

laravel · Feb 22, 2022 · e6c510d · e6c510d
1 parent 97d67e1
commit e6c510d
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/src/Illuminate/Console/Scheduling/Event.php b/src/Illuminate/Console/Scheduling/Event.php
@@ -780,7 +780,7 @@ public function onSuccess(Closure $callback)
         }
 
         return $this->then(function (Container $container) use ($callback) {
-            if (0 === $this->exitCode) {
+            if ($this->exitCode === 0) {
                 $container->call($callback);
             }
         });
@@ -815,7 +815,7 @@ public function onFailure(Closure $callback)
         }
 
         return $this->then(function (Container $container) use ($callback) {
-            if (0 !== $this->exitCode) {
+            if ($this->exitCode !== 0) {
                 $container->call($callback);
             }
         });

diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -1497,7 +1497,7 @@ public function toJson($options = 0)
     {
         $json = json_encode($this->jsonSerialize(), $options);
 
-        if (JSON_ERROR_NONE !== json_last_error()) {
+        if (json_last_error() !== JSON_ERROR_NONE) {
             throw JsonEncodingException::forModel($this, json_last_error_msg());
         }
 

diff --git a/src/Illuminate/Http/Resources/Json/JsonResource.php b/src/Illuminate/Http/Resources/Json/JsonResource.php
@@ -133,7 +133,7 @@ public function toJson($options = 0)
     {
         $json = json_encode($this->jsonSerialize(), $options);
 
-        if (JSON_ERROR_NONE !== json_last_error()) {
+        if (json_last_error() !== JSON_ERROR_NONE) {
             throw JsonEncodingException::forResource($this, json_last_error_msg());
         }
 

diff --git a/src/Illuminate/Queue/Queue.php b/src/Illuminate/Queue/Queue.php
@@ -104,7 +104,7 @@ protected function createPayload($job, $queue, $data = '')
 
         $payload = json_encode($this->createPayloadArray($job, $queue, $data), \JSON_UNESCAPED_UNICODE);
 
-        if (JSON_ERROR_NONE !== json_last_error()) {
+        if (json_last_error() !== JSON_ERROR_NONE) {
             throw new InvalidPayloadException(
                 'Unable to JSON encode payload. Error code: '.json_last_error()
             );

diff --git a/src/Illuminate/Support/Js.php b/src/Illuminate/Support/Js.php
@@ -112,7 +112,7 @@ protected function jsonEncode($data, $flags = 0, $depth = 512)
      */
     protected function convertJsonToJavaScriptExpression($json, $flags = 0)
     {
-        if ('[]' === $json || '{}' === $json) {
+        if ($json === '[]' || $json === '{}') {
             return $json;
         }
 

diff --git a/src/Illuminate/Support/ProcessUtils.php b/src/Illuminate/Support/ProcessUtils.php
@@ -22,15 +22,15 @@ public static function escapeArgument($argument)
         // @see https://bugs.php.net/bug.php?id=43784
         // @see https://bugs.php.net/bug.php?id=49446
         if ('\\' === DIRECTORY_SEPARATOR) {
-            if ('' === $argument) {
+            if ($argument === '') {
                 return '""';
             }
 
             $escapedArgument = '';
             $quote = false;
 
             foreach (preg_split('/(")/', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
-                if ('"' === $part) {
+                if ($part === '"') {
                     $escapedArgument .= '\\"';
                 } elseif (self::isSurroundedBy($part, '%')) {
                     // Avoid environment variable expansion
@@ -64,6 +64,6 @@ public static function escapeArgument($argument)
      */
     protected static function isSurroundedBy($arg, $char)
     {
-        return 2 < strlen($arg) && $char === $arg[0] && $char === $arg[strlen($arg) - 1];
+        return strlen($arg) > 2 && $char === $arg[0] && $char === $arg[strlen($arg) - 1];
     }
 }
diff --git a/src/Illuminate/Testing/TestResponse.php b/src/Illuminate/Testing/TestResponse.php
@@ -507,7 +507,7 @@ public function assertCookieExpired($cookieName)
         $expiresAt = Carbon::createFromTimestamp($cookie->getExpiresTime());
 
         PHPUnit::assertTrue(
-            0 !== $cookie->getExpiresTime() && $expiresAt->lessThan(Carbon::now()),
+            $cookie->getExpiresTime() !== 0 && $expiresAt->lessThan(Carbon::now()),
             "Cookie [{$cookieName}] is not expired, it expires at [{$expiresAt}]."
         );
 
@@ -530,7 +530,7 @@ public function assertCookieNotExpired($cookieName)
         $expiresAt = Carbon::createFromTimestamp($cookie->getExpiresTime());
 
         PHPUnit::assertTrue(
-            0 === $cookie->getExpiresTime() || $expiresAt->greaterThan(Carbon::now()),
+            $cookie->getExpiresTime() === 0 || $expiresAt->greaterThan(Carbon::now()),
             "Cookie [{$cookieName}] is expired, it expired at [{$expiresAt}]."
         );
 

diff --git a/src/Illuminate/Validation/ValidationException.php b/src/Illuminate/Validation/ValidationException.php
@@ -94,7 +94,7 @@ protected static function summarize($validator)
         $message = array_shift($messages);
 
         if ($additional = count($messages)) {
-            $pluralized = 1 === $additional ? 'error' : 'errors';
+            $pluralized = $additional === 1 ? 'error' : 'errors';
 
             $message .= " (and {$additional} more {$pluralized})";
         }

diff --git a/tests/Cache/CacheEventsTest.php b/tests/Cache/CacheEventsTest.php
@@ -182,7 +182,7 @@ protected function assertEventMatches($eventClass, $properties = [])
             }
 
             foreach ($properties as $name => $value) {
-                if ($event->$name != $value) {
+                if ($value != $event->$name) {
                     return false;
                 }
             }