Merge branch '2.5'

fabpot · fabpot · commit 2d44230585c2 · 2014-09-22T13:59:59.000+02:00
* 2.5:
  added missing use statements
  added missing use statement
  added missing use statement
  fixed CS
  [Process] fixed some volatile tests
  [HttpKernel] fixed a volatile test
  [HttpFoundation] fixed some volatile tests
  [Tests] PHPUnit Optimizations
  Use getPathname() instead of string casting to get BinaryFileReponse file path

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
	src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
	src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Stopwatch/Stopwatch.php
	src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
	src/Symfony/Component/Yaml/Parser.php
	src/Symfony/Component/Yaml/Tests/InlineTest.php
diff --git a/Command/TranslationUpdateCommand.php b/Command/TranslationUpdateCommand.php
@@ -59,7 +59,7 @@ protected function configure()
                 new InputOption(
                     'clean', null, InputOption::VALUE_NONE,
                     'Should clean not found messages'
-                )
+                ),
             ))
             ->setDescription('Updates the translation file')
             ->setHelp(<<<EOF
diff --git a/Console/Descriptor/MarkdownDescriptor.php b/Console/Descriptor/MarkdownDescriptor.php
@@ -213,7 +213,7 @@ protected function describeContainerAlias(Alias $alias, array $options = array()
      */
     protected function describeContainerParameter($parameter, array $options = array())
     {
-        $this->write(isset($options['parameter']) ? sprintf("%s\n%s\n\n%s", $options['parameter'], str_repeat('=', strlen($options['parameter'])), $this->formatParameter($parameter)): $parameter);
+        $this->write(isset($options['parameter']) ? sprintf("%s\n%s\n\n%s", $options['parameter'], str_repeat('=', strlen($options['parameter'])), $this->formatParameter($parameter)) : $parameter);
     }
 
     /**
diff --git a/Routing/Router.php b/Routing/Router.php
@@ -90,7 +90,7 @@ private function resolveParameters(RouteCollection $collection)
             }
 
             foreach ($route->getRequirements() as $name => $value) {
-                 $route->setRequirement($name, $this->resolve($value));
+                $route->setRequirement($name, $this->resolve($value));
             }
 
             $route->setPath($this->resolve($route->getPath()));
@@ -138,7 +138,7 @@ private function resolve($value)
             }
 
             throw new RuntimeException(sprintf(
-                'The container parameter "%s", used in the route configuration value "%s", ' .
+                'The container parameter "%s", used in the route configuration value "%s", '.
                 'must be a string or numeric, but it is of type %s.',
                 $match[1],
                 $value,
diff --git a/Tests/CacheWarmer/TemplateFinderTest.php b/Tests/CacheWarmer/TemplateFinderTest.php
@@ -53,5 +53,4 @@ function ($template) { return $template->getLogicalName(); },
         $this->assertContains('::this.is.a.template.format.engine', $templates);
         $this->assertContains('::resource.format.engine', $templates);
     }
-
 }
diff --git a/Tests/Console/Descriptor/AbstractDescriptorTest.php b/Tests/Console/Descriptor/AbstractDescriptorTest.php
@@ -158,7 +158,7 @@ private function getContainerBuilderDescriptionTestData(array $objects)
             'services' => array('show_private' => true),
             'public'   => array('show_private' => false),
             'tag1'     => array('show_private' => true, 'tag' => 'tag1'),
-            'tags'     => array('group_by' => 'tags', 'show_private' => true)
+            'tags'     => array('group_by' => 'tags', 'show_private' => true),
         );
 
         $data = array();
diff --git a/Tests/Console/Descriptor/ObjectsProvider.php b/Tests/Console/Descriptor/ObjectsProvider.php
@@ -73,7 +73,7 @@ public static function getContainerParameter()
         $builder->setParameter('database_name', 'symfony');
 
         return array(
-            'parameter' =>  $builder
+            'parameter' =>  $builder,
         );
     }
 
@@ -143,7 +143,7 @@ public static function getCallables()
             'callable_4' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass::staticMethod',
             'callable_5' => array('Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\ExtendedCallableClass', 'parent::staticMethod'),
             'callable_6' => function () { return 'Closure'; },
-            'callable_7' => new CallableClass()
+            'callable_7' => new CallableClass(),
         );
     }
 }
diff --git a/Tests/Controller/ControllerResolverTest.php b/Tests/Controller/ControllerResolverTest.php
@@ -115,8 +115,8 @@ public function getUndefinedControllers()
             array(
                 'Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar',
                 '\InvalidArgumentException',
-                'Controller "Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar" for URI "/" is not callable.'
-            )
+                'Controller "Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest::bar" for URI "/" is not callable.',
+            ),
         );
     }
 
diff --git a/Tests/Controller/RedirectControllerTest.php b/Tests/Controller/RedirectControllerTest.php
@@ -60,7 +60,7 @@ public function testRoute($permanent, $ignoreAttributes, $expectedCode, $expecte
                 'route' => $route,
                 'permanent' => $permanent,
                 'additional-parameter' => 'value',
-                'ignoreAttributes' => $ignoreAttributes
+                'ignoreAttributes' => $ignoreAttributes,
             ),
         );
 
diff --git a/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php b/Tests/DependencyInjection/Compiler/AddCacheWarmerPassTest.php
@@ -23,7 +23,7 @@ public function testThatCacheWarmersAreProcessedInPriorityOrder()
         $services = array(
             'my_cache_warmer_service1' => array(0 => array('priority' => 100)),
             'my_cache_warmer_service2' => array(0 => array('priority' => 200)),
-            'my_cache_warmer_service3' => array()
+            'my_cache_warmer_service3' => array(),
         );
 
         $definition = $this->getMock('Symfony\Component\DependencyInjection\Definition');
@@ -46,7 +46,7 @@ public function testThatCacheWarmersAreProcessedInPriorityOrder()
             ->with(0, array(
                 new Reference('my_cache_warmer_service2'),
                 new Reference('my_cache_warmer_service1'),
-                new Reference('my_cache_warmer_service3')
+                new Reference('my_cache_warmer_service3'),
             ));
 
         $addCacheWarmerPass = new AddCacheWarmerPass();
diff --git a/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php b/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
@@ -91,5 +91,4 @@ public function testProcessThrowAnExceptionIfTheServiceIsNotASubclassOfCommand()
 
 class MyCommand extends Command
 {
-
 }
diff --git a/Tests/DependencyInjection/Compiler/SerializerPassTest.php b/Tests/DependencyInjection/Compiler/SerializerPassTest.php
@@ -22,7 +22,6 @@
  */
 class SerializerPassTest extends \PHPUnit_Framework_TestCase
 {
-
     public function testThrowExceptionWhenNoNormalizers()
     {
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
@@ -72,16 +71,16 @@ public function testThrowExceptionWhenNoEncoders()
 
     public function testServicesAreOrderedAccordingToPriority()
     {
-       $services = array(
+        $services = array(
             'n3' => array('tag' => array()),
             'n1' => array('tag' => array('priority' => 200)),
-            'n2' => array('tag' => array('priority' => 100))
+            'n2' => array('tag' => array('priority' => 100)),
         );
 
-       $expected = array(
+        $expected = array(
            new Reference('n1'),
            new Reference('n2'),
-           new Reference('n3')
+           new Reference('n3'),
        );
 
         $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
diff --git a/Tests/DependencyInjection/Compiler/TranslatorPassTest.php b/Tests/DependencyInjection/Compiler/TranslatorPassTest.php
@@ -40,8 +40,6 @@ public function testValidCollector()
         $container->expects($this->once())
             ->method('findDefinition')
             ->will($this->returnValue($this->getMock('Symfony\Component\DependencyInjection\Definition')));
-        ;
-
         $pass = new TranslatorPass();
         $pass->process($container);
     }
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -36,7 +36,7 @@ public function testValidTrustedProxies($trustedProxies, $processedProxies)
         $configuration = new Configuration();
         $config = $processor->processConfiguration($configuration, array(array(
             'secret'          => 's3cr3t',
-            'trusted_proxies' => $trustedProxies
+            'trusted_proxies' => $trustedProxies,
         )));
 
         $this->assertEquals($processedProxies, $config['trusted_proxies']);
@@ -66,8 +66,8 @@ public function testInvalidTypeTrustedProxies()
         $processor->processConfiguration($configuration, array(
             array(
                 'secret' => 's3cr3t',
-                'trusted_proxies' => 'Not an IP address'
-            )
+                'trusted_proxies' => 'Not an IP address',
+            ),
         ));
     }
 
@@ -81,8 +81,8 @@ public function testInvalidValueTrustedProxies()
         $processor->processConfiguration($configuration, array(
             array(
                 'secret' => 's3cr3t',
-                'trusted_proxies' => array('Not an IP address')
-            )
+                'trusted_proxies' => array('Not an IP address'),
+            ),
         ));
     }
 
@@ -138,7 +138,7 @@ protected static function getBundleDefaultConfig()
                 'debug'          => '%kernel.debug%',
             ),
             'serializer'          => array(
-                'enabled' => false
+                'enabled' => false,
             ),
             'property_access' => array(
                 'magic_call' => false,
diff --git a/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php b/Tests/DependencyInjection/Fixtures/TestBundle/TestBundle.php
@@ -13,5 +13,4 @@
 
 class TestBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle
 {
-
 }
diff --git a/Tests/DependencyInjection/Fixtures/php/form_csrf_sets_field_name.php b/Tests/DependencyInjection/Fixtures/php/form_csrf_sets_field_name.php
@@ -3,7 +3,7 @@
 $container->loadFromExtension('framework', array(
     'csrf_protection' => array(
         'enabled' => true,
-        'field_name' => '_custom'
+        'field_name' => '_custom',
     ),
     'form' => array(
         'enabled' => true,
diff --git a/Tests/DependencyInjection/Fixtures/php/form_csrf_under_form_sets_field_name.php b/Tests/DependencyInjection/Fixtures/php/form_csrf_under_form_sets_field_name.php
@@ -3,12 +3,12 @@
 $container->loadFromExtension('framework', array(
     'csrf_protection' => array(
         'enabled' => true,
-        'field_name' => '_custom'
+        'field_name' => '_custom',
     ),
     'form' => array(
         'enabled' => true,
         'csrf_protection' => array(
-            'field_name' => '_custom_form'
+            'field_name' => '_custom_form',
         ),
     ),
     'session' => array(
diff --git a/Tests/DependencyInjection/Fixtures/php/full.php b/Tests/DependencyInjection/Fixtures/php/full.php
@@ -54,7 +54,7 @@
             ),
         ),
         'form'              => array(
-            'resources'     => array('theme1', 'theme2')
+            'resources'     => array('theme1', 'theme2'),
         ),
         'hinclude_default_template' => 'global_hinclude_template',
     ),
@@ -78,7 +78,7 @@
                 'text/csv',
                 'text/plain',
             ),
-            'pdf' => 'application/pdf'
-        )
-    )
+            'pdf' => 'application/pdf',
+        ),
+    ),
 ));
diff --git a/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php b/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
@@ -18,7 +18,7 @@
 
 class SessionController extends ContainerAware
 {
-    public function welcomeAction(Request $request, $name=null)
+    public function welcomeAction(Request $request, $name = null)
     {
         $session = $request->getSession();
 
diff --git a/Tests/Routing/RouterTest.php b/Tests/Routing/RouterTest.php
@@ -24,7 +24,7 @@ public function testGenerateWithServiceParam()
         $routes->add('foo', new Route(
             ' /{_locale}',
             array(
-                '_locale' => '%locale%'
+                '_locale' => '%locale%',
             ),
             array(
                 '_locale' => 'en|es',
diff --git a/Tests/Templating/DelegatingEngineTest.php b/Tests/Templating/DelegatingEngineTest.php
@@ -19,7 +19,7 @@ public function testSupportsRetrievesEngineFromTheContainer()
     {
         $container = $this->getContainerMock(array(
             'engine.first' => $this->getEngineMock('template.php', false),
-            'engine.second' => $this->getEngineMock('template.php', true)
+            'engine.second' => $this->getEngineMock('template.php', true),
         ));
 
         $delegatingEngine = new DelegatingEngine($container, array('engine.first', 'engine.second'));
@@ -33,7 +33,7 @@ public function testGetExistingEngine()
         $secondEngine = $this->getEngineMock('template.php', true);
         $container = $this->getContainerMock(array(
             'engine.first' => $firstEngine,
-            'engine.second' => $secondEngine
+            'engine.second' => $secondEngine,
         ));
 
         $delegatingEngine = new DelegatingEngine($container, array('engine.first', 'engine.second'));
@@ -51,7 +51,7 @@ public function testGetInvalidEngine()
         $secondEngine = $this->getEngineMock('template.php', false);
         $container = $this->getContainerMock(array(
             'engine.first' => $firstEngine,
-            'engine.second' => $secondEngine
+            'engine.second' => $secondEngine,
         ));
 
         $delegatingEngine = new DelegatingEngine($container, array('engine.first', 'engine.second'));
diff --git a/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -112,14 +112,14 @@ protected function setTheme(FormView $view, array $themes)
     public static function themeBlockInheritanceProvider()
     {
         return array(
-            array(array('TestBundle:Parent'))
+            array(array('TestBundle:Parent')),
         );
     }
 
     public static function themeInheritanceProvider()
     {
         return array(
-            array(array('TestBundle:Parent'), array('TestBundle:Child'))
+            array(array('TestBundle:Parent'), array('TestBundle:Child')),
         );
     }
 }
diff --git a/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php b/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php
@@ -1,2 +1,4 @@
-<?php if (!$label) { $label = $view['form']->humanize($name); } ?>
+<?php if (!$label) {
+    $label = $view['form']->humanize($name);
+} ?>
 <label>Custom label: <?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></label>
diff --git a/Tests/Translation/TranslatorTest.php b/Tests/Translation/TranslatorTest.php
@@ -175,7 +175,6 @@ public function testGetLocaleWithInvalidLocale()
         $this->assertSame('en-US', $translator->getLocale());
     }
 
-
     protected function getCatalogue($locale, $messages)
     {
         $catalogue = new MessageCatalogue($locale);
diff --git a/Translation/PhpStringTokenParser.php b/Translation/PhpStringTokenParser.php
@@ -96,7 +96,7 @@ public static function parse($str)
     public static function parseEscapeSequences($str, $quote)
     {
         if (null !== $quote) {
-            $str = str_replace('\\' . $quote, $quote, $str);
+            $str = str_replace('\\'.$quote, $quote, $str);
         }
 
         return preg_replace_callback(

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ protected function describeContainerAlias(Alias $alias, array $options = array()`
`213`	`213`	`*/`
`214`	`214`	`protected function describeContainerParameter($parameter, array $options = array())`
`215`	`215`	`{`
`216`		`- $this->write(isset($options['parameter']) ? sprintf("%s\n%s\n\n%s", $options['parameter'], str_repeat('=', strlen($options['parameter'])), $this->formatParameter($parameter)): $parameter);`
	`216`	`+ $this->write(isset($options['parameter']) ? sprintf("%s\n%s\n\n%s", $options['parameter'], str_repeat('=', strlen($options['parameter'])), $this->formatParameter($parameter)) : $parameter);`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ private function resolveParameters(RouteCollection $collection)`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`foreach ($route->getRequirements() as $name => $value) {`
`93`		`- $route->setRequirement($name, $this->resolve($value));`
	`93`	`+ $route->setRequirement($name, $this->resolve($value));`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`$route->setPath($this->resolve($route->getPath()));`
`@@ -138,7 +138,7 @@ private function resolve($value)`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`throw new RuntimeException(sprintf(`
`141`		`- 'The container parameter "%s", used in the route configuration value "%s", ' .`
	`141`	`+ 'The container parameter "%s", used in the route configuration value "%s", '.`
`142`	`142`	`'must be a string or numeric, but it is of type %s.',`
`143`	`143`	`$match[1],`
`144`	`144`	`$value,`
Original file line number	Diff line number	Diff line change
`@@ -53,5 +53,4 @@ function ($template) { return $template->getLogicalName(); },`
`53`	`53`	`$this->assertContains('::this.is.a.template.format.engine', $templates);`
`54`	`54`	`$this->assertContains('::resource.format.engine', $templates);`
`55`	`55`	`}`
`56`		`-`
`57`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public static function getContainerParameter()`
`73`	`73`	`$builder->setParameter('database_name', 'symfony');`
`74`	`74`
`75`	`75`	`return array(`
`76`		`- 'parameter' => $builder`
	`76`	`+ 'parameter' => $builder,`
`77`	`77`	`);`
`78`	`78`	`}`
`79`	`79`
`@@ -143,7 +143,7 @@ public static function getCallables()`
`143`	`143`	`'callable_4' => 'Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\CallableClass::staticMethod',`
`144`	`144`	`'callable_5' => array('Symfony\\Bundle\\FrameworkBundle\\Tests\\Console\\Descriptor\\ExtendedCallableClass', 'parent::staticMethod'),`
`145`	`145`	`'callable_6' => function () { return 'Closure'; },`
`146`		`- 'callable_7' => new CallableClass()`
	`146`	`+ 'callable_7' => new CallableClass(),`
`147`	`147`	`);`
`148`	`148`	`}`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,5 +91,4 @@ public function testProcessThrowAnExceptionIfTheServiceIsNotASubclassOfCommand()`
`91`	`91`
`92`	`92`	`class MyCommand extends Command`
`93`	`93`	`{`
`94`		`-`
`95`	`94`	`}`