Merge branch '3.4'

* 3.4:
  typo
  CS: adjust chaining indentation

src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php

@@ -148,13 +148,13 @@ class DoctrineDataCollectorTest extends TestCase
 
         $registry = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')->getMock();
         $registry
-                ->expects($this->any())
+            ->expects($this->any())
-                ->method('getConnectionNames')
+            ->method('getConnectionNames')
-                ->will($this->returnValue(array('default' => 'doctrine.dbal.default_connection')));
+            ->will($this->returnValue(array('default' => 'doctrine.dbal.default_connection')));
         $registry
-                ->expects($this->any())
+            ->expects($this->any())
-                ->method('getManagerNames')
+            ->method('getManagerNames')
-                ->will($this->returnValue(array('default' => 'doctrine.orm.default_entity_manager')));
+            ->will($this->returnValue(array('default' => 'doctrine.orm.default_entity_manager')));
         $registry->expects($this->any())
             ->method('getConnection')
             ->will($this->returnValue($connection));

src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures;
 
-use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;

src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

@@ -103,8 +103,8 @@ class UniqueEntityValidatorTest extends ConstraintValidatorTestCase
             ->getMock()
         ;
         $em->expects($this->any())
-             ->method('getRepository')
+            ->method('getRepository')
-             ->will($this->returnValue($repositoryMock))
+            ->will($this->returnValue($repositoryMock))
         ;
 
         $classMetadata = $this->getMockBuilder('Doctrine\Common\Persistence\Mapping\ClassMetadata')->getMock();
@@ -129,8 +129,8 @@ class UniqueEntityValidatorTest extends ConstraintValidatorTestCase
         ;
         $classMetadata->reflFields = array('name' => $refl);
         $em->expects($this->any())
-             ->method('getClassMetadata')
+            ->method('getClassMetadata')
-             ->will($this->returnValue($classMetadata))
+            ->will($this->returnValue($classMetadata))
         ;
 
         return $em;
@@ -361,8 +361,8 @@ class UniqueEntityValidatorTest extends ConstraintValidatorTestCase
 
         $repository = $this->createRepositoryMock();
         $repository->expects($this->once())
-             ->method('findByCustom')
+            ->method('findByCustom')
-             ->will($this->returnValue(array()))
+            ->will($this->returnValue(array()))
         ;
         $this->em = $this->createEntityManagerMock($repository);
         $this->registry = $this->createRegistryMock($this->em);

src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php

@@ -72,8 +72,8 @@ class RouterDebugCommandTest extends TestCase
         ;
 
         $loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader')
-             ->disableOriginalConstructor()
+            ->disableOriginalConstructor()
-             ->getMock();
+            ->getMock();
 
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
         $container

src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php

@@ -76,8 +76,8 @@ class RouterMatchCommandTest extends TestCase
         ;
 
         $loader = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader')
-             ->disableOriginalConstructor()
+            ->disableOriginalConstructor()
-             ->getMock();
+            ->getMock();
 
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
         $container

src/Symfony/Component/DependencyInjection/Tests/Compiler/AutoAliasServicePassTest.php

@@ -25,7 +25,7 @@ class AutoAliasServicePassTest extends TestCase
         $container = new ContainerBuilder();
 
         $container->register('example')
-          ->addTag('auto_alias', array('format' => '%non_existing%.example'));
+            ->addTag('auto_alias', array('format' => '%non_existing%.example'));
 
         $pass = new AutoAliasServicePass();
         $pass->process($container);
@@ -39,7 +39,7 @@ class AutoAliasServicePassTest extends TestCase
         $container = new ContainerBuilder();
 
         $container->register('example')
-          ->addTag('auto_alias', array());
+            ->addTag('auto_alias', array());
         $container->setParameter('existing', 'mysql');
 
         $pass = new AutoAliasServicePass();
@@ -51,7 +51,7 @@ class AutoAliasServicePassTest extends TestCase
         $container = new ContainerBuilder();
 
         $container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
-          ->addTag('auto_alias', array('format' => '%existing%.example'));
+            ->addTag('auto_alias', array('format' => '%existing%.example'));
         $container->setParameter('existing', 'mysql');
 
         $pass = new AutoAliasServicePass();
@@ -65,7 +65,7 @@ class AutoAliasServicePassTest extends TestCase
         $container = new ContainerBuilder();
 
         $container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
-          ->addTag('auto_alias', array('format' => '%existing%.example'));
+            ->addTag('auto_alias', array('format' => '%existing%.example'));
 
         $container->register('mysql.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql');
         $container->setParameter('existing', 'mysql');
@@ -83,7 +83,7 @@ class AutoAliasServicePassTest extends TestCase
         $container = new ContainerBuilder();
 
         $container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
-          ->addTag('auto_alias', array('format' => '%existing%.example'));
+            ->addTag('auto_alias', array('format' => '%existing%.example'));
 
         $container->register('mysql.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql');
         $container->register('mariadb.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMariaDb');

src/Symfony/Component/Form/Tests/AbstractDivLayoutTest.php

@@ -345,8 +345,8 @@ abstract class AbstractDivLayoutTest extends AbstractLayoutTest
         );
 
         $form = $this->factory->createNamedBuilder('form', 'Symfony\Component\Form\Extension\Core\Type\FormType')
-          ->add($collection)
+            ->add($collection)
-          ->getForm();
+            ->getForm();
 
         $this->assertWidgetMatchesXpath($form->createView(), array(),
 '/div

src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DataTransformerChainTest.php

@@ -20,14 +20,14 @@ class DataTransformerChainTest extends TestCase
     {
         $transformer1 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
         $transformer1->expects($this->once())
-                                 ->method('transform')
+            ->method('transform')
-                                 ->with($this->identicalTo('foo'))
+            ->with($this->identicalTo('foo'))
-                                 ->will($this->returnValue('bar'));
+            ->will($this->returnValue('bar'));
         $transformer2 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
         $transformer2->expects($this->once())
-                                 ->method('transform')
+            ->method('transform')
-                                 ->with($this->identicalTo('bar'))
+            ->with($this->identicalTo('bar'))
-                                 ->will($this->returnValue('baz'));
+            ->will($this->returnValue('baz'));
 
         $chain = new DataTransformerChain(array($transformer1, $transformer2));
 
@@ -38,14 +38,14 @@ class DataTransformerChainTest extends TestCase
     {
         $transformer2 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
         $transformer2->expects($this->once())
-                                 ->method('reverseTransform')
+            ->method('reverseTransform')
-                                 ->with($this->identicalTo('foo'))
+            ->with($this->identicalTo('foo'))
-                                 ->will($this->returnValue('bar'));
+            ->will($this->returnValue('bar'));
         $transformer1 = $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
         $transformer1->expects($this->once())
-                                 ->method('reverseTransform')
+            ->method('reverseTransform')
-                                 ->with($this->identicalTo('bar'))
+            ->with($this->identicalTo('bar'))
-                                 ->will($this->returnValue('baz'));
+            ->will($this->returnValue('baz'));
 
         $chain = new DataTransformerChain(array($transformer1, $transformer2));
 

src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php

@@ -470,9 +470,9 @@ class FormTypeTest extends BaseTypeTest
     public function testViewIsNotRenderedByDefault()
     {
         $view = $this->factory->createBuilder(static::TESTED_TYPE)
-                ->add('foo', static::TESTED_TYPE)
+            ->add('foo', static::TESTED_TYPE)
-                ->getForm()
+            ->getForm()
-                ->createView();
+            ->createView();
 
         $this->assertFalse($view->isRendered());
     }

src/Symfony/Component/Form/Tests/FormFactoryTest.php

@@ -287,9 +287,9 @@ class FormFactoryTest extends TestCase
     public function testCreateBuilderCreatesTextFormIfNoGuess()
     {
         $this->guesser1->expects($this->once())
-                ->method('guessType')
+            ->method('guessType')
-                ->with('Application\Author', 'firstName')
+            ->with('Application\Author', 'firstName')
-                ->will($this->returnValue(null));
+            ->will($this->returnValue(null));
 
         $factory = $this->getMockFactory(array('createNamedBuilder'));
 
@@ -306,13 +306,13 @@ class FormFactoryTest extends TestCase
     public function testOptionsCanBeOverridden()
     {
         $this->guesser1->expects($this->once())
-                ->method('guessType')
+            ->method('guessType')
-                ->with('Application\Author', 'firstName')
+            ->with('Application\Author', 'firstName')
-                ->will($this->returnValue(new TypeGuess(
+            ->will($this->returnValue(new TypeGuess(
-                    'Symfony\Component\Form\Extension\Core\Type\TextType',
+                'Symfony\Component\Form\Extension\Core\Type\TextType',
-                    array('attr' => array('maxlength' => 10)),
+                array('attr' => array('maxlength' => 10)),
-                    Guess::MEDIUM_CONFIDENCE
+                Guess::MEDIUM_CONFIDENCE
-                )));
+            )));
 
         $factory = $this->getMockFactory(array('createNamedBuilder'));
 
@@ -334,17 +334,17 @@ class FormFactoryTest extends TestCase
     public function testCreateBuilderUsesMaxLengthIfFound()
     {
         $this->guesser1->expects($this->once())
-                ->method('guessMaxLength')
+            ->method('guessMaxLength')
-                ->with('Application\Author', 'firstName')
+            ->with('Application\Author', 'firstName')
-                ->will($this->returnValue(new ValueGuess(
+            ->will($this->returnValue(new ValueGuess(
                     15,
                     Guess::MEDIUM_CONFIDENCE
                 )));
 
         $this->guesser2->expects($this->once())
-                ->method('guessMaxLength')
+            ->method('guessMaxLength')
-                ->with('Application\Author', 'firstName')
+            ->with('Application\Author', 'firstName')
-                ->will($this->returnValue(new ValueGuess(
+            ->will($this->returnValue(new ValueGuess(
                     20,
                     Guess::HIGH_CONFIDENCE
                 )));
@@ -402,17 +402,17 @@ class FormFactoryTest extends TestCase
     public function testCreateBuilderUsesRequiredSettingWithHighestConfidence()
     {
         $this->guesser1->expects($this->once())
-                ->method('guessRequired')
+            ->method('guessRequired')
-                ->with('Application\Author', 'firstName')
+            ->with('Application\Author', 'firstName')
-                ->will($this->returnValue(new ValueGuess(
+            ->will($this->returnValue(new ValueGuess(
                     true,
                     Guess::MEDIUM_CONFIDENCE
                 )));
 
         $this->guesser2->expects($this->once())
-                ->method('guessRequired')
+            ->method('guessRequired')
-                ->with('Application\Author', 'firstName')
+            ->with('Application\Author', 'firstName')
-                ->will($this->returnValue(new ValueGuess(
+            ->will($this->returnValue(new ValueGuess(
                     false,
                     Guess::HIGH_CONFIDENCE
                 )));
@@ -435,17 +435,17 @@ class FormFactoryTest extends TestCase
     public function testCreateBuilderUsesPatternIfFound()
     {
         $this->guesser1->expects($this->once())
-                ->method('guessPattern')
+            ->method('guessPattern')
-                ->with('Application\Author', 'firstName')
+            ->with('Application\Author', 'firstName')
-                ->will($this->returnValue(new ValueGuess(
+            ->will($this->returnValue(new ValueGuess(
                     '[a-z]',
                     Guess::MEDIUM_CONFIDENCE
                 )));
 
         $this->guesser2->expects($this->once())
-                ->method('guessPattern')
+            ->method('guessPattern')
-                ->with('Application\Author', 'firstName')
+            ->with('Application\Author', 'firstName')
-                ->will($this->returnValue(new ValueGuess(
+            ->will($this->returnValue(new ValueGuess(
                     '[a-zA-Z]',
                     Guess::HIGH_CONFIDENCE
                 )));

src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php

@@ -41,14 +41,14 @@ class RouterListenerTest extends TestCase
     public function testPort($defaultHttpPort, $defaultHttpsPort, $uri, $expectedHttpPort, $expectedHttpsPort)
     {
         $urlMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\UrlMatcherInterface')
-                             ->disableOriginalConstructor()
+            ->disableOriginalConstructor()
-                             ->getMock();
+            ->getMock();
         $context = new RequestContext();
         $context->setHttpPort($defaultHttpPort);
         $context->setHttpsPort($defaultHttpsPort);
         $urlMatcher->expects($this->any())
-                     ->method('getContext')
+            ->method('getContext')
-                     ->will($this->returnValue($context));
+            ->will($this->returnValue($context));
 
         $listener = new RouterListener($urlMatcher, $this->requestStack);
         $event = $this->createGetResponseEventForUri($uri);
@@ -141,13 +141,13 @@ class RouterListenerTest extends TestCase
     {
         $requestMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\RequestMatcherInterface')->getMock();
         $requestMatcher->expects($this->once())
-          ->method('matchRequest')
+            ->method('matchRequest')
-          ->will($this->returnValue($parameter));
+            ->will($this->returnValue($parameter));
 
         $logger = $this->getMockBuilder('Psr\Log\LoggerInterface')->getMock();
         $logger->expects($this->once())
-          ->method('info')
+            ->method('info')
-          ->with($this->equalTo($log), $this->equalTo($parameters));
+            ->with($this->equalTo($log), $this->equalTo($parameters));
 
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
         $request = Request::create('http://localhost/');

src/Symfony/Component/Validator/Tests/Mapping/Loader/LoaderChainTest.php

@@ -23,13 +23,13 @@ class LoaderChainTest extends TestCase
 
         $loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
         $loader1->expects($this->once())
-                        ->method('loadClassMetadata')
+            ->method('loadClassMetadata')
-                        ->with($this->equalTo($metadata));
+            ->with($this->equalTo($metadata));
 
         $loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
         $loader2->expects($this->once())
-                        ->method('loadClassMetadata')
+            ->method('loadClassMetadata')
-                        ->with($this->equalTo($metadata));
+            ->with($this->equalTo($metadata));
 
         $chain = new LoaderChain(array(
             $loader1,
@@ -45,13 +45,13 @@ class LoaderChainTest extends TestCase
 
         $loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
         $loader1->expects($this->any())
-                        ->method('loadClassMetadata')
+            ->method('loadClassMetadata')
-                        ->will($this->returnValue(true));
+            ->will($this->returnValue(true));
 
         $loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
         $loader2->expects($this->any())
-                        ->method('loadClassMetadata')
+            ->method('loadClassMetadata')
-                        ->will($this->returnValue(false));
+            ->will($this->returnValue(false));
 
         $chain = new LoaderChain(array(
             $loader1,
@@ -67,13 +67,13 @@ class LoaderChainTest extends TestCase
 
         $loader1 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
         $loader1->expects($this->any())
-                        ->method('loadClassMetadata')
+            ->method('loadClassMetadata')
-                        ->will($this->returnValue(false));
+            ->will($this->returnValue(false));
 
         $loader2 = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
         $loader2->expects($this->any())
-                        ->method('loadClassMetadata')
+            ->method('loadClassMetadata')
-                        ->will($this->returnValue(false));
+            ->will($this->returnValue(false));
 
         $chain = new LoaderChain(array(
             $loader1,