Upgrade 1-11.38

vendor/symfony/security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php

@@ -53,7 +53,7 @@ class SimpleAuthenticationHandlerTest extends TestCase
         $this->successHandler->expects($this->once())
             ->method('onAuthenticationSuccess')
             ->with($this->request, $this->token)
-            ->will($this->returnValue($this->response));
+            ->willReturn($this->response);
 
         $handler = new SimpleAuthenticationHandler($authenticator, $this->successHandler, $this->failureHandler);
         $result = $handler->onAuthenticationSuccess($this->request, $this->token);
@@ -70,7 +70,7 @@ class SimpleAuthenticationHandlerTest extends TestCase
         $authenticator->expects($this->once())
             ->method('onAuthenticationSuccess')
             ->with($this->request, $this->token)
-            ->will($this->returnValue($this->response));
+            ->willReturn($this->response);
 
         $handler = new SimpleAuthenticationHandler($authenticator, $this->successHandler, $this->failureHandler);
         $result = $handler->onAuthenticationSuccess($this->request, $this->token);
@@ -78,12 +78,10 @@ class SimpleAuthenticationHandlerTest extends TestCase
         $this->assertSame($this->response, $result);
     }
 
-    /**
-     * @expectedException        \UnexpectedValueException
-     * @expectedExceptionMessage onAuthenticationSuccess method must return null to use the default success handler, or a Response object
-     */
     public function testOnAuthenticationSuccessThrowsAnExceptionIfNonResponseIsReturned()
     {
+        $this->expectException('UnexpectedValueException');
+        $this->expectExceptionMessage('onAuthenticationSuccess()" method must return null to use the default success handler, or a Response object');
         $this->successHandler->expects($this->never())
             ->method('onAuthenticationSuccess');
 
@@ -91,7 +89,7 @@ class SimpleAuthenticationHandlerTest extends TestCase
         $authenticator->expects($this->once())
             ->method('onAuthenticationSuccess')
             ->with($this->request, $this->token)
-            ->will($this->returnValue(new \stdClass()));
+            ->willReturn(new \stdClass());
 
         $handler = new SimpleAuthenticationHandler($authenticator, $this->successHandler, $this->failureHandler);
         $handler->onAuthenticationSuccess($this->request, $this->token);
@@ -102,13 +100,13 @@ class SimpleAuthenticationHandlerTest extends TestCase
         $this->successHandler->expects($this->once())
             ->method('onAuthenticationSuccess')
             ->with($this->request, $this->token)
-            ->will($this->returnValue($this->response));
+            ->willReturn($this->response);
 
         $authenticator = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Tests\TestSuccessHandlerInterface');
         $authenticator->expects($this->once())
             ->method('onAuthenticationSuccess')
             ->with($this->request, $this->token)
-            ->will($this->returnValue(null));
+            ->willReturn(null);
 
         $handler = new SimpleAuthenticationHandler($authenticator, $this->successHandler, $this->failureHandler);
         $result = $handler->onAuthenticationSuccess($this->request, $this->token);
@@ -123,7 +121,7 @@ class SimpleAuthenticationHandlerTest extends TestCase
         $this->failureHandler->expects($this->once())
             ->method('onAuthenticationFailure')
             ->with($this->request, $this->authenticationException)
-            ->will($this->returnValue($this->response));
+            ->willReturn($this->response);
 
         $handler = new SimpleAuthenticationHandler($authenticator, $this->successHandler, $this->failureHandler);
         $result = $handler->onAuthenticationFailure($this->request, $this->authenticationException);
@@ -140,7 +138,7 @@ class SimpleAuthenticationHandlerTest extends TestCase
         $authenticator->expects($this->once())
             ->method('onAuthenticationFailure')
             ->with($this->request, $this->authenticationException)
-            ->will($this->returnValue($this->response));
+            ->willReturn($this->response);
 
         $handler = new SimpleAuthenticationHandler($authenticator, $this->successHandler, $this->failureHandler);
         $result = $handler->onAuthenticationFailure($this->request, $this->authenticationException);
@@ -148,12 +146,10 @@ class SimpleAuthenticationHandlerTest extends TestCase
         $this->assertSame($this->response, $result);
     }
 
-    /**
-     * @expectedException        \UnexpectedValueException
-     * @expectedExceptionMessage onAuthenticationFailure method must return null to use the default failure handler, or a Response object
-     */
     public function testOnAuthenticationFailureThrowsAnExceptionIfNonResponseIsReturned()
     {
+        $this->expectException('UnexpectedValueException');
+        $this->expectExceptionMessage('onAuthenticationFailure()" method must return null to use the default failure handler, or a Response object');
         $this->failureHandler->expects($this->never())
             ->method('onAuthenticationFailure');
 
@@ -161,7 +157,7 @@ class SimpleAuthenticationHandlerTest extends TestCase
         $authenticator->expects($this->once())
             ->method('onAuthenticationFailure')
             ->with($this->request, $this->authenticationException)
-            ->will($this->returnValue(new \stdClass()));
+            ->willReturn(new \stdClass());
 
         $handler = new SimpleAuthenticationHandler($authenticator, $this->successHandler, $this->failureHandler);
         $handler->onAuthenticationFailure($this->request, $this->authenticationException);
@@ -172,13 +168,13 @@ class SimpleAuthenticationHandlerTest extends TestCase
         $this->failureHandler->expects($this->once())
             ->method('onAuthenticationFailure')
             ->with($this->request, $this->authenticationException)
-            ->will($this->returnValue($this->response));
+            ->willReturn($this->response);
 
         $authenticator = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Tests\TestFailureHandlerInterface');
         $authenticator->expects($this->once())
             ->method('onAuthenticationFailure')
             ->with($this->request, $this->authenticationException)
-            ->will($this->returnValue(null));
+            ->willReturn(null);
 
         $handler = new SimpleAuthenticationHandler($authenticator, $this->successHandler, $this->failureHandler);
         $result = $handler->onAuthenticationFailure($this->request, $this->authenticationException);