Always prefer typesafe string comparisons. (#36657)

Lucas Michot · web-flow · commit 371e7c4e0786 · 2021-03-18T16:27:31.000-05:00
diff --git a/src/Illuminate/Http/Request.php b/src/Illuminate/Http/Request.php
@@ -142,7 +142,7 @@ public function path()
     {
         $pattern = trim($this->getPathInfo(), '/');
 
-        return $pattern == '' ? '/' : $pattern;
+        return $pattern === '' ? '/' : $pattern;
     }
 
     /**
diff --git a/src/Illuminate/Queue/DatabaseQueue.php b/src/Illuminate/Queue/DatabaseQueue.php
@@ -253,8 +253,8 @@ protected function getLockForPopping()
         $databaseEngine = $this->database->getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME);
         $databaseVersion = $this->database->getConfig('version') ?? $this->database->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION);
 
-        if ($databaseEngine == 'mysql' && ! strpos($databaseVersion, 'MariaDB') && version_compare($databaseVersion, '8.0.1', '>=') ||
-            $databaseEngine == 'pgsql' && version_compare($databaseVersion, '9.5', '>=')) {
+        if ($databaseEngine === 'mysql' && ! strpos($databaseVersion, 'MariaDB') && version_compare($databaseVersion, '8.0.1', '>=') ||
+            $databaseEngine === 'pgsql' && version_compare($databaseVersion, '9.5', '>=')) {
             return 'FOR UPDATE SKIP LOCKED';
         }
 
diff --git a/src/Illuminate/Routing/CompiledRouteCollection.php b/src/Illuminate/Routing/CompiledRouteCollection.php
@@ -297,7 +297,7 @@ protected function newRoute(array $attributes)
             ), '/');
         }
 
-        return $this->router->newRoute($attributes['methods'], $baseUri == '' ? '/' : $baseUri, $attributes['action'])
+        return $this->router->newRoute($attributes['methods'], $baseUri === '' ? '/' : $baseUri, $attributes['action'])
             ->setFallback($attributes['fallback'])
             ->setDefaults($attributes['defaults'])
             ->setWheres($attributes['wheres'])
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php
@@ -522,7 +522,7 @@ public static function replaceArray($search, array $replace, $subject)
      */
     public static function replaceFirst($search, $replace, $subject)
     {
-        if ($search == '') {
+        if ($search === '') {
             return $subject;
         }
 
diff --git a/src/Illuminate/Support/helpers.php b/src/Illuminate/Support/helpers.php
@@ -157,7 +157,7 @@ function filled($value)
      */
     function object_get($object, $key, $default = null)
     {
-        if (is_null($key) || trim($key) == '') {
+        if (is_null($key) || trim($key) === '') {
             return $object;
         }
 
diff --git a/src/Illuminate/Testing/Concerns/TestDatabases.php b/src/Illuminate/Testing/Concerns/TestDatabases.php
@@ -133,7 +133,7 @@ protected function whenNotUsingInMemoryDatabase($callback)
     {
         $database = DB::getConfig('database');
 
-        if ($database != ':memory:') {
+        if ($database !== ':memory:') {
             $callback($database);
         }
     }
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -528,7 +528,7 @@ protected function validateAttribute($attribute, $rule)
 
         [$rule, $parameters] = ValidationRuleParser::parse($rule);
 
-        if ($rule == '') {
+        if ($rule === '') {
             return;
         }
 
diff --git a/tests/Auth/AuthAccessGateTest.php b/tests/Auth/AuthAccessGateTest.php
@@ -262,9 +262,9 @@ public function testAfterCallbacksAreCalledWithResult()
         });
 
         $gate->after(function ($user, $ability, $result) {
-            if ($ability == 'foo') {
+            if ($ability === 'foo') {
                 $this->assertTrue($result, 'After callback on `foo` should receive true as result');
-            } elseif ($ability == 'bar') {
+            } elseif ($ability === 'bar') {
                 $this->assertFalse($result, 'After callback on `bar` should receive false as result');
             } else {
                 $this->assertNull($result, 'After callback on `missing` should receive null as result');
@@ -312,7 +312,7 @@ public function testAfterCallbacksDoNotOverrideEachOther()
         $gate = $this->getBasicGate();
 
         $gate->after(function ($user, $ability, $result) {
-            return $ability == 'allow';
+            return $ability === 'allow';
         });
 
         $gate->after(function ($user, $ability, $result) {
diff --git a/tests/Console/Scheduling/EventTest.php b/tests/Console/Scheduling/EventTest.php
@@ -66,7 +66,7 @@ public function testBuildCommandInBackgroundUsingWindows()
 
     public function testBuildCommandSendOutputTo()
     {
-        $quote = (DIRECTORY_SEPARATOR == '\\') ? '"' : "'";
+        $quote = (DIRECTORY_SEPARATOR === '\\') ? '"' : "'";
 
         $event = new Event(m::mock(EventMutex::class), 'php -i');
 
@@ -81,7 +81,7 @@ public function testBuildCommandSendOutputTo()
 
     public function testBuildCommandAppendOutput()
     {
-        $quote = (DIRECTORY_SEPARATOR == '\\') ? '"' : "'";
+        $quote = (DIRECTORY_SEPARATOR === '\\') ? '"' : "'";
 
         $event = new Event(m::mock(EventMutex::class), 'php -i');
 
diff --git a/tests/Database/DatabaseEloquentFactoryTest.php b/tests/Database/DatabaseEloquentFactoryTest.php
@@ -243,7 +243,7 @@ public function test_belongs_to_relationship()
                         ->create();
 
         $this->assertCount(3, $posts->filter(function ($post) {
-            return $post->user->name == 'Taylor Otwell';
+            return $post->user->name === 'Taylor Otwell';
         }));
 
         $this->assertCount(1, FactoryTestUser::all());
@@ -401,11 +401,11 @@ public function test_sequences()
         $this->assertCount(4, $user->roles);
 
         $this->assertCount(2, $user->roles->filter(function ($role) {
-            return $role->pivot->admin == 'Y';
+            return $role->pivot->admin === 'Y';
         }));
 
         $this->assertCount(2, $user->roles->filter(function ($role) {
-            return $role->pivot->admin == 'N';
+            return $role->pivot->admin === 'N';
         }));
     }
 
diff --git a/tests/Database/DatabaseMigrationRefreshCommandTest.php b/tests/Database/DatabaseMigrationRefreshCommandTest.php
@@ -40,7 +40,7 @@ public function testRefreshCommandCallsCommandsWithProperArguments()
         $console->shouldReceive('find')->with('migrate')->andReturn($migrateCommand);
         $dispatcher->shouldReceive('dispatch')->once()->with(m::type(DatabaseRefreshed::class));
 
-        $quote = DIRECTORY_SEPARATOR == '\\' ? '"' : "'";
+        $quote = DIRECTORY_SEPARATOR === '\\' ? '"' : "'";
         $resetCommand->shouldReceive('run')->with(new InputMatcher("--force=1 {$quote}migrate:reset{$quote}"), m::any());
         $migrateCommand->shouldReceive('run')->with(new InputMatcher('--force=1 migrate'), m::any());
 
@@ -65,7 +65,7 @@ public function testRefreshCommandCallsCommandsWithStep()
         $console->shouldReceive('find')->with('migrate')->andReturn($migrateCommand);
         $dispatcher->shouldReceive('dispatch')->once()->with(m::type(DatabaseRefreshed::class));
 
-        $quote = DIRECTORY_SEPARATOR == '\\' ? '"' : "'";
+        $quote = DIRECTORY_SEPARATOR === '\\' ? '"' : "'";
         $rollbackCommand->shouldReceive('run')->with(new InputMatcher("--step=2 --force=1 {$quote}migrate:rollback{$quote}"), m::any());
         $migrateCommand->shouldReceive('run')->with(new InputMatcher('--force=1 migrate'), m::any());
 
diff --git a/tests/Filesystem/FilesystemTest.php b/tests/Filesystem/FilesystemTest.php
@@ -137,7 +137,7 @@ public function testSetChmod()
         $files = new Filesystem;
         $files->chmod(self::$tempDir.'/file.txt', 0755);
         $filePermission = substr(sprintf('%o', fileperms(self::$tempDir.'/file.txt')), -4);
-        $expectedPermissions = DIRECTORY_SEPARATOR == '\\' ? '0666' : '0755';
+        $expectedPermissions = DIRECTORY_SEPARATOR === '\\' ? '0666' : '0755';
         $this->assertEquals($expectedPermissions, $filePermission);
     }
 
@@ -148,7 +148,7 @@ public function testGetChmod()
 
         $files = new Filesystem;
         $filePermission = $files->chmod(self::$tempDir.'/file.txt');
-        $expectedPermissions = DIRECTORY_SEPARATOR == '\\' ? '0666' : '0755';
+        $expectedPermissions = DIRECTORY_SEPARATOR === '\\' ? '0666' : '0755';
         $this->assertEquals($expectedPermissions, $filePermission);
     }
 
@@ -488,7 +488,7 @@ public function testMakeDirectory()
      */
     public function testSharedGet()
     {
-        if (PHP_OS == 'Darwin') {
+        if (PHP_OS === 'Darwin') {
             $this->markTestSkipped('The operating system is MacOS.');
         }
 
diff --git a/tests/Http/HttpClientTest.php b/tests/Http/HttpClientTest.php
@@ -688,13 +688,13 @@ public function testCanAssertAgainstOrderOfHttpRequestsWithCallables()
 
         $exampleUrls = [
             function ($request) {
-                return $request->url() == 'http://example.com/1';
+                return $request->url() === 'http://example.com/1';
             },
             function ($request) {
-                return $request->url() == 'http://example.com/2';
+                return $request->url() === 'http://example.com/2';
             },
             function ($request) {
-                return $request->url() == 'http://example.com/3';
+                return $request->url() === 'http://example.com/3';
             },
         ];
 
diff --git a/tests/Integration/Database/MigratorEventsTest.php b/tests/Integration/Database/MigratorEventsTest.php
@@ -41,16 +41,16 @@ public function testMigrationEventsContainTheMigrationAndMethod()
         $this->artisan('migrate:rollback', $this->migrateOptions());
 
         Event::assertDispatched(MigrationStarted::class, function ($event) {
-            return $event->method == 'up' && $event->migration instanceof Migration;
+            return $event->method === 'up' && $event->migration instanceof Migration;
         });
         Event::assertDispatched(MigrationStarted::class, function ($event) {
-            return $event->method == 'down' && $event->migration instanceof Migration;
+            return $event->method === 'down' && $event->migration instanceof Migration;
         });
         Event::assertDispatched(MigrationEnded::class, function ($event) {
-            return $event->method == 'up' && $event->migration instanceof Migration;
+            return $event->method === 'up' && $event->migration instanceof Migration;
         });
         Event::assertDispatched(MigrationEnded::class, function ($event) {
-            return $event->method == 'down' && $event->migration instanceof Migration;
+            return $event->method === 'down' && $event->migration instanceof Migration;
         });
     }
 
@@ -62,10 +62,10 @@ public function testTheNoMigrationEventIsFiredWhenNothingToMigrate()
         $this->artisan('migrate:rollback');
 
         Event::assertDispatched(NoPendingMigrations::class, function ($event) {
-            return $event->method == 'up';
+            return $event->method === 'up';
         });
         Event::assertDispatched(NoPendingMigrations::class, function ($event) {
-            return $event->method == 'down';
+            return $event->method === 'down';
         });
     }
 }
diff --git a/tests/Notifications/NotificationBroadcastChannelTest.php b/tests/Notifications/NotificationBroadcastChannelTest.php
@@ -83,7 +83,7 @@ public function testNotificationIsBroadcastedNow()
 
         $events = m::mock(Dispatcher::class);
         $events->shouldReceive('dispatch')->once()->with(m::on(function ($event) {
-            return $event->connection == 'sync';
+            return $event->connection === 'sync';
         }));
         $channel = new BroadcastChannel($events);
         $channel->send($notifiable, $notification);
diff --git a/tests/Support/SupportCollectionTest.php b/tests/Support/SupportCollectionTest.php
@@ -582,7 +582,7 @@ public function testFilter($collection)
 
         $c = new $collection(['id' => 1, 'first' => 'Hello', 'second' => 'World']);
         $this->assertEquals(['first' => 'Hello', 'second' => 'World'], $c->filter(function ($item, $key) {
-            return $key != 'id';
+            return $key !== 'id';
         })->all());
     }
 
@@ -3126,7 +3126,7 @@ public function testRejectRemovesElementsPassingTruthTest($collection)
 
         $c = new $collection(['foo', 'bar']);
         $this->assertEquals(['foo'], $c->reject(function ($v) {
-            return $v == 'bar';
+            return $v === 'bar';
         })->values()->all());
 
         $c = new $collection(['foo', null]);
@@ -3137,12 +3137,12 @@ public function testRejectRemovesElementsPassingTruthTest($collection)
 
         $c = new $collection(['foo', 'bar']);
         $this->assertEquals(['foo', 'bar'], $c->reject(function ($v) {
-            return $v == 'baz';
+            return $v === 'baz';
         })->values()->all());
 
         $c = new $collection(['id' => 1, 'primary' => 'foo', 'secondary' => 'bar']);
         $this->assertEquals(['primary' => 'foo', 'secondary' => 'bar'], $c->reject(function ($item, $key) {
-            return $key == 'id';
+            return $key === 'id';
         })->all());
     }
 
@@ -3215,7 +3215,7 @@ public function testSearchReturnsFalseWhenItemIsNotFound($collection)
             return $value < 1 && is_numeric($value);
         }));
         $this->assertFalse($c->search(function ($value) {
-            return $value == 'nope';
+            return $value === 'nope';
         }));
     }
 
diff --git a/tests/Support/SupportTestingQueueFakeTest.php b/tests/Support/SupportTestingQueueFakeTest.php
@@ -220,15 +220,15 @@ public function testAssertPushedWithChainUsingCallback()
         $this->fake->assertPushedWithChain(JobWithChainAndParameterStub::class, [
             JobStub::class,
         ], function ($job) {
-            return $job->parameter == 'second';
+            return $job->parameter === 'second';
         });
 
         try {
             $this->fake->assertPushedWithChain(JobWithChainAndParameterStub::class, [
                 JobStub::class,
                 JobStub::class,
             ], function ($job) {
-                return $job->parameter == 'second';
+                return $job->parameter === 'second';
             });
             $this->fail();
         } catch (ExpectationFailedException $e) {
diff --git a/tests/Testing/ParallelTestingTest.php b/tests/Testing/ParallelTestingTest.php
@@ -58,7 +58,7 @@ public function testOptions()
         $this->assertFalse($parallelTesting->option('recreate_databases'));
 
         $parallelTesting->resolveOptionsUsing(function ($option) {
-            return $option == 'recreate_databases';
+            return $option === 'recreate_databases';
         });
 
         $this->assertFalse($parallelTesting->option('recreate_caches'));
diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -3830,7 +3830,7 @@ public function testSometimesAddingRules()
         $trans = $this->getIlluminateArrayTranslator();
         $v = new Validator($trans, ['x' => 'foo'], ['x' => 'Required']);
         $v->sometimes('x', 'Confirmed', function ($i) {
-            return $i->x == 'foo';
+            return $i->x === 'foo';
         });
         $this->assertEquals(['x' => ['Required', 'Confirmed']], $v->getRules());
 
@@ -3844,21 +3844,21 @@ public function testSometimesAddingRules()
         $trans = $this->getIlluminateArrayTranslator();
         $v = new Validator($trans, ['x' => 'foo'], ['x' => 'Required']);
         $v->sometimes('x', 'Confirmed', function ($i) {
-            return $i->x == 'bar';
+            return $i->x === 'bar';
         });
         $this->assertEquals(['x' => ['Required']], $v->getRules());
 
         $trans = $this->getIlluminateArrayTranslator();
         $v = new Validator($trans, ['x' => 'foo'], ['x' => 'Required']);
         $v->sometimes('x', 'Foo|Bar', function ($i) {
-            return $i->x == 'foo';
+            return $i->x === 'foo';
         });
         $this->assertEquals(['x' => ['Required', 'Foo', 'Bar']], $v->getRules());
 
         $trans = $this->getIlluminateArrayTranslator();
         $v = new Validator($trans, ['x' => 'foo'], ['x' => 'Required']);
         $v->sometimes('x', ['Foo', 'Bar:Baz'], function ($i) {
-            return $i->x == 'foo';
+            return $i->x === 'foo';
         });
         $this->assertEquals(['x' => ['Required', 'Foo', 'Bar:Baz']], $v->getRules());
 
@@ -3963,7 +3963,7 @@ public function testCustomDependentValidators()
             ['*.name' => 'dependent_rule:*.age']
         );
         $v->addDependentExtension('dependent_rule', function ($name) use ($v) {
-            return Arr::get($v->getData(), $name) == 'Jamie';
+            return Arr::get($v->getData(), $name) === 'Jamie';
         });
         $this->assertTrue($v->passes());
     }

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public function path()`
`142`	`142`	`{`
`143`	`143`	`$pattern = trim($this->getPathInfo(), '/');`
`144`	`144`
`145`		`- return $pattern == '' ? '/' : $pattern;`
	`145`	`+ return $pattern === '' ? '/' : $pattern;`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -253,8 +253,8 @@ protected function getLockForPopping()`
`253`	`253`	`$databaseEngine = $this->database->getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME);`
`254`	`254`	`$databaseVersion = $this->database->getConfig('version') ?? $this->database->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION);`
`255`	`255`
`256`		`- if ($databaseEngine == 'mysql' && ! strpos($databaseVersion, 'MariaDB') && version_compare($databaseVersion, '8.0.1', '>=') \|\|`
`257`		`- $databaseEngine == 'pgsql' && version_compare($databaseVersion, '9.5', '>=')) {`
	`256`	`+ if ($databaseEngine === 'mysql' && ! strpos($databaseVersion, 'MariaDB') && version_compare($databaseVersion, '8.0.1', '>=') \|\|`
	`257`	`+ $databaseEngine === 'pgsql' && version_compare($databaseVersion, '9.5', '>=')) {`
`258`	`258`	`return 'FOR UPDATE SKIP LOCKED';`
`259`	`259`	`}`
`260`	`260`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ protected function newRoute(array $attributes)`
`297`	`297`	`), '/');`
`298`	`298`	`}`
`299`	`299`
`300`		`- return $this->router->newRoute($attributes['methods'], $baseUri == '' ? '/' : $baseUri, $attributes['action'])`
	`300`	`+ return $this->router->newRoute($attributes['methods'], $baseUri === '' ? '/' : $baseUri, $attributes['action'])`
`301`	`301`	`->setFallback($attributes['fallback'])`
`302`	`302`	`->setDefaults($attributes['defaults'])`
`303`	`303`	`->setWheres($attributes['wheres'])`
Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,7 @@ public static function replaceArray($search, array $replace, $subject)`
`522`	`522`	`*/`
`523`	`523`	`public static function replaceFirst($search, $replace, $subject)`
`524`	`524`	`{`
`525`		`- if ($search == '') {`
	`525`	`+ if ($search === '') {`
`526`	`526`	`return $subject;`
`527`	`527`	`}`
`528`	`528`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ function filled($value)`
`157`	`157`	`*/`
`158`	`158`	`function object_get($object, $key, $default = null)`
`159`	`159`	`{`
`160`		`- if (is_null($key) \|\| trim($key) == '') {`
	`160`	`+ if (is_null($key) \|\| trim($key) === '') {`
`161`	`161`	`return $object;`
`162`	`162`	`}`
`163`	`163`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ protected function whenNotUsingInMemoryDatabase($callback)`
`133`	`133`	`{`
`134`	`134`	`$database = DB::getConfig('database');`
`135`	`135`
`136`		`- if ($database != ':memory:') {`
	`136`	`+ if ($database !== ':memory:') {`
`137`	`137`	`$callback($database);`
`138`	`138`	`}`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,7 @@ protected function validateAttribute($attribute, $rule)`
`528`	`528`
`529`	`529`	`[$rule, $parameters] = ValidationRuleParser::parse($rule);`
`530`	`530`
`531`		`- if ($rule == '') {`
	`531`	`+ if ($rule === '') {`
`532`	`532`	`return;`
`533`	`533`	`}`
`534`	`534`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function testBuildCommandInBackgroundUsingWindows()`
`66`	`66`
`67`	`67`	`public function testBuildCommandSendOutputTo()`
`68`	`68`	`{`
`69`		`- $quote = (DIRECTORY_SEPARATOR == '\\') ? '"' : "'";`
	`69`	`+ $quote = (DIRECTORY_SEPARATOR === '\\') ? '"' : "'";`
`70`	`70`
`71`	`71`	`$event = new Event(m::mock(EventMutex::class), 'php -i');`
`72`	`72`
`@@ -81,7 +81,7 @@ public function testBuildCommandSendOutputTo()`
`81`	`81`
`82`	`82`	`public function testBuildCommandAppendOutput()`
`83`	`83`	`{`
`84`		`- $quote = (DIRECTORY_SEPARATOR == '\\') ? '"' : "'";`
	`84`	`+ $quote = (DIRECTORY_SEPARATOR === '\\') ? '"' : "'";`
`85`	`85`
`86`	`86`	`$event = new Event(m::mock(EventMutex::class), 'php -i');`
`87`	`87`