Merge branch '2.3' into 2.4

* 2.3: Fixed mistake in upgrade docu Container::camelize also takes backslashes into consideration fixed typos fixed @expectedException class names fixed some typos fixed @expectedException class names Typo and better wording for german validator translation
2013-11-26 17:40:27 +01:00 · 2013-11-26 17:40:27 +01:00 · 990267f959
commit 990267f959
parent 41b5c8ebc8 da90eb911d
44 changed files with 84 additions and 83 deletions
--- a/UPGRADE-2.3.md
+++ b/UPGRADE-2.3.md
@ -137,7 +137,7 @@ Form

   ```
   $form = $factory->create('form');
-   $form->add($factory->createNamed('field', 'text', array(
+   $form->add($factory->createNamed('field', 'text', array(), array(
       'auto_initialize' => false,
   )));
   ```
@ -276,4 +276,4 @@ BrowserKit

   If you were using responses with Location header and non-3xx Status Code,
   you have to update your code to manually create another request to URL
-   grabbed from the Location header.
+   grabbed from the Location header.
--- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
@ -358,7 +358,7 @@ class UniqueValidatorTest extends \PHPUnit_Framework_TestCase
    public function testDedicatedEntityManagerNullObject()
    {
        $uniqueFields = array('name');
-        $entityManagerName = 'foo'; 
+        $entityManagerName = 'foo';

        $registry = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');

--- a/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
@ -52,7 +52,7 @@ class FilesystemLoaderTest extends TestCase
    }

    /**
-     * @expectedException Twig_Error_Loader
+     * @expectedException \Twig_Error_Loader
     */
    public function testTwigErrorIfLocatorThrowsInvalid()
    {
@ -76,7 +76,7 @@ class FilesystemLoaderTest extends TestCase
    }

    /**
-     * @expectedException Twig_Error_Loader
+     * @expectedException \Twig_Error_Loader
     */
    public function testTwigErrorIfLocatorReturnsFalse()
    {
--- a/src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
+++ b/src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
@ -189,7 +189,7 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testUnableToLoadClassException()
    {
--- a/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php
+++ b/src/Symfony/Component/Config/Tests/Loader/LoaderTest.php
@ -43,7 +43,7 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException Symfony\Component\Config\Exception\FileLoaderLoadException
+     * @expectedException \Symfony\Component\Config\Exception\FileLoaderLoadException
     */
    public function testResolveWhenResolverCannotFindLoader()
    {
--- a/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleStackTest.php
+++ b/src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleStackTest.php
@ -59,7 +59,7 @@ class OutputFormatterStyleStackTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testInvalidPop()
    {
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@ -525,7 +525,7 @@ class Container implements IntrospectableContainerInterface
     */
    public static function camelize($id)
    {
-        return strtr(ucwords(strtr($id, array('_' => ' ', '.' => '_ '))), array(' ' => ''));
+        return strtr(ucwords(strtr($id, array('_' => ' ', '.' => '_ ', '\\' => '_ '))), array(' ' => ''));
    }

    /**
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@ -449,7 +449,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase

    /**
     * @covers Symfony\Component\DependencyInjection\ContainerBuilder::merge
-     * @expectedException LogicException
+     * @expectedException \LogicException
     */
    public function testMergeLogicException()
    {
@ -649,7 +649,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException BadMethodCallException
+     * @expectedException \BadMethodCallException
     */
    public function testThrowsExceptionWhenSetServiceOnAFrozenContainer()
    {
@ -661,7 +661,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException BadMethodCallException
+     * @expectedException \BadMethodCallException
     */
    public function testThrowsExceptionWhenAddServiceOnAFrozenContainer()
    {
@ -728,7 +728,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException BadMethodCallException
+     * @expectedException \BadMethodCallException
     */
    public function testThrowsExceptionWhenSetDefinitionOnAFrozenContainer()
    {
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@ -51,6 +51,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
            array('.foo', '_Foo'),
            array('foo_', 'Foo'),
            array('foo.', 'Foo_'),
+            array('foo\bar', 'Foo_Bar'),
        );
    }

--- a/src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php
@ -81,7 +81,7 @@ class DefinitionDecoratorTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testReplaceArgumentShouldRequireIntegerIndex()
    {
@ -106,7 +106,7 @@ class DefinitionDecoratorTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException OutOfBoundsException
+     * @expectedException \OutOfBoundsException
     */
    public function testGetArgumentShouldCheckBounds()
    {
--- a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
@ -275,7 +275,7 @@ class DefinitionTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException OutOfBoundsException
+     * @expectedException \OutOfBoundsException
     */
    public function testGetArgumentShouldCheckBounds()
    {
@ -286,7 +286,7 @@ class DefinitionTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException OutOfBoundsException
+     * @expectedException \OutOfBoundsException
     */
    public function testReplaceArgumentShouldCheckBounds()
    {
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@ -81,7 +81,7 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testExportParameters()
    {
@ -121,7 +121,7 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     * @expectedExceptionMessage Service id "bar$" cannot be converted to a valid PHP method name.
     */
    public function testAddServiceInvalidServiceId()
--- a/src/Symfony/Component/Finder/Expression/Expression.php
+++ b/src/Symfony/Component/Finder/Expression/Expression.php
@ -130,7 +130,7 @@ class Expression implements ValueInterface
    public function getGlob()
    {
        if (self::TYPE_GLOB !== $this->value->getType()) {
-            throw new \LogicException('Regex cant be transformed to glob.');
+            throw new \LogicException('Regex can\'t be transformed to glob.');
        }

        return $this->value;
--- a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
@ -38,7 +38,7 @@ class CookieTest extends \PHPUnit_Framework_TestCase

    /**
     * @dataProvider invalidNames
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     * @covers Symfony\Component\HttpFoundation\Cookie::__construct
     */
    public function testInstantiationThrowsExceptionIfCookieNameContainsInvalidCharacters($name)
@ -47,7 +47,7 @@ class CookieTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testInvalidExpiration()
    {
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@ -669,18 +669,18 @@ class RequestTest extends \PHPUnit_Framework_TestCase
        $request->initialize(array('foo' => 'bar'));
        $this->assertEquals('', $request->getHost(), '->getHost() return empty string if not initialized');

-        $request->initialize(array(), array(), array(), array(), array(), array('HTTP_HOST' => 'www.exemple.com'));
-        $this->assertEquals('www.exemple.com', $request->getHost(), '->getHost() from Host Header');
+        $request->initialize(array(), array(), array(), array(), array(), array('HTTP_HOST' => 'www.example.com'));
+        $this->assertEquals('www.example.com', $request->getHost(), '->getHost() from Host Header');

        // Host header with port number
-        $request->initialize(array(), array(), array(), array(), array(), array('HTTP_HOST' => 'www.exemple.com:8080'));
-        $this->assertEquals('www.exemple.com', $request->getHost(), '->getHost() from Host Header with port number');
+        $request->initialize(array(), array(), array(), array(), array(), array('HTTP_HOST' => 'www.example.com:8080'));
+        $this->assertEquals('www.example.com', $request->getHost(), '->getHost() from Host Header with port number');

        // Server values
-        $request->initialize(array(), array(), array(), array(), array(), array('SERVER_NAME' => 'www.exemple.com'));
-        $this->assertEquals('www.exemple.com', $request->getHost(), '->getHost() from server name');
+        $request->initialize(array(), array(), array(), array(), array(), array('SERVER_NAME' => 'www.example.com'));
+        $this->assertEquals('www.example.com', $request->getHost(), '->getHost() from server name');

-        $request->initialize(array(), array(), array(), array(), array(), array('SERVER_NAME' => 'www.exemple.com', 'HTTP_HOST' => 'www.host.com'));
+        $request->initialize(array(), array(), array(), array(), array(), array('SERVER_NAME' => 'www.example.com', 'HTTP_HOST' => 'www.host.com'));
        $this->assertEquals('www.host.com', $request->getHost(), '->getHost() value from Host header has priority over SERVER_NAME ');
    }

@ -739,7 +739,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
     */
    public function testGetHostWithFakeHttpHostValue()
    {
@ -896,7 +896,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
     * @dataProvider getContentCantBeCalledTwiceWithResourcesProvider
     */
    public function testGetContentCantBeCalledTwiceWithResources($first, $second)
--- a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@ -724,7 +724,7 @@ class ResponseTest extends ResponseTestCase
    }

    /**
-     * @expectedException UnexpectedValueException
+     * @expectedException \UnexpectedValueException
     * @dataProvider invalidContentProvider
     */
    public function testSetContentInvalid($content)
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@ -49,7 +49,7 @@ class MongoDbSessionHandlerTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testConstructorShouldThrowExceptionForInvalidMongo()
    {
@ -57,7 +57,7 @@ class MongoDbSessionHandlerTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testConstructorShouldThrowExceptionForMissingOptions()
    {
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
@ -97,7 +97,7 @@ class MockArraySessionStorageTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
     */
    public function testUnstartedSave()
    {
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php
@ -107,7 +107,7 @@ class MockFileSessionStorageTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
     */
    public function testSaveWithoutStart()
    {
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
@ -42,7 +42,7 @@ class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testRenderWithUnknownRenderer()
    {
@ -52,7 +52,7 @@ class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
     * @expectedExceptionMessage Error when rendering "http://localhost/" (Status code is 404).
     */
    public function testDeliverWithUnsuccessfulResponse()
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
@ -126,7 +126,7 @@ class EsiTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
     */
    public function testProcessWhenNoSrcInAnEsi()
    {
@ -166,7 +166,7 @@ class EsiTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
     */
    public function testHandleWhenResponseIsNot200()
    {
--- a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@ -24,7 +24,7 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
 class HttpKernelTest extends \PHPUnit_Framework_TestCase
 {
    /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
     */
    public function testHandleWhenControllerThrowsAnExceptionAndRawIsTrue()
    {
@ -34,7 +34,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
     */
    public function testHandleWhenControllerThrowsAnExceptionAndRawIsFalseAndNoListenerIsRegistered()
    {
@ -136,7 +136,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
     */
    public function testHandleWhenTheControllerIsNotACallable()
    {
@ -188,7 +188,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
     */
    public function testHandleWhenTheControllerDoesNotReturnAResponse()
    {
--- a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@ -621,7 +621,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\LogicException
+     * @expectedException \Symfony\Component\Process\Exception\LogicException
     */
    public function testSignalProcessNotRunning()
    {
@ -641,7 +641,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testSignalWithWrongIntSignal()
    {
@ -655,7 +655,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testSignalWithWrongNonIntSignal()
    {
--- a/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
@ -94,7 +94,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testGetPidIsNullBeforeStart()
    {
@ -102,7 +102,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testGetPidIsNullAfterRun()
    {
@ -110,7 +110,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testExitCodeText()
    {
@ -145,7 +145,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testSignal()
    {
@ -153,7 +153,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testProcessWithoutTermSignalIsNotSignaled()
    {
--- a/src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
@ -46,7 +46,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testGetPid()
    {
@ -54,7 +54,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testGetPidIsNullBeforeStart()
    {
@ -62,7 +62,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testGetPidIsNullAfterRun()
    {
@ -78,7 +78,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testSignal()
    {
@ -86,7 +86,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testProcessWithoutTermSignalIsNotSignaled()
    {
--- a/src/Symfony/Component/Process/Tests/SimpleProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/SimpleProcessTest.php
@ -104,7 +104,7 @@ class SimpleProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\LogicException
+     * @expectedException \Symfony\Component\Process\Exception\LogicException
     */
    public function testSignalProcessNotRunning()
    {
@ -113,7 +113,7 @@ class SimpleProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testSignalWithWrongIntSignal()
    {
@ -122,7 +122,7 @@ class SimpleProcessTest extends AbstractProcessTest
    }

    /**
-     * @expectedException Symfony\Component\Process\Exception\RuntimeException
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
     */
    public function testSignalWithWrongNonIntSignal()
    {
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
@ -20,7 +20,7 @@ use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase
 {
    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testAuthenticateWithoutProviders()
    {
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememerMeTokenTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememerMeTokenTest.php
@ -53,7 +53,7 @@ class RememberMeTokenTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException PHPUnit_Framework_Error
+     * @expectedException \PHPUnit_Framework_Error
     * @dataProvider getUserArguments
     */
    public function testConstructorUserCannotBeNull($user)
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php
@ -28,7 +28,7 @@ class UsernamePasswordTokenTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
     */
    public function testSetAuthenticatedToTrue()
    {
--- a/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
@ -47,7 +47,7 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testSetVotersEmpty()
    {
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php
@ -46,7 +46,7 @@ class BasePasswordEncoderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testMergePasswordAndSaltWithException()
    {
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php
@ -35,7 +35,7 @@ class MessageDigestPasswordEncoderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
     */
    public function testEncodePasswordAlgorithmDoesNotExist()
    {
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
@ -35,7 +35,7 @@ class Pbkdf2PasswordEncoderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
     */
    public function testEncodePasswordAlgorithmDoesNotExist()
    {
--- a/src/Symfony/Component/Security/Core/Tests/User/InMemoryProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/InMemoryProviderTest.php
@ -42,7 +42,7 @@ class InMemoryUserProviderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
     */
    public function testCreateUserAlreadyExist()
    {
--- a/src/Symfony/Component/Security/Core/Tests/User/UserTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/UserTest.php
@ -17,7 +17,7 @@ class UserTest extends \PHPUnit_Framework_TestCase
 {
    /**
     * @covers Symfony\Component\Security\Core\User\User::__construct
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
     */
    public function testConstructorException()
    {
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
@ -122,7 +122,7 @@ class LogoutListenerTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
     */
    public function testSuccessHandlerReturnsNonResponse()
    {
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
@ -57,7 +57,7 @@ class X509AuthenticationListenerTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException Symfony\Component\Security\Core\Exception\BadCredentialsException
+     * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
     */
    public function testGetPreAuthenticatedDataNoUser()
    {
--- a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@ -53,7 +53,7 @@ class XmlEncoderTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException        UnexpectedValueException
+     * @expectedException        \Symfony\Component\Serializer\Exception\UnexpectedValueException
     * @expectedExceptionMessage Document types are not allowed.
     */
    public function testDocTypeIsNotAllowed()
--- a/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
+++ b/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
@ -125,7 +125,7 @@ class MessageCatalogueTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
     */
    public function testAddFallbackCatalogueWithCircularReference()
    {
@ -137,7 +137,7 @@ class MessageCatalogueTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException LogicException
+     * @expectedException \LogicException
     */
    public function testAddCatalogueWhenLocaleIsNotTheSameAsTheCurrentOne()
    {
--- a/src/Symfony/Component/Translation/Tests/TranslatorTest.php
+++ b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@ -141,7 +141,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @expectedException RuntimeException
+     * @expectedException \RuntimeException
     */
    public function testWhenAResourceHasNoRegisteredLoader()
    {
--- a/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
+++ b/src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
@ -248,7 +248,7 @@
            </trans-unit>
            <trans-unit id="65">
                <source>This value should be equal to {{ compared_value }}.</source>
-                <target>Dieser Wert sollte übereinstimmen mit {{ compared_value }}.</target>
+                <target>Dieser Wert sollte gleich {{ compared_value }} sein.</target>
            </trans-unit>
            <trans-unit id="66">
                <source>This value should be greater than {{ compared_value }}.</source>
@ -256,7 +256,7 @@
            </trans-unit>
            <trans-unit id="67">
                <source>This value should be greater than or equal to {{ compared_value }}.</source>
-                <target>Dieser Wert sollte größer sein oder übereinstimmen mit {{ compared_value }}.</target>
+                <target>Dieser Wert sollte größer oder gleich {{ compared_value }} sein.</target>
            </trans-unit>
            <trans-unit id="68">
                <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
@ -268,7 +268,7 @@
            </trans-unit>
            <trans-unit id="70">
                <source>This value should be less than or equal to {{ compared_value }}.</source>
-                <target>Dieser Wert sollte kleiner sein oder übereinstimmen mit {{ compared_value }}.</target>
+                <target>Dieser Wert sollte kleiner oder gleich {{ compared_value }} sein.</target>
            </trans-unit>
            <trans-unit id="71">
                <source>This value should not be equal to {{ compared_value }}.</source>
@ -276,7 +276,7 @@
            </trans-unit>
            <trans-unit id="72">
                <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
-                <target>Dieser Wert sollte nicht identische sein mit {{ compared_value_type }} {{ compared_value }}.</target>
+                <target>Dieser Wert sollte nicht identisch sein mit {{ compared_value_type }} {{ compared_value }}.</target>
            </trans-unit>
        </body>
    </file>
--- a/src/Symfony/Component/Yaml/Tests/Fixtures/YtsBasicTests.yml
+++ b/src/Symfony/Component/Yaml/Tests/Fixtures/YtsBasicTests.yml
@ -56,7 +56,7 @@ test: Simple Mapping
 brief: |
    You can add a keyed list (also known as a dictionary or
    hash) to your document by placing each member of the
-    list on a new line, with a colon seperating the key
+    list on a new line, with a colon separating the key
    from its value.  In YAML, this type of list is called
    a mapping.
 yaml: |
--- a/src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml
+++ b/src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml
@ -222,7 +222,7 @@ yaml: |
      # Following node labeled SS
      - &SS Sammy Sosa
   rbi:
-      - *SS # Subsequent occurance
+      - *SS # Subsequent occurrence
      - Ken Griffey
 php: |
   array(
--- a/src/Symfony/Component/Yaml/Tests/Fixtures/YtsTypeTransfers.yml
+++ b/src/Symfony/Component/Yaml/Tests/Fixtures/YtsTypeTransfers.yml
@ -226,11 +226,11 @@ brief: >
    time zone.
 yaml: |
    iso8601: 2001-12-14t21:59:43.10-05:00
-    space seperated: 2001-12-14 21:59:43.10 -05:00
+    space separated: 2001-12-14 21:59:43.10 -05:00
 php: |
    array(
      'iso8601' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
-      'space seperated' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" )
+      'space separated' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" )
    )
 ---
 test: Date