Apply rector PHPUnit assertion cleanups (#60807)

Runs AssertTrueFalseToSpecificMethodRector, AssertSameTrueFalseToAssertTrueFalseRector,
ExpressionCreateMockToCreateStubRector, AssertSameBoolNullToSpecificMethodRector,
AssertInstanceOfComparisonRector, and AssertNotOperatorRector, then drops the
now-satisfied rules from rector.php.

Author: lucasmichot

rector.php

@@ -47,12 +47,7 @@
 use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertEmptyNullableObjectToAssertInstanceofRector;
 use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertEqualsOrAssertSameFloatParameterToSpecificMethodsTypeRector;
 use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertEqualsToSameRector;
-use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertInstanceOfComparisonRector;
 use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertIssetToSpecificMethodRector;
-use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertNotOperatorRector;
-use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertSameBoolNullToSpecificMethodRector;
-use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertSameTrueFalseToAssertTrueFalseRector;
-use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertTrueFalseToSpecificMethodRector;
 use Rector\PHPUnit\CodeQuality\Rector\MethodCall\ScalarArgumentToExpectedParamTypeRector;
 use Rector\PHPUnit\CodeQuality\Rector\MethodCall\StringCastAssertStringContainsStringRector;
 use Rector\PHPUnit\CodeQuality\Rector\StmtsAwareInterface\DeclareStrictTypesTestsRector;
@@ -70,12 +65,7 @@
     AssertEmptyNullableObjectToAssertInstanceofRector::class,
     AssertEqualsOrAssertSameFloatParameterToSpecificMethodsTypeRector::class,
     AssertEqualsToSameRector::class,
-    AssertInstanceOfComparisonRector::class,
     AssertIssetToSpecificMethodRector::class,
-    AssertNotOperatorRector::class,
-    AssertSameBoolNullToSpecificMethodRector::class,
-    AssertSameTrueFalseToAssertTrueFalseRector::class,
-    AssertTrueFalseToSpecificMethodRector::class,
     CreateStubOverCreateMockArgRector::class,
     DataProviderArrayItemsNewLinedRector::class,
     DeclareStrictTypesTestsRector::class,

src/Illuminate/Foundation/Testing/Concerns/InteractsWithExceptionHandling.php

@@ -233,8 +233,8 @@ protected function assertDoesntThrow(Closure $test)
             $exceptionMessage = $exception->getMessage();
         }
 
-        Assert::assertTrue(
-            ! $thrown,
+        Assert::assertFalse(
+            $thrown,
             sprintf('Unexpected exception of type %s with message %s was thrown.', $exceptionClass ?? null, $exceptionMessage ?? null)
         );
 

src/Illuminate/Queue/InteractsWithQueue.php

@@ -122,8 +122,8 @@ public function assertNotDeleted()
     {
         $this->ensureQueueInteractionsHaveBeenFaked();
 
-        PHPUnit::assertTrue(
-            ! $this->job->isDeleted(),
+        PHPUnit::assertFalse(
+            $this->job->isDeleted(),
             'Job was unexpectedly deleted.'
         );
 
@@ -202,8 +202,8 @@ public function assertNotFailed()
     {
         $this->ensureQueueInteractionsHaveBeenFaked();
 
-        PHPUnit::assertTrue(
-            ! $this->job->hasFailed(),
+        PHPUnit::assertFalse(
+            $this->job->hasFailed(),
             'Job was unexpectedly failed manually.'
         );
 
@@ -249,8 +249,8 @@ public function assertNotReleased()
     {
         $this->ensureQueueInteractionsHaveBeenFaked();
 
-        PHPUnit::assertTrue(
-            ! $this->job->isReleased(),
+        PHPUnit::assertFalse(
+            $this->job->isReleased(),
             'Job was unexpectedly released.'
         );
 

src/Illuminate/Support/Testing/Fakes/ExceptionHandlerFake.php

@@ -71,8 +71,9 @@ public function assertReported(Closure|string $exception)
         );
 
         if (is_string($exception)) {
-            Assert::assertTrue(
-                in_array($exception, array_map(get_class(...), $this->reported), true),
+            Assert::assertContains(
+                $exception,
+                array_map(get_class(...), $this->reported),
                 $message,
             );
 

tests/Auth/AuthGuardTest.php

@@ -112,7 +112,7 @@ public function testAttemptReturnsUserInterface()
         });
         $events->shouldReceive('dispatch')->once()->with(m::type(Attempting::class));
         $events->shouldReceive('dispatch')->once()->with(m::type(Validated::class));
-        $user = $this->createMock(Authenticatable::class);
+        $user = $this->createStub(Authenticatable::class);
         $guard->getProvider()->shouldReceive('retrieveByCredentials')->once()->andReturn($user);
         $guard->getProvider()->shouldReceive('validateCredentials')->with($user, ['foo'])->andReturn(true);
         $guard->getProvider()->shouldReceive('rehashPasswordIfRequired')->with($user, ['foo'])->once();
@@ -192,7 +192,7 @@ public function testAttemptRehashesPasswordWhenRequired()
         });
         $events->shouldReceive('dispatch')->once()->with(m::type(Attempting::class));
         $events->shouldReceive('dispatch')->once()->with(m::type(Validated::class));
-        $user = $this->createMock(Authenticatable::class);
+        $user = $this->createStub(Authenticatable::class);
         $guard->getProvider()->shouldReceive('retrieveByCredentials')->once()->andReturn($user);
         $guard->getProvider()->shouldReceive('validateCredentials')->with($user, ['foo'])->andReturn(true);
         $guard->getProvider()->shouldReceive('rehashPasswordIfRequired')->with($user, ['foo'])->once();
@@ -212,7 +212,7 @@ public function testAttemptDoesntRehashPasswordWhenDisabled()
         });
         $events->shouldReceive('dispatch')->once()->with(m::type(Attempting::class));
         $events->shouldReceive('dispatch')->once()->with(m::type(Validated::class));
-        $user = $this->createMock(Authenticatable::class);
+        $user = $this->createStub(Authenticatable::class);
         $guard->getProvider()->shouldReceive('retrieveByCredentials')->once()->andReturn($user);
         $guard->getProvider()->shouldReceive('validateCredentials')->with($user, ['foo'])->andReturn(true);
         $guard->getProvider()->shouldNotReceive('rehashPasswordIfRequired');

tests/Cache/CacheRateLimiterTest.php

@@ -163,7 +163,7 @@ public function testAttemptsCallbackReturnsCallbackReturn()
             return 'foo';
         }, 1));
 
-        $this->assertSame(false, $rateLimiter->attempt('key', 1, function () {
+        $this->assertFalse($rateLimiter->attempt('key', 1, function () {
             return false;
         }, 1));
 

tests/Cache/ConcurrencyLimiterTest.php

@@ -237,7 +237,7 @@ function () {
 
     public function testFunnelThrowsExceptionWhenStoreDoesNotSupportLocks()
     {
-        $store = $this->createMock(Store::class);
+        $store = $this->createStub(Store::class);
         $repository = new Repository($store);
 
         $this->assertNotInstanceOf(LockProvider::class, $store);

tests/Container/ContainerTest.php

@@ -327,7 +327,7 @@ public function testResolutionOfClassWithDefaultParameters()
         $container = new Container;
         $instance = $container->make(ContainerClassWithDefaultValueStub::class);
         $this->assertInstanceOf(ContainerConcreteStub::class, $instance->noDefault);
-        $this->assertSame(null, $instance->default);
+        $this->assertNull($instance->default);
 
         $container->bind(ContainerConcreteStub::class, fn () => new ContainerConcreteStub);
         $instance = $container->make(ContainerClassWithDefaultValueStub::class);

tests/Database/DatabaseConnectionTest.php

@@ -275,7 +275,7 @@ public function testDisconnectClearsTransactionManagerState()
 
     public function testBeganTransactionFiresEventsIfSet()
     {
-        $pdo = $this->createMock(DatabaseConnectionTestMockPDO::class);
+        $pdo = $this->createStub(DatabaseConnectionTestMockPDO::class);
         $connection = $this->getMockConnection(['getName'], $pdo);
         $connection->method('getName')->willReturn('name');
         $connection->setEventDispatcher($events = m::mock(Dispatcher::class));
@@ -285,7 +285,7 @@ public function testBeganTransactionFiresEventsIfSet()
 
     public function testCommittedFiresEventsIfSet()
     {
-        $pdo = $this->createMock(DatabaseConnectionTestMockPDO::class);
+        $pdo = $this->createStub(DatabaseConnectionTestMockPDO::class);
         $connection = $this->getMockConnection(['getName'], $pdo);
         $connection->method('getName')->willReturn('name');
         $connection->setEventDispatcher($events = m::mock(Dispatcher::class));
@@ -295,7 +295,7 @@ public function testCommittedFiresEventsIfSet()
 
     public function testCommittingFiresEventsIfSet()
     {
-        $pdo = $this->createMock(DatabaseConnectionTestMockPDO::class);
+        $pdo = $this->createStub(DatabaseConnectionTestMockPDO::class);
         $connection = $this->getMockConnection(['getName', 'transactionLevel'], $pdo);
         $connection->method('getName')->willReturn('name');
         $connection->method('transactionLevel')->willReturn(1);
@@ -307,7 +307,7 @@ public function testCommittingFiresEventsIfSet()
 
     public function testRollBackedFiresEventsIfSet()
     {
-        $pdo = $this->createMock(DatabaseConnectionTestMockPDO::class);
+        $pdo = $this->createStub(DatabaseConnectionTestMockPDO::class);
         $connection = $this->getMockConnection(['getName'], $pdo);
         $connection->method('getName')->willReturn('name');
         $connection->beginTransaction();
@@ -318,7 +318,7 @@ public function testRollBackedFiresEventsIfSet()
 
     public function testRedundantRollBackFiresNoEvent()
     {
-        $pdo = $this->createMock(DatabaseConnectionTestMockPDO::class);
+        $pdo = $this->createStub(DatabaseConnectionTestMockPDO::class);
         $connection = $this->getMockConnection(['getName'], $pdo);
         $connection->method('getName')->willReturn('name');
         $connection->setEventDispatcher($events = m::mock(Dispatcher::class));
@@ -450,7 +450,7 @@ public function testRunMethodRetriesOnFailure()
     {
         $method = (new ReflectionClass(Connection::class))->getMethod('run');
 
-        $pdo = $this->createMock(DatabaseConnectionTestMockPDO::class);
+        $pdo = $this->createStub(DatabaseConnectionTestMockPDO::class);
         $mock = $this->getMockConnection(['tryAgainIfCausedByLostConnection'], $pdo);
         $mock->expects($this->once())->method('tryAgainIfCausedByLostConnection');
 

tests/Database/DatabaseEloquentCollectionTest.php

@@ -355,7 +355,7 @@ public function testMappingToNonModelsReturnsABaseCollection()
             return 'not-a-model';
         });
 
-        $this->assertEquals(BaseCollection::class, get_class($c));
+        $this->assertInstanceOf(BaseCollection::class, $c);
     }
 
     public function testMapWithKeys()
@@ -384,7 +384,7 @@ public function testMapWithKeysToNonModelsReturnsABaseCollection()
             return [$key++ => 'not-a-model'];
         });
 
-        $this->assertEquals(BaseCollection::class, get_class($c));
+        $this->assertInstanceOf(BaseCollection::class, $c);
     }
 
     public function testCollectionDiffsWithGivenCollection()
@@ -612,15 +612,15 @@ public function testNonModelRelatedMethods()
     {
         $a = new Collection([['foo' => 'bar'], ['foo' => 'baz']]);
         $b = new Collection(['a', 'b', 'c']);
-        $this->assertEquals(BaseCollection::class, get_class($a->pluck('foo')));
-        $this->assertEquals(BaseCollection::class, get_class($a->keys()));
-        $this->assertEquals(BaseCollection::class, get_class($a->collapse()));
-        $this->assertEquals(BaseCollection::class, get_class($a->flatten()));
-        $this->assertEquals(BaseCollection::class, get_class($a->zip(['a', 'b'], ['c', 'd'])));
-        $this->assertEquals(BaseCollection::class, get_class($a->countBy('foo')));
-        $this->assertEquals(BaseCollection::class, get_class($b->flip()));
-        $this->assertEquals(BaseCollection::class, get_class($a->partition('foo', '=', 'bar')));
-        $this->assertEquals(BaseCollection::class, get_class($a->partition('foo', 'bar')));
+        $this->assertInstanceOf(BaseCollection::class, $a->pluck('foo'));
+        $this->assertInstanceOf(BaseCollection::class, $a->keys());
+        $this->assertInstanceOf(BaseCollection::class, $a->collapse());
+        $this->assertInstanceOf(BaseCollection::class, $a->flatten());
+        $this->assertInstanceOf(BaseCollection::class, $a->zip(['a', 'b'], ['c', 'd']));
+        $this->assertInstanceOf(BaseCollection::class, $a->countBy('foo'));
+        $this->assertInstanceOf(BaseCollection::class, $b->flip());
+        $this->assertInstanceOf(BaseCollection::class, $a->partition('foo', '=', 'bar'));
+        $this->assertInstanceOf(BaseCollection::class, $a->partition('foo', 'bar'));
     }
 
     public function testMakeVisibleRemovesHiddenAndIncludesVisible()