Use phpunit 13 where possible

Author: core23

.gitignore

@@ -6,6 +6,5 @@ phpunit.xml
 /.phpunit.cache/
 /build/
 /vendor/
-!/vendor-bin/tools/composer.lock
 /vendor-bin/tools/vendor/
 /vendor-bin/tools/bin/

tests/Command/ActivateUserCommandTest.php

@@ -68,7 +68,7 @@ private function createCommandTester(UserManipulator $manipulator, ?Application
 
         $command = new ActivateUserCommand($manipulator);
 
-        $application->add($command);
+        $application->addCommand($command);
 
         return new CommandTester($application->find('nucleos:user:activate'));
     }

tests/Command/ChangePasswordCommandTest.php

@@ -72,7 +72,7 @@ private function createCommandTester(UserManipulator $manipulator, ?Application
 
         $command = new ChangePasswordCommand($manipulator);
 
-        $application->add($command);
+        $application->addCommand($command);
 
         return new CommandTester($application->find('nucleos:user:change-password'));
     }

tests/Command/CreateUserCommandTest.php

@@ -77,7 +77,7 @@ private function createCommandTester(UserManipulator $manipulator, ?Application
 
         $command = new CreateUserCommand($manipulator);
 
-        $application->add($command);
+        $application->addCommand($command);
 
         return new CommandTester($application->find('nucleos:user:create'));
     }

tests/Command/DeactivateUserCommandTest.php

@@ -68,7 +68,7 @@ private function createCommandTester(UserManipulator $manipulator, ?Application
 
         $command = new DeactivateUserCommand($manipulator);
 
-        $application->add($command);
+        $application->addCommand($command);
 
         return new CommandTester($application->find('nucleos:user:deactivate'));
     }

tests/Command/DemoteUserCommandTest.php

@@ -72,7 +72,7 @@ private function createCommandTester(UserManipulator $manipulator, ?Application
 
         $command = new DemoteUserCommand($manipulator);
 
-        $application->add($command);
+        $application->addCommand($command);
 
         return new CommandTester($application->find('nucleos:user:demote'));
     }

tests/Command/PromoteUserCommandTest.php

@@ -72,7 +72,7 @@ private function createCommandTester(UserManipulator $manipulator, ?Application
 
         $command = new PromoteUserCommand($manipulator);
 
-        $application->add($command);
+        $application->addCommand($command);
 
         return new CommandTester($application->find('nucleos:user:promote'));
     }

tests/Doctrine/BaseUserManagerTest.php

@@ -45,15 +45,16 @@ protected function setUp(): void
         $this->repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
 
         $this->om
-            ->method('getRepository')
+            ->expects(self::any())->method('getRepository')
             ->with(self::equalTo(self::USER_CLASS))
             ->willReturn($this->repository)
         ;
         $this->om
-            ->method('getClassMetadata')
+            ->expects(self::any())->method('getClassMetadata')
             ->with(self::equalTo(self::USER_CLASS))
             ->willReturn($class)
         ;
+
         $class
             ->method('getName')
             ->willReturn(self::USER_CLASS)

tests/Mailer/SimpleMailerTest.php

@@ -48,15 +48,18 @@ public function testSendResettingEmail(): void
     {
         $mailer = $this->getMailer();
 
-        $this->translator->method('trans')->with(self::anything(), self::anything(), self::anything())
+        $this->translator->expects(self::once())->method('trans')
+            ->with(self::anything(), self::anything(), self::anything())
             ->willReturnArgument(0)
         ;
 
-        $this->generator->method('generate')->with(self::anything(), self::anything(), self::anything())
+        $this->generator->expects(self::once())->method('generate')
+            ->with(self::anything(), self::anything(), self::anything())
             ->willReturn('http://something.local')
         ;
 
-        $this->swiftMailer->expects(self::once())->method('send')->with(self::isInstanceOf(TemplatedEmail::class));
+        $this->swiftMailer->expects(self::once())->method('send')
+            ->with(self::isInstanceOf(TemplatedEmail::class));
 
         $mailer->sendResettingEmailMessage($this->getUser());
     }

tests/Util/SimpleUserManipulatorTest.php

@@ -84,7 +84,10 @@ public function testCreateWithHasher(): void
         $requestStackMock = $this->getRequestStackMock(true);
 
         $hasher = $this->createMock(UserPasswordHasherInterface::class);
-        $hasher->method('hashPassword')->with($user, $password)->willReturn('hashed_password');
+        $hasher->expects(self::once())->method('hashPassword')
+            ->with($user, $password)
+            ->willReturn('hashed_password')
+        ;
 
         $manipulator = new SimpleUserManipulator($userManagerMock, $eventDispatcherMock, $requestStackMock, $hasher);
         $manipulator->create($username, $password, $email, true, false);
@@ -383,7 +386,10 @@ public function testChangePasswordWithValidUsernameAndHasher(): void
         $requestStackMock = $this->getRequestStackMock(true);
 
         $hasher = $this->createMock(UserPasswordHasherInterface::class);
-        $hasher->method('hashPassword')->with($user, $password)->willReturn('hashed_password');
+        $hasher->expects(self::once())->method('hashPassword')
+            ->with($user, $password)
+            ->willReturn('hashed_password')
+        ;
 
         $manipulator = new SimpleUserManipulator($userManagerMock, $eventDispatcherMock, $requestStackMock, $hasher);
         $manipulator->changePassword($username, $password);