[13.x] testsuite (#59702)

* Add rules for testsuite

* Modernize assertions and mocks

---------

Co-authored-by: Lucas Michot <lucas@zaiple.com>

Author: lucasmichot

rector.php

@@ -34,8 +34,55 @@
 use Rector\Php83\Rector\ClassConst\AddTypeToConstRector;
 use Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector;
 use Rector\Php83\Rector\FuncCall\DynamicClassConstFetchRector;
+use Rector\PHPUnit\CodeQuality\Rector\CallLike\DirectInstanceOverMockArgRector;
+use Rector\PHPUnit\CodeQuality\Rector\Class_\ConstructClassMethodToSetUpTestCaseRector;
+use Rector\PHPUnit\CodeQuality\Rector\Class_\InlineStubPropertyToCreateStubMethodCallRector;
+use Rector\PHPUnit\CodeQuality\Rector\Class_\NarrowUnusedSetUpDefinedPropertyRector;
+use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
+use Rector\PHPUnit\CodeQuality\Rector\Class_\RemoveNeverUsedMockPropertyRector;
+use Rector\PHPUnit\CodeQuality\Rector\ClassMethod\EntityDocumentCreateMockToDirectNewRector;
+use Rector\PHPUnit\CodeQuality\Rector\ClassMethod\RemoveEmptyTestMethodRector;
+use Rector\PHPUnit\CodeQuality\Rector\ClassMethod\RemoveStandaloneCreateMockRector;
+use Rector\PHPUnit\CodeQuality\Rector\ClassMethod\ReplaceTestAnnotationWithPrefixedFunctionRector;
+use Rector\PHPUnit\CodeQuality\Rector\Foreach_\SimplifyForeachInstanceOfRector;
+use Rector\PHPUnit\CodeQuality\Rector\FuncCall\AssertFuncCallToPHPUnitAssertRector;
+use Rector\PHPUnit\CodeQuality\Rector\MethodCall\MergeWithCallableAndWillReturnRector;
+use Rector\PHPUnit\CodeQuality\Rector\MethodCall\NarrowIdenticalWithConsecutiveRector;
+use Rector\PHPUnit\CodeQuality\Rector\MethodCall\NarrowSingleWillReturnCallbackRector;
+use Rector\PHPUnit\CodeQuality\Rector\MethodCall\RemoveExpectAnyFromMockRector;
+use Rector\PHPUnit\CodeQuality\Rector\MethodCall\SimplerWithIsInstanceOfRector;
+use Rector\PHPUnit\CodeQuality\Rector\MethodCall\SingleWithConsecutiveToWithRector;
+use Rector\PHPUnit\CodeQuality\Rector\MethodCall\UseSpecificWillMethodRector;
+use Rector\PHPUnit\CodeQuality\Rector\MethodCall\UseSpecificWithMethodRector;
+use Rector\PHPUnit\PHPUnit60\Rector\MethodCall\GetMockBuilderGetMockToCreateMockRector;
+use Rector\PHPUnit\PHPUnit90\Rector\MethodCall\ReplaceAtMethodWithDesiredMatcherRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
 
+$testsuiteRules = [
+    AssertFuncCallToPHPUnitAssertRector::class,
+    ConstructClassMethodToSetUpTestCaseRector::class,
+    DirectInstanceOverMockArgRector::class,
+    EntityDocumentCreateMockToDirectNewRector::class,
+    GetMockBuilderGetMockToCreateMockRector::class,
+    InlineStubPropertyToCreateStubMethodCallRector::class,
+    MergeWithCallableAndWillReturnRector::class,
+    NarrowIdenticalWithConsecutiveRector::class,
+    NarrowSingleWillReturnCallbackRector::class,
+    NarrowUnusedSetUpDefinedPropertyRector::class,
+    PreferPHPUnitThisCallRector::class,
+    RemoveEmptyTestMethodRector::class,
+    RemoveExpectAnyFromMockRector::class,
+    RemoveNeverUsedMockPropertyRector::class,
+    RemoveStandaloneCreateMockRector::class,
+    ReplaceAtMethodWithDesiredMatcherRector::class,
+    ReplaceTestAnnotationWithPrefixedFunctionRector::class,
+    SimplerWithIsInstanceOfRector::class,
+    SimplifyForeachInstanceOfRector::class,
+    SingleWithConsecutiveToWithRector::class,
+    UseSpecificWillMethodRector::class,
+    UseSpecificWithMethodRector::class,
+];
+
 return RectorConfig::configure()
     ->withRootFiles()
     ->withPaths([
@@ -78,6 +125,7 @@
         'tests/Foundation/fixtures/bad-syntax-strategy.php',
     ])
     ->withRules([
+        ...$testsuiteRules,
         CountArrayToEmptyArrayComparisonRector::class,
         StrlenZeroToIdenticalEmptyStringRector::class,
     ])

tests/Auth/AuthGuardTest.php

@@ -116,7 +116,7 @@ public function testAttemptReturnsUserInterface()
         $guard->getProvider()->shouldReceive('retrieveByCredentials')->once()->andReturn($user);
         $guard->getProvider()->shouldReceive('validateCredentials')->with($user, ['foo'])->andReturn(true);
         $guard->getProvider()->shouldReceive('rehashPasswordIfRequired')->with($user, ['foo'])->once();
-        $guard->expects($this->once())->method('login')->with($this->equalTo($user));
+        $guard->expects($this->once())->method('login')->with($user);
         $this->assertTrue($guard->attempt(['foo']));
     }
 
@@ -160,15 +160,15 @@ public function testAttemptAndWithCallbacks()
         $mock->getProvider()->shouldReceive('rehashPasswordIfRequired')->with($user, ['foo'])->once();
 
         $this->assertTrue($mock->attemptWhen(['foo'], function ($user, $guard) {
-            static::assertInstanceOf(Authenticatable::class, $user);
-            static::assertInstanceOf(SessionGuard::class, $guard);
+            $this->assertInstanceOf(Authenticatable::class, $user);
+            $this->assertInstanceOf(SessionGuard::class, $guard);
 
             return true;
         }));
 
         $this->assertFalse($mock->attemptWhen(['foo'], function ($user, $guard) {
-            static::assertInstanceOf(Authenticatable::class, $user);
-            static::assertInstanceOf(SessionGuard::class, $guard);
+            $this->assertInstanceOf(Authenticatable::class, $user);
+            $this->assertInstanceOf(SessionGuard::class, $guard);
 
             return false;
         }));
@@ -196,7 +196,7 @@ public function testAttemptRehashesPasswordWhenRequired()
         $guard->getProvider()->shouldReceive('retrieveByCredentials')->once()->andReturn($user);
         $guard->getProvider()->shouldReceive('validateCredentials')->with($user, ['foo'])->andReturn(true);
         $guard->getProvider()->shouldReceive('rehashPasswordIfRequired')->with($user, ['foo'])->once();
-        $guard->expects($this->once())->method('login')->with($this->equalTo($user));
+        $guard->expects($this->once())->method('login')->with($user);
         $this->assertTrue($guard->attempt(['foo']));
     }
 
@@ -216,7 +216,7 @@ public function testAttemptDoesntRehashPasswordWhenDisabled()
         $guard->getProvider()->shouldReceive('retrieveByCredentials')->once()->andReturn($user);
         $guard->getProvider()->shouldReceive('validateCredentials')->with($user, ['foo'])->andReturn(true);
         $guard->getProvider()->shouldNotReceive('rehashPasswordIfRequired');
-        $guard->expects($this->once())->method('login')->with($this->equalTo($user));
+        $guard->expects($this->once())->method('login')->with($user);
         $this->assertTrue($guard->attempt(['foo']));
     }
 

tests/Auth/AuthListenersSendEmailVerificationNotificationHandleFunctionTest.php

@@ -16,7 +16,7 @@ class AuthListenersSendEmailVerificationNotificationHandleFunctionTest extends T
      */
     public function testWillExecuted()
     {
-        $user = $this->getMockBuilder(MustVerifyEmail::class)->getMock();
+        $user = $this->createMock(MustVerifyEmail::class);
         $user->method('hasVerifiedEmail')->willReturn(false);
         $user->expects($this->once())->method('sendEmailVerificationNotification');
 
@@ -43,7 +43,7 @@ public function testUserIsNotInstanceOfMustVerifyEmail()
      */
     public function testHasVerifiedEmailAsTrue()
     {
-        $user = $this->getMockBuilder(MustVerifyEmail::class)->getMock();
+        $user = $this->createMock(MustVerifyEmail::class);
         $user->method('hasVerifiedEmail')->willReturn(true);
         $user->expects($this->never())->method('sendEmailVerificationNotification');
 

tests/Cache/CacheApcStoreTest.php

@@ -12,7 +12,7 @@ class CacheApcStoreTest extends TestCase
     public function testGetReturnsNullWhenNotFound()
     {
         $apc = $this->getMockBuilder(ApcWrapper::class)->onlyMethods(['get'])->getMock();
-        $apc->expects($this->once())->method('get')->with($this->equalTo('foobar'))->willReturn(null);
+        $apc->expects($this->once())->method('get')->with('foobar')->willReturn(null);
         $store = new ApcStore($apc, 'foo');
         $this->assertNull($store->get('bar'));
     }
@@ -53,7 +53,7 @@ public function testSetMethodProperlyCallsAPC()
     {
         $apc = $this->getMockBuilder(ApcWrapper::class)->onlyMethods(['put'])->getMock();
         $apc->expects($this->once())
-            ->method('put')->with($this->equalTo('foo'), $this->equalTo('bar'), $this->equalTo(60))
+            ->method('put')->with('foo', 'bar', 60)
             ->willReturn(true);
         $store = new ApcStore($apc);
         $result = $store->put('foo', 'bar', 60);
@@ -91,15 +91,15 @@ public function testSetMultipleMethodProperlyCallsAPC()
     public function testIncrementMethodProperlyCallsAPC()
     {
         $apc = $this->getMockBuilder(ApcWrapper::class)->onlyMethods(['increment'])->getMock();
-        $apc->expects($this->once())->method('increment')->with($this->equalTo('foo'), $this->equalTo(5));
+        $apc->expects($this->once())->method('increment')->with('foo', 5);
         $store = new ApcStore($apc);
         $store->increment('foo', 5);
     }
 
     public function testDecrementMethodProperlyCallsAPC()
     {
         $apc = $this->getMockBuilder(ApcWrapper::class)->onlyMethods(['decrement'])->getMock();
-        $apc->expects($this->once())->method('decrement')->with($this->equalTo('foo'), $this->equalTo(5));
+        $apc->expects($this->once())->method('decrement')->with('foo', 5);
         $store = new ApcStore($apc);
         $store->decrement('foo', 5);
     }
@@ -108,7 +108,7 @@ public function testStoreItemForeverProperlyCallsAPC()
     {
         $apc = $this->getMockBuilder(ApcWrapper::class)->onlyMethods(['put'])->getMock();
         $apc->expects($this->once())
-            ->method('put')->with($this->equalTo('foo'), $this->equalTo('bar'), $this->equalTo(0))
+            ->method('put')->with('foo', 'bar', 0)
             ->willReturn(true);
         $store = new ApcStore($apc);
         $result = $store->forever('foo', 'bar');
@@ -118,7 +118,7 @@ public function testStoreItemForeverProperlyCallsAPC()
     public function testForgetMethodProperlyCallsAPC()
     {
         $apc = $this->getMockBuilder(ApcWrapper::class)->onlyMethods(['delete'])->getMock();
-        $apc->expects($this->once())->method('delete')->with($this->equalTo('foo'))->willReturn(true);
+        $apc->expects($this->once())->method('delete')->with('foo')->willReturn(true);
         $store = new ApcStore($apc);
         $result = $store->forget('foo');
         $this->assertTrue($result);
@@ -131,8 +131,8 @@ public function testTouchMethodProperlyCallsAPC(): void
 
         $apc = $this->getMockBuilder(ApcWrapper::class)->onlyMethods(['get', 'put'])->getMock();
 
-        $apc->expects($this->once())->method('get')->with($this->equalTo($key))->willReturn('bar');
-        $apc->expects($this->once())->method('put')->with($this->equalTo($key), $this->equalTo('bar'), $this->equalTo($ttl))->willReturn(true);
+        $apc->expects($this->once())->method('get')->with($key)->willReturn('bar');
+        $apc->expects($this->once())->method('put')->with($key, 'bar', $ttl)->willReturn(true);
 
         $this->assertTrue((new ApcStore($apc))->touch($key, $ttl));
     }

tests/Cache/CacheArrayStoreTest.php

@@ -90,7 +90,7 @@ public function testStoreItemForeverProperlyStoresInArray()
     {
         $mock = $this->getMockBuilder(ArrayStore::class)->onlyMethods(['put'])->getMock();
         $mock->expects($this->once())
-            ->method('put')->with($this->equalTo('foo'), $this->equalTo('bar'), $this->equalTo(0))
+            ->method('put')->with('foo', 'bar', 0)
             ->willReturn(true);
         $result = $mock->forever('foo', 'bar');
         $this->assertTrue($result);

tests/Cache/CacheDatabaseStoreTest.php

@@ -114,7 +114,7 @@ public function testValueIsUpsertedOnSqlite()
     public function testForeverCallsStoreItemWithReallyLongTime()
     {
         $store = $this->getMockBuilder(DatabaseStore::class)->onlyMethods(['put'])->setConstructorArgs($this->getMocks())->getMock();
-        $store->expects($this->once())->method('put')->with($this->equalTo('foo'), $this->equalTo('bar'), $this->equalTo(315360000))->willReturn(true);
+        $store->expects($this->once())->method('put')->with('foo', 'bar', 315360000)->willReturn(true);
         $result = $store->forever('foo', 'bar');
         $this->assertTrue($result);
     }