Remove calls to getMockForAbstractClass()

alexandre-daubois · alexandre-daubois · commit 49c9c6d413da · 2024-05-15T09:43:26.000+02:00
diff --git a/Tests/EventListener/PasswordMigratingListenerTest.php b/Tests/EventListener/PasswordMigratingListenerTest.php
@@ -108,7 +108,7 @@ public function testUnsupportedPassport()
 
     public function testUpgradeWithUpgrader()
     {
-        $passwordUpgrader = $this->getMockForAbstractClass(TestMigratingUserProvider::class);
+        $passwordUpgrader = $this->createMock(TestMigratingUserProvider::class);
         $passwordUpgrader->expects($this->once())
             ->method('upgradePassword')
             ->with($this->user, 'new-hash')
@@ -120,7 +120,7 @@ public function testUpgradeWithUpgrader()
 
     public function testUpgradeWithoutUpgrader()
     {
-        $userLoader = $this->getMockForAbstractClass(TestMigratingUserProvider::class);
+        $userLoader = $this->createMock(TestMigratingUserProvider::class);
         $userLoader->expects($this->any())->method('loadUserByIdentifier')->willReturn($this->user);
 
         $userLoader->expects($this->exactly(2))
diff --git a/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php b/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php
@@ -56,11 +56,15 @@ public function testHandleWithValidValues()
             ->willReturn($token)
         ;
 
-        $listener = $this->getMockForAbstractClass(AbstractPreAuthenticatedListener::class, [
-            $tokenStorage,
-            $authenticationManager,
-            'TheProviderKey',
-        ]);
+        $listener = $this->getMockBuilder(AbstractPreAuthenticatedListener::class)
+            ->setConstructorArgs([
+                $tokenStorage,
+                $authenticationManager,
+                'TheProviderKey',
+            ])
+            ->onlyMethods(['getPreAuthenticatedData'])
+            ->getMock();
+
         $listener
             ->expects($this->once())
             ->method('getPreAuthenticatedData')
@@ -95,12 +99,15 @@ public function testHandleWhenAuthenticationFails()
             ->willThrowException($exception)
         ;
 
-        $listener = $this->getMockForAbstractClass(
-            AbstractPreAuthenticatedListener::class, [
-            $tokenStorage,
-            $authenticationManager,
-            'TheProviderKey',
-        ]);
+        $listener = $this->getMockBuilder(AbstractPreAuthenticatedListener::class)
+            ->setConstructorArgs([
+                $tokenStorage,
+                $authenticationManager,
+                'TheProviderKey',
+            ])
+            ->onlyMethods(['getPreAuthenticatedData'])
+            ->getMock();
+
         $listener
             ->expects($this->once())
             ->method('getPreAuthenticatedData')
@@ -137,12 +144,15 @@ public function testHandleWhenAuthenticationFailsWithDifferentToken()
             ->willThrowException($exception)
         ;
 
-        $listener = $this->getMockForAbstractClass(
-            AbstractPreAuthenticatedListener::class, [
-            $tokenStorage,
-            $authenticationManager,
-            'TheProviderKey',
-        ]);
+        $listener = $this->getMockBuilder(AbstractPreAuthenticatedListener::class)
+            ->setConstructorArgs([
+                $tokenStorage,
+                $authenticationManager,
+                'TheProviderKey',
+            ])
+            ->onlyMethods(['getPreAuthenticatedData'])
+            ->getMock();
+
         $listener
             ->expects($this->once())
             ->method('getPreAuthenticatedData')
@@ -174,12 +184,15 @@ public function testHandleWithASimilarAuthenticatedToken()
             ->method('authenticate')
         ;
 
-        $listener = $this->getMockForAbstractClass(
-            AbstractPreAuthenticatedListener::class, [
-            $tokenStorage,
-            $authenticationManager,
-            'TheProviderKey',
-        ]);
+        $listener = $this->getMockBuilder(AbstractPreAuthenticatedListener::class)
+            ->setConstructorArgs([
+                $tokenStorage,
+                $authenticationManager,
+                'TheProviderKey',
+            ])
+            ->onlyMethods(['getPreAuthenticatedData'])
+            ->getMock();
+
         $listener
             ->expects($this->once())
             ->method('getPreAuthenticatedData')
@@ -217,12 +230,15 @@ public function testHandleWithAnInvalidSimilarToken()
             ->willThrowException($exception)
         ;
 
-        $listener = $this->getMockForAbstractClass(
-            AbstractPreAuthenticatedListener::class, [
-            $tokenStorage,
-            $authenticationManager,
-            'TheProviderKey',
-        ]);
+        $listener = $this->getMockBuilder(AbstractPreAuthenticatedListener::class)
+            ->setConstructorArgs([
+                $tokenStorage,
+                $authenticationManager,
+                'TheProviderKey',
+            ])
+            ->onlyMethods(['getPreAuthenticatedData'])
+            ->getMock();
+
         $listener
             ->expects($this->once())
             ->method('getPreAuthenticatedData')
diff --git a/Tests/RememberMe/AbstractRememberMeServicesTest.php b/Tests/RememberMe/AbstractRememberMeServicesTest.php
@@ -298,9 +298,12 @@ protected function getService($userProvider = null, $options = [], $logger = nul
             $userProvider = $this->getProvider();
         }
 
-        return $this->getMockForAbstractClass(AbstractRememberMeServices::class, [
-            [$userProvider], 'foosecret', 'fookey', $options, $logger,
-        ]);
+        return $this->getMockBuilder(AbstractRememberMeServices::class)
+            ->setConstructorArgs([
+                [$userProvider], 'foosecret', 'fookey', $options, $logger,
+            ])
+            ->onlyMethods(['processAutoLoginCookie', 'onLoginSuccess'])
+            ->getMock();
     }
 
     protected function getProvider()

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function testUnsupportedPassport()`
`108`	`108`
`109`	`109`	`public function testUpgradeWithUpgrader()`
`110`	`110`	`{`
`111`		`- $passwordUpgrader = $this->getMockForAbstractClass(TestMigratingUserProvider::class);`
	`111`	`+ $passwordUpgrader = $this->createMock(TestMigratingUserProvider::class);`
`112`	`112`	`$passwordUpgrader->expects($this->once())`
`113`	`113`	`->method('upgradePassword')`
`114`	`114`	`->with($this->user, 'new-hash')`
`@@ -120,7 +120,7 @@ public function testUpgradeWithUpgrader()`
`120`	`120`
`121`	`121`	`public function testUpgradeWithoutUpgrader()`
`122`	`122`	`{`
`123`		`- $userLoader = $this->getMockForAbstractClass(TestMigratingUserProvider::class);`
	`123`	`+ $userLoader = $this->createMock(TestMigratingUserProvider::class);`
`124`	`124`	`$userLoader->expects($this->any())->method('loadUserByIdentifier')->willReturn($this->user);`
`125`	`125`
`126`	`126`	`$userLoader->expects($this->exactly(2))`
Original file line number	Diff line number	Diff line change
`@@ -298,9 +298,12 @@ protected function getService($userProvider = null, $options = [], $logger = nul`
`298`	`298`	`$userProvider = $this->getProvider();`
`299`	`299`	`}`
`300`	`300`
`301`		`- return $this->getMockForAbstractClass(AbstractRememberMeServices::class, [`
`302`		`- [$userProvider], 'foosecret', 'fookey', $options, $logger,`
`303`		`- ]);`
	`301`	`+ return $this->getMockBuilder(AbstractRememberMeServices::class)`
	`302`	`+ ->setConstructorArgs([`
	`303`	`+ [$userProvider], 'foosecret', 'fookey', $options, $logger,`
	`304`	`+ ])`
	`305`	`+ ->onlyMethods(['processAutoLoginCookie', 'onLoginSuccess'])`
	`306`	`+ ->getMock();`
`304`	`307`	`}`
`305`	`308`
`306`	`309`	`protected function getProvider()`