Merge branch '3.4' into 4.1

fabpot · fabpot · commit a4ca2a65adf4 · 2018-12-23T15:06:12.000+01:00
* 3.4:
  [Tests] Change to willThrowException
  [Console] fix PHPDoc in Command
  Fix wrong calls to clearstatcache
  Add Vietnamese translation for validators
  Allow running PHPUnit with "xdebug.scream" ON
  [Yaml] detect circular references
diff --git a/Core/Tests/Authentication/AuthenticationProviderManagerTest.php b/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
@@ -188,7 +188,7 @@ protected function getAuthenticationProvider($supports, $token = null, $exceptio
         } elseif (null !== $exception) {
             $provider->expects($this->once())
                      ->method('authenticate')
-                     ->will($this->throwException($this->getMockBuilder($exception)->setMethods(null)->getMock()))
+                     ->willThrowException($this->getMockBuilder($exception)->setMethods(null)->getMock())
             ;
         }
 
diff --git a/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php b/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
@@ -38,7 +38,7 @@ public function testRetrieveUserWhenUsernameIsNotFound()
         $userProvider = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface')->getMock();
         $userProvider->expects($this->once())
                      ->method('loadUserByUsername')
-                     ->will($this->throwException(new UsernameNotFoundException()))
+                     ->willThrowException(new UsernameNotFoundException())
         ;
 
         $provider = new DaoAuthenticationProvider($userProvider, $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface')->getMock(), 'key', $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface')->getMock());
@@ -56,7 +56,7 @@ public function testRetrieveUserWhenAnExceptionOccurs()
         $userProvider = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface')->getMock();
         $userProvider->expects($this->once())
                      ->method('loadUserByUsername')
-                     ->will($this->throwException(new \RuntimeException()))
+                     ->willThrowException(new \RuntimeException())
         ;
 
         $provider = new DaoAuthenticationProvider($userProvider, $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserCheckerInterface')->getMock(), 'key', $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface')->getMock());
diff --git a/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php b/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
@@ -73,7 +73,7 @@ public function testBindFailureShouldThrowAnException()
         $ldap
             ->expects($this->once())
             ->method('bind')
-            ->will($this->throwException(new ConnectionException()))
+            ->willThrowException(new ConnectionException())
         ;
         $userChecker = $this->getMockBuilder(UserCheckerInterface::class)->getMock();
 
diff --git a/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php b/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
@@ -85,7 +85,7 @@ public function testAuthenticateWhenUserCheckerThrowsException()
         $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
         $userChecker->expects($this->once())
                     ->method('checkPostAuth')
-                    ->will($this->throwException(new LockedException()))
+                    ->willThrowException(new LockedException())
         ;
 
         $provider = $this->getProvider($user, $userChecker);
diff --git a/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php b/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
@@ -57,7 +57,7 @@ public function testAuthenticateWhenPreChecksFails()
         $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
         $userChecker->expects($this->once())
             ->method('checkPreAuth')
-            ->will($this->throwException(new DisabledException()));
+            ->willThrowException(new DisabledException());
 
         $provider = $this->getProvider($userChecker);
 
diff --git a/Core/Tests/Authentication/Provider/SimpleAuthenticationProviderTest.php b/Core/Tests/Authentication/Provider/SimpleAuthenticationProviderTest.php
@@ -34,7 +34,7 @@ public function testAuthenticateWhenPreChecksFails()
         $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
         $userChecker->expects($this->once())
             ->method('checkPreAuth')
-            ->will($this->throwException(new DisabledException()));
+            ->willThrowException(new DisabledException());
 
         $authenticator = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface')->getMock();
         $authenticator->expects($this->once())
@@ -61,7 +61,7 @@ public function testAuthenticateWhenPostChecksFails()
         $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
         $userChecker->expects($this->once())
             ->method('checkPostAuth')
-            ->will($this->throwException(new LockedException()));
+            ->willThrowException(new LockedException());
 
         $authenticator = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\SimpleAuthenticatorInterface')->getMock();
         $authenticator->expects($this->once())
diff --git a/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php b/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
@@ -48,7 +48,7 @@ public function testAuthenticateWhenUsernameIsNotFound()
         $provider = $this->getProvider(false, false);
         $provider->expects($this->once())
                  ->method('retrieveUser')
-                 ->will($this->throwException(new UsernameNotFoundException()))
+                 ->willThrowException(new UsernameNotFoundException())
         ;
 
         $provider->authenticate($this->getSupportedToken());
@@ -62,7 +62,7 @@ public function testAuthenticateWhenUsernameIsNotFoundAndHideIsTrue()
         $provider = $this->getProvider(false, true);
         $provider->expects($this->once())
                  ->method('retrieveUser')
-                 ->will($this->throwException(new UsernameNotFoundException()))
+                 ->willThrowException(new UsernameNotFoundException())
         ;
 
         $provider->authenticate($this->getSupportedToken());
@@ -90,7 +90,7 @@ public function testAuthenticateWhenPreChecksFails()
         $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
         $userChecker->expects($this->once())
                     ->method('checkPreAuth')
-                    ->will($this->throwException(new CredentialsExpiredException()))
+                    ->willThrowException(new CredentialsExpiredException())
         ;
 
         $provider = $this->getProvider($userChecker);
@@ -110,7 +110,7 @@ public function testAuthenticateWhenPostChecksFails()
         $userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
         $userChecker->expects($this->once())
                     ->method('checkPostAuth')
-                    ->will($this->throwException(new AccountExpiredException()))
+                    ->willThrowException(new AccountExpiredException())
         ;
 
         $provider = $this->getProvider($userChecker);
@@ -135,7 +135,7 @@ public function testAuthenticateWhenPostCheckAuthenticationFails()
         ;
         $provider->expects($this->once())
                  ->method('checkAuthentication')
-                 ->will($this->throwException(new BadCredentialsException()))
+                 ->willThrowException(new BadCredentialsException())
         ;
 
         $provider->authenticate($this->getSupportedToken());
@@ -154,7 +154,7 @@ public function testAuthenticateWhenPostCheckAuthenticationFailsWithHideFalse()
         ;
         $provider->expects($this->once())
                  ->method('checkAuthentication')
-                 ->will($this->throwException(new BadCredentialsException('Foo')))
+                 ->willThrowException(new BadCredentialsException('Foo'))
         ;
 
         $provider->authenticate($this->getSupportedToken());
diff --git a/Core/Tests/User/ChainUserProviderTest.php b/Core/Tests/User/ChainUserProviderTest.php
@@ -25,7 +25,7 @@ public function testLoadUserByUsername()
             ->expects($this->once())
             ->method('loadUserByUsername')
             ->with($this->equalTo('foo'))
-            ->will($this->throwException(new UsernameNotFoundException('not found')))
+            ->willThrowException(new UsernameNotFoundException('not found'))
         ;
 
         $provider2 = $this->getProvider();
@@ -50,15 +50,15 @@ public function testLoadUserByUsernameThrowsUsernameNotFoundException()
             ->expects($this->once())
             ->method('loadUserByUsername')
             ->with($this->equalTo('foo'))
-            ->will($this->throwException(new UsernameNotFoundException('not found')))
+            ->willThrowException(new UsernameNotFoundException('not found'))
         ;
 
         $provider2 = $this->getProvider();
         $provider2
             ->expects($this->once())
             ->method('loadUserByUsername')
             ->with($this->equalTo('foo'))
-            ->will($this->throwException(new UsernameNotFoundException('not found')))
+            ->willThrowException(new UsernameNotFoundException('not found'))
         ;
 
         $provider = new ChainUserProvider(array($provider1, $provider2));
@@ -71,7 +71,7 @@ public function testRefreshUser()
         $provider1
             ->expects($this->once())
             ->method('refreshUser')
-            ->will($this->throwException(new UnsupportedUserException('unsupported')))
+            ->willThrowException(new UnsupportedUserException('unsupported'))
         ;
 
         $provider2 = $this->getProvider();
@@ -91,7 +91,7 @@ public function testRefreshUserAgain()
         $provider1
             ->expects($this->once())
             ->method('refreshUser')
-            ->will($this->throwException(new UsernameNotFoundException('not found')))
+            ->willThrowException(new UsernameNotFoundException('not found'))
         ;
 
         $provider2 = $this->getProvider();
@@ -114,14 +114,14 @@ public function testRefreshUserThrowsUnsupportedUserException()
         $provider1
             ->expects($this->once())
             ->method('refreshUser')
-            ->will($this->throwException(new UnsupportedUserException('unsupported')))
+            ->willThrowException(new UnsupportedUserException('unsupported'))
         ;
 
         $provider2 = $this->getProvider();
         $provider2
             ->expects($this->once())
             ->method('refreshUser')
-            ->will($this->throwException(new UnsupportedUserException('unsupported')))
+            ->willThrowException(new UnsupportedUserException('unsupported'))
         ;
 
         $provider = new ChainUserProvider(array($provider1, $provider2));
@@ -178,7 +178,7 @@ public function testAcceptsTraversable()
         $provider1
             ->expects($this->once())
             ->method('refreshUser')
-            ->will($this->throwException(new UnsupportedUserException('unsupported')))
+            ->willThrowException(new UnsupportedUserException('unsupported'))
         ;
 
         $provider2 = $this->getProvider();
diff --git a/Core/Tests/User/LdapUserProviderTest.php b/Core/Tests/User/LdapUserProviderTest.php
@@ -33,7 +33,7 @@ public function testLoadUserByUsernameFailsIfCantConnectToLdap()
         $ldap
             ->expects($this->once())
             ->method('bind')
-            ->will($this->throwException(new ConnectionException()))
+            ->willThrowException(new ConnectionException())
         ;
 
         $provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com');
diff --git a/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
@@ -183,7 +183,7 @@ public function testHandleCatchesAuthenticationException()
         $authenticator
             ->expects($this->once())
             ->method('getCredentials')
-            ->will($this->throwException($authException));
+            ->willThrowException($authException);
 
         // this is not called
         $this->authenticationManager
diff --git a/Http/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php b/Http/Tests/Firewall/AbstractPreAuthenticatedListenerTest.php
@@ -90,7 +90,7 @@ public function testHandleWhenAuthenticationFails()
             ->expects($this->once())
             ->method('authenticate')
             ->with($this->isInstanceOf('Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken'))
-            ->will($this->throwException($exception))
+            ->willThrowException($exception)
         ;
 
         $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', array(
@@ -138,7 +138,7 @@ public function testHandleWhenAuthenticationFailsWithDifferentToken()
             ->expects($this->once())
             ->method('authenticate')
             ->with($this->isInstanceOf('Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken'))
-            ->will($this->throwException($exception))
+            ->willThrowException($exception)
         ;
 
         $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', array(
@@ -228,7 +228,7 @@ public function testHandleWithAnInvalidSimilarToken()
             ->expects($this->once())
             ->method('authenticate')
             ->with($this->isInstanceOf('Symfony\Component\Security\Core\Authentication\Token\PreAuthenticatedToken'))
-            ->will($this->throwException($exception))
+            ->willThrowException($exception)
         ;
 
         $listener = $this->getMockForAbstractClass('Symfony\Component\Security\Http\Firewall\AbstractPreAuthenticatedListener', array(
diff --git a/Http/Tests/Firewall/RememberMeListenerTest.php b/Http/Tests/Firewall/RememberMeListenerTest.php
@@ -90,7 +90,7 @@ public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenti
         $manager
             ->expects($this->once())
             ->method('authenticate')
-            ->will($this->throwException($exception))
+            ->willThrowException($exception)
         ;
 
         $event = $this->getGetResponseEvent();
@@ -132,7 +132,7 @@ public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExcepti
         $manager
             ->expects($this->once())
             ->method('authenticate')
-            ->will($this->throwException($exception))
+            ->willThrowException($exception)
         ;
 
         $event = $this->getGetResponseEvent();
@@ -159,7 +159,7 @@ public function testOnCoreSecurityAuthenticationExceptionDuringAutoLoginTriggers
         $service
             ->expects($this->once())
             ->method('autoLogin')
-            ->will($this->throwException($exception))
+            ->willThrowException($exception)
         ;
 
         $service
diff --git a/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php b/Http/Tests/Firewall/SimplePreAuthenticationListenerTest.php
@@ -72,7 +72,7 @@ public function testHandlecatchAuthenticationException()
             ->expects($this->once())
             ->method('authenticate')
             ->with($this->equalTo($this->token))
-            ->will($this->throwException($exception))
+            ->willThrowException($exception)
         ;
 
         $this->tokenStorage->expects($this->once())
diff --git a/Http/Tests/HttpUtilsTest.php b/Http/Tests/HttpUtilsTest.php
@@ -200,7 +200,7 @@ public function testCheckRequestPathWithUrlMatcherAndResourceNotFound()
             ->expects($this->any())
             ->method('match')
             ->with('/')
-            ->will($this->throwException(new ResourceNotFoundException()))
+            ->willThrowException(new ResourceNotFoundException())
         ;
 
         $utils = new HttpUtils(null, $urlMatcher);
@@ -215,7 +215,7 @@ public function testCheckRequestPathWithUrlMatcherAndMethodNotAllowed()
             ->expects($this->any())
             ->method('matchRequest')
             ->with($request)
-            ->will($this->throwException(new MethodNotAllowedException(array())))
+            ->willThrowException(new MethodNotAllowedException(array()))
         ;
 
         $utils = new HttpUtils(null, $urlMatcher);
@@ -260,7 +260,7 @@ public function testCheckRequestPathWithUrlMatcherLoadingException()
         $urlMatcher
             ->expects($this->any())
             ->method('match')
-            ->will($this->throwException(new \RuntimeException()))
+            ->willThrowException(new \RuntimeException())
         ;
 
         $utils = new HttpUtils(null, $urlMatcher);
diff --git a/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
@@ -65,7 +65,7 @@ public function testAutoLoginThrowsExceptionOnNonExistentToken()
         $tokenProvider
             ->expects($this->once())
             ->method('loadTokenBySeries')
-            ->will($this->throwException(new TokenNotFoundException('Token not found.')))
+            ->willThrowException(new TokenNotFoundException('Token not found.'))
         ;
         $service->setTokenProvider($tokenProvider);
 
@@ -91,7 +91,7 @@ public function testAutoLoginReturnsNullOnNonExistentUser()
         $userProvider
             ->expects($this->once())
             ->method('loadUserByUsername')
-            ->will($this->throwException(new UsernameNotFoundException('user not found')))
+            ->willThrowException(new UsernameNotFoundException('user not found'))
         ;
 
         $this->assertNull($service->autoLogin($request));
diff --git a/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php b/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
@@ -49,7 +49,7 @@ public function testAutoLoginThrowsExceptionOnNonExistentUser()
         $userProvider
             ->expects($this->once())
             ->method('loadUserByUsername')
-            ->will($this->throwException(new UsernameNotFoundException('user not found')))
+            ->willThrowException(new UsernameNotFoundException('user not found'))
         ;
 
         $this->assertNull($service->autoLogin($request));

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ protected function getAuthenticationProvider($supports, $token = null, $exceptio`
`188`	`188`	`} elseif (null !== $exception) {`
`189`	`189`	`$provider->expects($this->once())`
`190`	`190`	`->method('authenticate')`
`191`		`- ->will($this->throwException($this->getMockBuilder($exception)->setMethods(null)->getMock()))`
	`191`	`+ ->willThrowException($this->getMockBuilder($exception)->setMethods(null)->getMock())`
`192`	`192`	`;`
`193`	`193`	`}`
`194`	`194`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function testBindFailureShouldThrowAnException()`
`73`	`73`	`$ldap`
`74`	`74`	`->expects($this->once())`
`75`	`75`	`->method('bind')`
`76`		`- ->will($this->throwException(new ConnectionException()))`
	`76`	`+ ->willThrowException(new ConnectionException())`
`77`	`77`	`;`
`78`	`78`	`$userChecker = $this->getMockBuilder(UserCheckerInterface::class)->getMock();`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function testAuthenticateWhenUserCheckerThrowsException()`
`85`	`85`	`$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();`
`86`	`86`	`$userChecker->expects($this->once())`
`87`	`87`	`->method('checkPostAuth')`
`88`		`- ->will($this->throwException(new LockedException()))`
	`88`	`+ ->willThrowException(new LockedException())`
`89`	`89`	`;`
`90`	`90`
`91`	`91`	`$provider = $this->getProvider($user, $userChecker);`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function testAuthenticateWhenUsernameIsNotFound()`
`48`	`48`	`$provider = $this->getProvider(false, false);`
`49`	`49`	`$provider->expects($this->once())`
`50`	`50`	`->method('retrieveUser')`
`51`		`- ->will($this->throwException(new UsernameNotFoundException()))`
	`51`	`+ ->willThrowException(new UsernameNotFoundException())`
`52`	`52`	`;`
`53`	`53`
`54`	`54`	`$provider->authenticate($this->getSupportedToken());`
`@@ -62,7 +62,7 @@ public function testAuthenticateWhenUsernameIsNotFoundAndHideIsTrue()`
`62`	`62`	`$provider = $this->getProvider(false, true);`
`63`	`63`	`$provider->expects($this->once())`
`64`	`64`	`->method('retrieveUser')`
`65`		`- ->will($this->throwException(new UsernameNotFoundException()))`
	`65`	`+ ->willThrowException(new UsernameNotFoundException())`
`66`	`66`	`;`
`67`	`67`
`68`	`68`	`$provider->authenticate($this->getSupportedToken());`
`@@ -90,7 +90,7 @@ public function testAuthenticateWhenPreChecksFails()`
`90`	`90`	`$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();`
`91`	`91`	`$userChecker->expects($this->once())`
`92`	`92`	`->method('checkPreAuth')`
`93`		`- ->will($this->throwException(new CredentialsExpiredException()))`
	`93`	`+ ->willThrowException(new CredentialsExpiredException())`
`94`	`94`	`;`
`95`	`95`
`96`	`96`	`$provider = $this->getProvider($userChecker);`
`@@ -110,7 +110,7 @@ public function testAuthenticateWhenPostChecksFails()`
`110`	`110`	`$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();`
`111`	`111`	`$userChecker->expects($this->once())`
`112`	`112`	`->method('checkPostAuth')`
`113`		`- ->will($this->throwException(new AccountExpiredException()))`
	`113`	`+ ->willThrowException(new AccountExpiredException())`
`114`	`114`	`;`
`115`	`115`
`116`	`116`	`$provider = $this->getProvider($userChecker);`
`@@ -135,7 +135,7 @@ public function testAuthenticateWhenPostCheckAuthenticationFails()`
`135`	`135`	`;`
`136`	`136`	`$provider->expects($this->once())`
`137`	`137`	`->method('checkAuthentication')`
`138`		`- ->will($this->throwException(new BadCredentialsException()))`
	`138`	`+ ->willThrowException(new BadCredentialsException())`
`139`	`139`	`;`
`140`	`140`
`141`	`141`	`$provider->authenticate($this->getSupportedToken());`
`@@ -154,7 +154,7 @@ public function testAuthenticateWhenPostCheckAuthenticationFailsWithHideFalse()`
`154`	`154`	`;`
`155`	`155`	`$provider->expects($this->once())`
`156`	`156`	`->method('checkAuthentication')`
`157`		`- ->will($this->throwException(new BadCredentialsException('Foo')))`
	`157`	`+ ->willThrowException(new BadCredentialsException('Foo'))`
`158`	`158`	`;`
`159`	`159`
`160`	`160`	`$provider->authenticate($this->getSupportedToken());`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function testLoadUserByUsernameFailsIfCantConnectToLdap()`
`33`	`33`	`$ldap`
`34`	`34`	`->expects($this->once())`
`35`	`35`	`->method('bind')`
`36`		`- ->will($this->throwException(new ConnectionException()))`
	`36`	`+ ->willThrowException(new ConnectionException())`
`37`	`37`	`;`
`38`	`38`
`39`	`39`	`$provider = new LdapUserProvider($ldap, 'ou=MyBusiness,dc=symfony,dc=com');`