Use phpunit 13 where possible

core23 · core23 · commit 7f1910c4b00e · 2026-04-09T22:36:45.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,5 @@ phpunit.xml
 /.phpunit.cache/
 /build/
 /vendor/
-!/vendor-bin/tools/composer.lock
 /vendor-bin/tools/vendor/
 /vendor-bin/tools/bin/
diff --git a/tests/Action/CheckEmailActionTest.php b/tests/Action/CheckEmailActionTest.php
@@ -86,7 +86,7 @@ public function testWithUsername(): void
         ;
 
         $this->templateRegistry
-            ->method('getTemplate')
+            ->expects(self::once())->method('getTemplate')
             ->with('layout')
             ->willReturn('base.html.twig')
         ;
diff --git a/tests/Action/LoginActionTest.php b/tests/Action/LoginActionTest.php
@@ -135,7 +135,7 @@ static function (string $message): string {
         $request->setSession($session);
 
         $this->router
-            ->method('generate')
+            ->expects(self::once())->method('generate')
             ->with('sonata_admin_dashboard')
             ->willReturn('/foo')
         ;
@@ -165,13 +165,13 @@ public function testUserGrantedAdmin(string $referer, string $expectedRedirectUr
         ;
 
         $this->router
-            ->method('generate')
+            ->expects(self::once())->method('generate')
             ->with('sonata_admin_dashboard')
             ->willReturn('/foo')
         ;
 
         $this->authorizationChecker->expects(self::once())
-            ->method('isGranted')
+            ->expects(self::once())->method('isGranted')
             ->with('ROLE_ADMIN')
             ->willReturn(true)
         ;
@@ -270,25 +270,25 @@ static function (string $key) use ($sessionParameters): bool {
         ;
 
         $this->authorizationChecker->expects(self::once())
-            ->method('isGranted')
+            ->expects(self::once())->method('isGranted')
             ->with('ROLE_ADMIN')
             ->willReturn(false)
         ;
 
         $this->csrfTokenManager
-            ->method('getToken')
+            ->expects(self::once())->method('getToken')
             ->with('authenticate')
             ->willReturn($csrfToken)
         ;
 
         $this->templateRegistry
-            ->method('getTemplate')
+            ->expects(self::once())->method('getTemplate')
             ->with('layout')
             ->willReturn('base.html.twig')
         ;
 
         $this->templating
-            ->method('render')
+            ->expects(self::once())->method('render')
             ->with('@NucleosUserAdmin/Admin/Security/login.html.twig', [
                 'admin_pool'    => $this->pool,
                 'base_template' => 'base.html.twig',
diff --git a/tests/Action/RequestActionTest.php b/tests/Action/RequestActionTest.php
@@ -75,7 +75,7 @@ public function testAuthenticated(): void
         ;
 
         $this->router
-            ->method('generate')
+            ->expects(self::once())->method('generate')
             ->with('sonata_admin_dashboard')
             ->willReturn('/foo')
         ;
@@ -100,7 +100,7 @@ public function testUnauthenticated(): void
         ;
 
         $this->templateRegistry
-            ->method('getTemplate')
+            ->expects(self::once())->method('getTemplate')
             ->with('layout')
             ->willReturn('base.html.twig')
         ;
@@ -131,7 +131,7 @@ public function testUnauthenticated(): void
         ;
 
         $this->router
-            ->method('generate')
+            ->expects(self::once())->method('generate')
             ->with('nucleos_user_admin_resetting_send_email')
             ->willReturn('/foo')
         ;
@@ -147,7 +147,7 @@ public function testUnauthenticated(): void
         ;
 
         $this->templateRegistry
-            ->method('getTemplate')
+            ->expects(self::once())->method('getTemplate')
             ->with('layout')
             ->willReturn('base.html.twig')
         ;
diff --git a/tests/Action/ResetActionTest.php b/tests/Action/ResetActionTest.php
@@ -116,7 +116,7 @@ public function testAuthenticated(): void
         ;
 
         $this->router
-            ->method('generate')
+            ->expects(self::once())->method('generate')
             ->with('sonata_admin_dashboard')
             ->willReturn('/foo')
         ;
@@ -136,7 +136,7 @@ public function testUnknownToken(): void
         $request = new Request();
 
         $this->userManager
-            ->method('findUserByConfirmationToken')
+            ->expects(self::once())->method('findUserByConfirmationToken')
             ->with('token')
             ->willReturn(null)
         ;
@@ -156,13 +156,13 @@ public function testPasswordRequestNonExpired(): void
         ;
 
         $this->userManager
-            ->method('findUserByConfirmationToken')
+            ->expects(self::once())->method('findUserByConfirmationToken')
             ->with('token')
             ->willReturn($user)
         ;
 
         $this->router
-            ->method('generate')
+            ->expects(self::once())->method('generate')
             ->with('nucleos_user_admin_resetting_request')
             ->willReturn('/foo')
         ;
@@ -204,7 +204,7 @@ public function testReset(): void
         ;
 
         $this->userManager
-            ->method('findUserByConfirmationToken')
+            ->expects(self::once())->method('findUserByConfirmationToken')
             ->with('user-token')
             ->willReturn($user)
         ;
@@ -215,13 +215,13 @@ public function testReset(): void
         ;
 
         $this->router
-            ->method('generate')
+            ->expects(self::once())->method('generate')
             ->with('nucleos_user_admin_security_check')
             ->willReturn('/check')
         ;
 
         $this->templating
-            ->method('render')
+            ->expects(self::once())->method('render')
             ->with('@NucleosUserAdmin/Admin/Security/Resetting/reset.html.twig', [
                 'token'         => 'user-token',
                 'form'          => $view,
@@ -232,7 +232,7 @@ public function testReset(): void
         ;
 
         $this->templateRegistry
-            ->method('getTemplate')
+            ->expects(self::once())->method('getTemplate')
             ->with('layout')
             ->willReturn('base.html.twig')
         ;
@@ -259,15 +259,15 @@ public function testPostedReset(): void
             ->method('setLastLogin')
         ;
         $user->expects(self::once())
-            ->method('setConfirmationToken')
+            ->expects(self::once())->method('setConfirmationToken')
             ->with(null)
         ;
         $user->expects(self::once())
-            ->method('setPasswordRequestedAt')
+            ->expects(self::once())->method('setPasswordRequestedAt')
             ->with(null)
         ;
         $user->expects(self::once())
-            ->method('setEnabled')
+            ->expects(self::once())->method('setEnabled')
             ->with(true)
         ;
 
@@ -292,7 +292,7 @@ static function (string $message): string {
 
         $bag = $this->createMock(FlashBag::class);
         $bag->expects(self::once())
-            ->method('add')
+            ->expects(self::once())->method('add')
             ->with('success', 'resetting.flash.success')
         ;
 
@@ -302,17 +302,17 @@ static function (string $message): string {
         ;
 
         $this->userManager
-            ->method('findUserByConfirmationToken')
+            ->expects(self::once())->method('findUserByConfirmationToken')
             ->with('token')
             ->willReturn($user)
         ;
         $this->userManager->expects(self::once())
-            ->method('updateUser')
+            ->expects(self::once())->method('updateUser')
             ->with($user)
         ;
 
         $this->loginManager->expects(self::once())
-            ->method('logInUser')
+            ->expects(self::once())->method('logInUser')
             ->with('default', $user, self::isInstanceOf(Response::class))
         ;
 
diff --git a/tests/Action/SendEmailActionTest.php b/tests/Action/SendEmailActionTest.php
@@ -79,13 +79,13 @@ public function testUnknownUsername(): void
         $request = new Request([], ['username' => 'bar']);
 
         $this->userProvider
-            ->method('loadUserByIdentifier')
+            ->expects(self::once())->method('loadUserByIdentifier')
             ->with('bar')
             ->willThrowException(new UserNotFoundException())
         ;
 
         $this->urlGenerator
-            ->method('generate')
+            ->expects(self::once())->method('generate')
             ->with('nucleos_user_admin_resetting_check_email', ['username' => 'bar'])
             ->willReturn('/check-email')
         ;
@@ -108,7 +108,7 @@ public function testPasswordRequestNonExpired(): void
         ;
 
         $this->userProvider
-            ->method('loadUserByIdentifier')
+            ->expects(self::once())->method('loadUserByIdentifier')
             ->with('bar')
             ->willReturn($user)
         ;
@@ -118,7 +118,7 @@ public function testPasswordRequestNonExpired(): void
         ;
 
         $this->urlGenerator
-            ->method('generate')
+            ->expects(self::once())->method('generate')
             ->with('nucleos_user_admin_resetting_check_email')
             ->willReturn('/foo')
         ;
@@ -145,7 +145,7 @@ public function testAccountLocked(): void
         ;
 
         $this->userProvider
-            ->method('loadUserByIdentifier')
+            ->expects(self::once())->method('loadUserByIdentifier')
             ->with('bar')
             ->willReturn($user)
         ;
@@ -155,7 +155,7 @@ public function testAccountLocked(): void
         ;
 
         $this->urlGenerator
-            ->method('generate')
+            ->expects(self::once())->method('generate')
             ->with('nucleos_user_admin_resetting_request')
             ->willReturn('/foo')
         ;
@@ -207,7 +207,7 @@ static function () use (&$storedToken): ?string {
         ;
 
         $this->userProvider
-            ->method('loadUserByIdentifier')
+            ->expects(self::once())->method('loadUserByIdentifier')
             ->with('bar')
             ->willReturn($user)
         ;
@@ -222,7 +222,7 @@ static function () use (&$storedToken): ?string {
         ;
 
         $this->urlGenerator
-            ->method('generate')
+            ->expects(self::once())->method('generate')
             ->with('nucleos_user_admin_resetting_check_email', ['username' => 'bar'])
             ->willReturn('/check-email')
         ;
diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
@@ -12,7 +12,7 @@
         "phpstan/phpstan-phpunit": "^2.0.0",
         "phpstan/phpstan-strict-rules": "^2.0.0",
         "phpstan/phpstan-symfony": "^2.0.0",
-        "phpunit/phpunit": "^12.0.0",
+        "phpunit/phpunit": "^12.0.0 || ^13.0.0",
         "symfony/phpunit-bridge": "^8.0"
     },
     "config": {
diff --git a/vendor-bin/tools/composer.lock b/vendor-bin/tools/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function testWithUsername(): void`
`86`	`86`	`;`
`87`	`87`
`88`	`88`	`$this->templateRegistry`
`89`		`- ->method('getTemplate')`
	`89`	`+ ->expects(self::once())->method('getTemplate')`
`90`	`90`	`->with('layout')`
`91`	`91`	`->willReturn('base.html.twig')`
`92`	`92`	`;`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function testAuthenticated(): void`
`75`	`75`	`;`
`76`	`76`
`77`	`77`	`$this->router`
`78`		`- ->method('generate')`
	`78`	`+ ->expects(self::once())->method('generate')`
`79`	`79`	`->with('sonata_admin_dashboard')`
`80`	`80`	`->willReturn('/foo')`
`81`	`81`	`;`
`@@ -100,7 +100,7 @@ public function testUnauthenticated(): void`
`100`	`100`	`;`
`101`	`101`
`102`	`102`	`$this->templateRegistry`
`103`		`- ->method('getTemplate')`
	`103`	`+ ->expects(self::once())->method('getTemplate')`
`104`	`104`	`->with('layout')`
`105`	`105`	`->willReturn('base.html.twig')`
`106`	`106`	`;`
`@@ -131,7 +131,7 @@ public function testUnauthenticated(): void`
`131`	`131`	`;`
`132`	`132`
`133`	`133`	`$this->router`
`134`		`- ->method('generate')`
	`134`	`+ ->expects(self::once())->method('generate')`
`135`	`135`	`->with('nucleos_user_admin_resetting_send_email')`
`136`	`136`	`->willReturn('/foo')`
`137`	`137`	`;`
`@@ -147,7 +147,7 @@ public function testUnauthenticated(): void`
`147`	`147`	`;`
`148`	`148`
`149`	`149`	`$this->templateRegistry`
`150`		`- ->method('getTemplate')`
	`150`	`+ ->expects(self::once())->method('getTemplate')`
`151`	`151`	`->with('layout')`
`152`	`152`	`->willReturn('base.html.twig')`
`153`	`153`	`;`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public function testAuthenticated(): void`
`116`	`116`	`;`
`117`	`117`
`118`	`118`	`$this->router`
`119`		`- ->method('generate')`
	`119`	`+ ->expects(self::once())->method('generate')`
`120`	`120`	`->with('sonata_admin_dashboard')`
`121`	`121`	`->willReturn('/foo')`
`122`	`122`	`;`
`@@ -136,7 +136,7 @@ public function testUnknownToken(): void`
`136`	`136`	`$request = new Request();`
`137`	`137`
`138`	`138`	`$this->userManager`
`139`		`- ->method('findUserByConfirmationToken')`
	`139`	`+ ->expects(self::once())->method('findUserByConfirmationToken')`
`140`	`140`	`->with('token')`
`141`	`141`	`->willReturn(null)`
`142`	`142`	`;`
`@@ -156,13 +156,13 @@ public function testPasswordRequestNonExpired(): void`
`156`	`156`	`;`
`157`	`157`
`158`	`158`	`$this->userManager`
`159`		`- ->method('findUserByConfirmationToken')`
	`159`	`+ ->expects(self::once())->method('findUserByConfirmationToken')`
`160`	`160`	`->with('token')`
`161`	`161`	`->willReturn($user)`
`162`	`162`	`;`
`163`	`163`
`164`	`164`	`$this->router`
`165`		`- ->method('generate')`
	`165`	`+ ->expects(self::once())->method('generate')`
`166`	`166`	`->with('nucleos_user_admin_resetting_request')`
`167`	`167`	`->willReturn('/foo')`
`168`	`168`	`;`
`@@ -204,7 +204,7 @@ public function testReset(): void`
`204`	`204`	`;`
`205`	`205`
`206`	`206`	`$this->userManager`
`207`		`- ->method('findUserByConfirmationToken')`
	`207`	`+ ->expects(self::once())->method('findUserByConfirmationToken')`
`208`	`208`	`->with('user-token')`
`209`	`209`	`->willReturn($user)`
`210`	`210`	`;`
`@@ -215,13 +215,13 @@ public function testReset(): void`
`215`	`215`	`;`
`216`	`216`
`217`	`217`	`$this->router`
`218`		`- ->method('generate')`
	`218`	`+ ->expects(self::once())->method('generate')`
`219`	`219`	`->with('nucleos_user_admin_security_check')`
`220`	`220`	`->willReturn('/check')`
`221`	`221`	`;`
`222`	`222`
`223`	`223`	`$this->templating`
`224`		`- ->method('render')`
	`224`	`+ ->expects(self::once())->method('render')`
`225`	`225`	`->with('@NucleosUserAdmin/Admin/Security/Resetting/reset.html.twig', [`
`226`	`226`	`'token' => 'user-token',`
`227`	`227`	`'form' => $view,`
`@@ -232,7 +232,7 @@ public function testReset(): void`
`232`	`232`	`;`
`233`	`233`
`234`	`234`	`$this->templateRegistry`
`235`		`- ->method('getTemplate')`
	`235`	`+ ->expects(self::once())->method('getTemplate')`
`236`	`236`	`->with('layout')`
`237`	`237`	`->willReturn('base.html.twig')`
`238`	`238`	`;`
`@@ -259,15 +259,15 @@ public function testPostedReset(): void`
`259`	`259`	`->method('setLastLogin')`
`260`	`260`	`;`
`261`	`261`	`$user->expects(self::once())`
`262`		`- ->method('setConfirmationToken')`
	`262`	`+ ->expects(self::once())->method('setConfirmationToken')`
`263`	`263`	`->with(null)`
`264`	`264`	`;`
`265`	`265`	`$user->expects(self::once())`
`266`		`- ->method('setPasswordRequestedAt')`
	`266`	`+ ->expects(self::once())->method('setPasswordRequestedAt')`
`267`	`267`	`->with(null)`
`268`	`268`	`;`
`269`	`269`	`$user->expects(self::once())`
`270`		`- ->method('setEnabled')`
	`270`	`+ ->expects(self::once())->method('setEnabled')`
`271`	`271`	`->with(true)`
`272`	`272`	`;`
`273`	`273`
`@@ -292,7 +292,7 @@ static function (string $message): string {`
`292`	`292`
`293`	`293`	`$bag = $this->createMock(FlashBag::class);`
`294`	`294`	`$bag->expects(self::once())`
`295`		`- ->method('add')`
	`295`	`+ ->expects(self::once())->method('add')`
`296`	`296`	`->with('success', 'resetting.flash.success')`
`297`	`297`	`;`
`298`	`298`
`@@ -302,17 +302,17 @@ static function (string $message): string {`
`302`	`302`	`;`
`303`	`303`
`304`	`304`	`$this->userManager`
`305`		`- ->method('findUserByConfirmationToken')`
	`305`	`+ ->expects(self::once())->method('findUserByConfirmationToken')`
`306`	`306`	`->with('token')`
`307`	`307`	`->willReturn($user)`
`308`	`308`	`;`
`309`	`309`	`$this->userManager->expects(self::once())`
`310`		`- ->method('updateUser')`
	`310`	`+ ->expects(self::once())->method('updateUser')`
`311`	`311`	`->with($user)`
`312`	`312`	`;`
`313`	`313`
`314`	`314`	`$this->loginManager->expects(self::once())`
`315`		`- ->method('logInUser')`
	`315`	`+ ->expects(self::once())->method('logInUser')`
`316`	`316`	`->with('default', $user, self::isInstanceOf(Response::class))`
`317`	`317`	`;`
`318`	`318`
Original file line number	Diff line number	Diff line change
`@@ -79,13 +79,13 @@ public function testUnknownUsername(): void`
`79`	`79`	`$request = new Request([], ['username' => 'bar']);`
`80`	`80`
`81`	`81`	`$this->userProvider`
`82`		`- ->method('loadUserByIdentifier')`
	`82`	`+ ->expects(self::once())->method('loadUserByIdentifier')`
`83`	`83`	`->with('bar')`
`84`	`84`	`->willThrowException(new UserNotFoundException())`
`85`	`85`	`;`
`86`	`86`
`87`	`87`	`$this->urlGenerator`
`88`		`- ->method('generate')`
	`88`	`+ ->expects(self::once())->method('generate')`
`89`	`89`	`->with('nucleos_user_admin_resetting_check_email', ['username' => 'bar'])`
`90`	`90`	`->willReturn('/check-email')`
`91`	`91`	`;`
`@@ -108,7 +108,7 @@ public function testPasswordRequestNonExpired(): void`
`108`	`108`	`;`
`109`	`109`
`110`	`110`	`$this->userProvider`
`111`		`- ->method('loadUserByIdentifier')`
	`111`	`+ ->expects(self::once())->method('loadUserByIdentifier')`
`112`	`112`	`->with('bar')`
`113`	`113`	`->willReturn($user)`
`114`	`114`	`;`
`@@ -118,7 +118,7 @@ public function testPasswordRequestNonExpired(): void`
`118`	`118`	`;`
`119`	`119`
`120`	`120`	`$this->urlGenerator`
`121`		`- ->method('generate')`
	`121`	`+ ->expects(self::once())->method('generate')`
`122`	`122`	`->with('nucleos_user_admin_resetting_check_email')`
`123`	`123`	`->willReturn('/foo')`
`124`	`124`	`;`
`@@ -145,7 +145,7 @@ public function testAccountLocked(): void`
`145`	`145`	`;`
`146`	`146`
`147`	`147`	`$this->userProvider`
`148`		`- ->method('loadUserByIdentifier')`
	`148`	`+ ->expects(self::once())->method('loadUserByIdentifier')`
`149`	`149`	`->with('bar')`
`150`	`150`	`->willReturn($user)`
`151`	`151`	`;`
`@@ -155,7 +155,7 @@ public function testAccountLocked(): void`
`155`	`155`	`;`
`156`	`156`
`157`	`157`	`$this->urlGenerator`
`158`		`- ->method('generate')`
	`158`	`+ ->expects(self::once())->method('generate')`
`159`	`159`	`->with('nucleos_user_admin_resetting_request')`
`160`	`160`	`->willReturn('/foo')`
`161`	`161`	`;`
`@@ -207,7 +207,7 @@ static function () use (&$storedToken): ?string {`
`207`	`207`	`;`
`208`	`208`
`209`	`209`	`$this->userProvider`
`210`		`- ->method('loadUserByIdentifier')`
	`210`	`+ ->expects(self::once())->method('loadUserByIdentifier')`
`211`	`211`	`->with('bar')`
`212`	`212`	`->willReturn($user)`
`213`	`213`	`;`
`@@ -222,7 +222,7 @@ static function () use (&$storedToken): ?string {`
`222`	`222`	`;`
`223`	`223`
`224`	`224`	`$this->urlGenerator`
`225`		`- ->method('generate')`
	`225`	`+ ->expects(self::once())->method('generate')`
`226`	`226`	`->with('nucleos_user_admin_resetting_check_email', ['username' => 'bar'])`
`227`	`227`	`->willReturn('/check-email')`
`228`	`228`	`;`