Fix phpunit warnings

Author: acrobat

Tests/Command/ChangePasswordCommandTest.php

@@ -42,12 +42,9 @@ public function testExecuteInteractiveWithQuestionHelper()
             ->setMethods(['ask'])
             ->getMock();
 
-        $helper->expects($this->at(0))
+        $helper->expects($this->exactly(2))
             ->method('ask')
-            ->will($this->returnValue('user'));
-        $helper->expects($this->at(1))
-            ->method('ask')
-            ->will($this->returnValue('pass'));
+            ->willReturnOnConsecutiveCalls('user', 'pass');
 
         $application->getHelperSet()->set($helper, 'question');
 

Tests/Command/CreateUserCommandTest.php

@@ -43,17 +43,9 @@ public function testExecuteInteractiveWithQuestionHelper()
             ->setMethods(['ask'])
             ->getMock();
 
-        $helper->expects($this->at(0))
+        $helper->expects($this->exactly(3))
             ->method('ask')
-            ->will($this->returnValue('user'));
-
-        $helper->expects($this->at(1))
-            ->method('ask')
-            ->will($this->returnValue('email'));
-
-        $helper->expects($this->at(2))
-            ->method('ask')
-            ->will($this->returnValue('pass'));
+            ->willReturnOnConsecutiveCalls('user', 'email', 'pass');
 
         $application->getHelperSet()->set($helper, 'question');
 

Tests/Command/DeactivateUserCommandTest.php

@@ -41,9 +41,9 @@ public function testExecuteInteractiveWithQuestionHelper()
             ->setMethods(['ask'])
             ->getMock();
 
-        $helper->expects($this->at(0))
+        $helper->expects($this->once())
             ->method('ask')
-            ->will($this->returnValue('user'));
+            ->willReturn('user');
 
         $application->getHelperSet()->set($helper, 'question');
 

Tests/Command/DemoteUserCommandTest.php

@@ -42,12 +42,9 @@ public function testExecuteInteractiveWithQuestionHelper()
             ->setMethods(['ask'])
             ->getMock();
 
-        $helper->expects($this->at(0))
+        $helper->expects($this->exactly(2))
             ->method('ask')
-            ->will($this->returnValue('user'));
-        $helper->expects($this->at(1))
-            ->method('ask')
-            ->will($this->returnValue('role'));
+            ->willReturnOnConsecutiveCalls('user', 'role');
 
         $application->getHelperSet()->set($helper, 'question');
 

Tests/Command/PromoteUserCommandTest.php

@@ -42,12 +42,9 @@ public function testExecuteInteractiveWithQuestionHelper()
             ->setMethods(['ask'])
             ->getMock();
 
-        $helper->expects($this->at(0))
+        $helper->expects($this->exactly(2))
             ->method('ask')
-            ->will($this->returnValue('user'));
-        $helper->expects($this->at(1))
-            ->method('ask')
-            ->will($this->returnValue('role'));
+            ->willReturnOnConsecutiveCalls('user', 'role');
 
         $application->getHelperSet()->set($helper, 'question');
 

Tests/Model/UserManagerTest.php

@@ -144,19 +144,19 @@ public function testFindUserByUsernameOrEmailWithUsernameThatLooksLikeEmail()
         $usernameThatLooksLikeEmail = 'bob@example.com';
         $user = $this->getUser();
 
-        $this->manager->expects($this->at(0))
+        $this->manager->expects($this->exactly(2))
             ->method('findUserBy')
-            ->with($this->equalTo(['emailCanonical' => $usernameThatLooksLikeEmail]))
-            ->will($this->returnValue(null));
+            ->withConsecutive(
+                [$this->equalTo(['emailCanonical' => $usernameThatLooksLikeEmail])],
+                [$this->equalTo(['usernameCanonical' => $usernameThatLooksLikeEmail])]
+            )
+            ->willReturnOnConsecutiveCalls(null, $user);
+
         $this->fieldsUpdater->expects($this->once())
             ->method('canonicalizeEmail')
             ->with($usernameThatLooksLikeEmail)
             ->willReturn($usernameThatLooksLikeEmail);
 
-        $this->manager->expects($this->at(1))
-            ->method('findUserBy')
-            ->with($this->equalTo(['usernameCanonical' => $usernameThatLooksLikeEmail]))
-            ->will($this->returnValue($user));
         $this->fieldsUpdater->expects($this->once())
             ->method('canonicalizeUsername')
             ->with($usernameThatLooksLikeEmail)