Merge branch '3.4' into 4.1

* 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

Author: fabpot

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(

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

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())

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);

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));

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));