CS: general fixes

keradus · keradus · commit 063ae13fdec4 · 2015-03-25T00:47:08.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,8 @@
-phpunit.xml
+.php_cs.cache
+autoload.php
 composer.lock
 composer.phar
-autoload.php
 package*.tar
 packages.json
+phpunit.xml
 /vendor/
diff --git a/.php_cs b/.php_cs
@@ -3,4 +3,26 @@
 return Symfony\CS\Config\Config::create()
     ->setUsingLinter(false)
     ->setUsingCache(true)
+    ->finder(
+        Symfony\CS\Finder\DefaultFinder::create()
+            ->in(__DIR__)
+            ->exclude(array(
+                // directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
+                'src/Symfony/Component/DependencyInjection/Tests/Fixtures',
+                'src/Symfony/Component/Routing/Tests/Fixtures/dumper',
+                // fixture templates
+                'src/Symfony/Component/Templating/Tests/Fixtures/templates',
+                // resource templates
+                'src/Symfony/Bundle/FrameworkBundle/Resources/views/Form',
+            ))
+            // file content autogenerated by `var_export`
+            ->notPath('src/Symfony/Component/Translation/Tests/fixtures/resources.php')
+            // autogenerated xmls
+            ->notPath('src/Symfony/Component/Console/Tests/Fixtures/application_1.xml')
+            ->notPath('src/Symfony/Component/Console/Tests/Fixtures/application_2.xml')
+            // yml
+            ->notPath('src/Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
+            // test template
+            ->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
+    )
 ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
@@ -3,11 +3,11 @@
         $required = false;
     endif; ?>
     <?php echo $view['form']->block($form, 'widget_attributes', array(
-        'required' => $required
+        'required' => $required,
     )) ?>
     <?php if ($multiple): ?> multiple="multiple"<?php endif ?>
 >
-    <?php if (null !== $empty_value): ?><option value=""<?php if ($required and empty($value) && "0" !== $value): ?> selected="selected"<?php endif?>><?php echo $view->escape($view['translator']->trans($empty_value, array(), $translation_domain)) ?></option><?php endif; ?>
+    <?php if (null !== $empty_value): ?><option value=""<?php if ($required and empty($value) && '0' !== $value): ?> selected="selected"<?php endif?>><?php echo $view->escape($view['translator']->trans($empty_value, array(), $translation_domain)) ?></option><?php endif; ?>
     <?php if (count($preferred_choices) > 0): ?>
         <?php echo $view['form']->block($form, 'choice_widget_options', array('choices' => $preferred_choices)) ?>
         <?php if (count($choices) > 0 && null !== $separator): ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : "hidden")) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'hidden')) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/integer_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : "number")) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'number')) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/number_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : "text")) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'text')) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/password_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : "password")) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'password')) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : "text")) ?> %
+<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'text')) ?> %
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/search_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/search_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : "search")) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'search')) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/url_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : "url")) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'url')) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php
@@ -1,6 +1,6 @@
 This template is used for translation message extraction tests
 <?php echo $view['translator']->trans('single-quoted key') ?>
-<?php echo $view['translator']->trans("double-quoted key") ?>
+<?php echo $view['translator']->trans('double-quoted key') ?>
 <?php echo $view['translator']->trans(<<<EOF
 heredoc key
 EOF
@@ -15,11 +15,11 @@
 <?php echo $view['translator']->trans(
     'single-quoted key with whitespace and nonescaped \$\n\' sequences'
 ) ?>
-<?php echo $view['translator']->trans( <<<EOF
+<?php echo $view['translator']->trans(<<<EOF
 heredoc key with whitespace and escaped \$\n sequences
 EOF
 ) ?>
-<?php echo $view['translator']->trans( <<<'EOF'
+<?php echo $view['translator']->trans(<<<'EOF'
 nowdoc key with whitespace and nonescaped \$\n sequences
 EOF
 ) ?>
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php
@@ -26,7 +26,7 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
     /**
      * Defines the position at which the provider is called.
      * Possible values: pre_auth, form, http, and remember_me.
-     * 
+     *
      * @return string
      */
     public function getPosition();
diff --git a/src/Symfony/Component/Console/Tests/Helper/TableHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/TableHelperTest.php
@@ -112,7 +112,7 @@ public function testRenderProvider()
                     array('80-902734-1-6', 'And Then There Were None', 'Agatha Christie'),
                 ),
                 TableHelper::LAYOUT_BORDERLESS,
-                " =============== ========================== ================== \n  ISBN            Title                      Author            \n =============== ========================== ================== \n  99921-58-10-7   Divine Comedy              Dante Alighieri   \n  9971-5-0210-0   A Tale of Two Cities       Charles Dickens   \n  960-425-059-0   The Lord of the Rings      J. R. R. Tolkien  \n  80-902734-1-6   And Then There Were None   Agatha Christie   \n =============== ========================== ================== \n"
+                " =============== ========================== ================== \n  ISBN            Title                      Author            \n =============== ========================== ================== \n  99921-58-10-7   Divine Comedy              Dante Alighieri   \n  9971-5-0210-0   A Tale of Two Cities       Charles Dickens   \n  960-425-059-0   The Lord of the Rings      J. R. R. Tolkien  \n  80-902734-1-6   And Then There Were None   Agatha Christie   \n =============== ========================== ================== \n",
             ),
             array(
                 array('ISBN', 'Title'),
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -761,7 +761,7 @@ private function startClass($class, $baseClass)
 $bagClass
 
 /**
- * $class
+ * $class.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * Container
+ * Container.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 
 /**
- * ProjectServiceContainer
+ * ProjectServiceContainer.
  *
  * This class has been auto-generated
  * by the Symfony Dependency Injection Component.
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
@@ -212,13 +212,13 @@ public function testFilter()
 
         $this->assertFalse($bag->filter('dec', '', false, FILTER_VALIDATE_INT, array(
             'flags' => FILTER_FLAG_ALLOW_HEX,
-            'options' => array('min_range' => 1, 'max_range' => 0xff))
-                ), '->filter() gets a value of parameter as integer between boundaries');
+            'options' => array('min_range' => 1, 'max_range' => 0xff),
+        )), '->filter() gets a value of parameter as integer between boundaries');
 
         $this->assertFalse($bag->filter('hex', '', false, FILTER_VALIDATE_INT, array(
             'flags' => FILTER_FLAG_ALLOW_HEX,
-            'options' => array('min_range' => 1, 'max_range' => 0xff))
-                ), '->filter() gets a value of parameter as integer between boundaries');
+            'options' => array('min_range' => 1, 'max_range' => 0xff),
+        )), '->filter() gets a value of parameter as integer between boundaries');
 
         $this->assertEquals(array('bang'), $bag->filter('array', '', false), '->filter() gets a value of parameter as an array');
     }
diff --git a/src/Symfony/Component/Intl/Tests/Collator/AbstractCollatorTest.php b/src/Symfony/Component/Intl/Tests/Collator/AbstractCollatorTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Intl\Tests\Collator;
 
 use Symfony\Component\Intl\Collator\Collator;
-use Symfony\Component\Intl\Locale;
 
 /**
  * Test case for Collator implementations.
diff --git a/src/Symfony/Component/Intl/Tests/Collator/Verification/CollatorTest.php b/src/Symfony/Component/Intl/Tests/Collator/Verification/CollatorTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Intl\Tests\Collator\Verification;
 
-use Symfony\Component\Intl\Locale;
 use Symfony\Component\Intl\Tests\Collator\AbstractCollatorTest;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Intl\Tests\NumberFormatter;
 
 use Symfony\Component\Intl\Globals\IntlGlobals;
-use Symfony\Component\Intl\Locale;
 use Symfony\Component\Intl\NumberFormatter\NumberFormatter;
 use Symfony\Component\Intl\Util\IntlTestHelper;
 
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -54,7 +54,7 @@ public function dump(array $options = array())
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * {$options['class']}
+ * {$options['class']}.
  *
  * This class has been auto-generated
  * by the Symfony Routing Component.
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher
+ * ProjectUrlMatcher.
  *
  * This class has been auto-generated
  * by the Symfony Routing Component.
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher
+ * ProjectUrlMatcher.
  *
  * This class has been auto-generated
  * by the Symfony Routing Component.
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher
+ * ProjectUrlMatcher.
  *
  * This class has been auto-generated
  * by the Symfony Routing Component.
diff --git a/src/Symfony/Component/Validator/ConstraintValidator.php b/src/Symfony/Component/Validator/ConstraintValidator.php
@@ -24,14 +24,14 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface
      * Whether to format {@link \DateTime} objects as RFC-3339 dates
      * ("Y-m-d H:i:s").
      *
-     * @var integer
+     * @var int
      */
     const PRETTY_DATE = 1;
 
     /**
      * Whether to cast objects with a "__toString()" method to strings.
      *
-     * @var integer
+     * @var int
      */
     const OBJECT_TO_STRING = 2;
 
@@ -81,9 +81,9 @@ protected function formatTypeOf($value)
      * won't know what an "object", "array" or "resource" is and will be
      * confused by the violation message.
      *
-     * @param mixed   $value  The value to format as string
-     * @param integer $format A bitwise combination of the format
-     *                        constants in this class
+     * @param mixed $value  The value to format as string
+     * @param int   $format A bitwise combination of the format
+     *                      constants in this class
      *
      * @return string The string representation of the passed value
      */
@@ -141,9 +141,9 @@ protected function formatValue($value, $format = 0)
      * Each of the values is converted to a string using
      * {@link formatValue()}. The values are then concatenated with commas.
      *
-     * @param array   $values A list of values
-     * @param integer $format A bitwise combination of the format
-     *                        constants in this class
+     * @param array $values A list of values
+     * @param int   $format A bitwise combination of the format
+     *                      constants in this class
      *
      * @return string The string representation of the value list
      *

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : "hidden")) ?>`
	`1`	`+<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'hidden')) ?>`
Original file line number	Diff line number	Diff line change
`@@ -761,7 +761,7 @@ private function startClass($class, $baseClass)`
`761`	`761`	`$bagClass`
`762`	`762`
`763`	`763`	`/**`
`764`		`- * $class`
	`764`	`+ * $class.`
`765`	`765`	`*`
`766`	`766`	`* This class has been auto-generated`
`767`	`767`	`* by the Symfony Dependency Injection Component.`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;`
`10`	`10`
`11`	`11`	`/**`
`12`		`- * Container`
	`12`	`+ * Container.`
`13`	`13`	`*`
`14`	`14`	`* This class has been auto-generated`
`15`	`15`	`* by the Symfony Dependency Injection Component.`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function dump(array $options = array())`
`54`	`54`	`use Symfony\Component\Routing\RequestContext;`
`55`	`55`
`56`	`56`	`/**`
`57`		`- * {$options['class']}`
	`57`	`+ * {$options['class']}.`
`58`	`58`	`*`
`59`	`59`	`* This class has been auto-generated`
`60`	`60`	`* by the Symfony Routing Component.`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Symfony\Component\Routing\RequestContext;`
`6`	`6`
`7`	`7`	`/**`
`8`		`- * ProjectUrlMatcher`
	`8`	`+ * ProjectUrlMatcher.`
`9`	`9`	`*`
`10`	`10`	`* This class has been auto-generated`
`11`	`11`	`* by the Symfony Routing Component.`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,14 @@ abstract class ConstraintValidator implements ConstraintValidatorInterface`
`24`	`24`	`* Whether to format {@link \DateTime} objects as RFC-3339 dates`
`25`	`25`	`* ("Y-m-d H:i:s").`
`26`	`26`	`*`
`27`		`- * @var integer`
	`27`	`+ * @var int`
`28`	`28`	`*/`
`29`	`29`	`const PRETTY_DATE = 1;`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* Whether to cast objects with a "__toString()" method to strings.`
`33`	`33`	`*`
`34`		`- * @var integer`
	`34`	`+ * @var int`
`35`	`35`	`*/`
`36`	`36`	`const OBJECT_TO_STRING = 2;`
`37`	`37`
`@@ -81,9 +81,9 @@ protected function formatTypeOf($value)`
`81`	`81`	`* won't know what an "object", "array" or "resource" is and will be`
`82`	`82`	`* confused by the violation message.`
`83`	`83`	`*`
`84`		`- * @param mixed $value The value to format as string`
`85`		`- * @param integer $format A bitwise combination of the format`
`86`		`- * constants in this class`
	`84`	`+ * @param mixed $value The value to format as string`
	`85`	`+ * @param int $format A bitwise combination of the format`
	`86`	`+ * constants in this class`
`87`	`87`	`*`
`88`	`88`	`* @return string The string representation of the passed value`
`89`	`89`	`*/`
`@@ -141,9 +141,9 @@ protected function formatValue($value, $format = 0)`
`141`	`141`	`* Each of the values is converted to a string using`
`142`	`142`	`* {@link formatValue()}. The values are then concatenated with commas.`
`143`	`143`	`*`
`144`		`- * @param array $values A list of values`
`145`		`- * @param integer $format A bitwise combination of the format`
`146`		`- * constants in this class`
	`144`	`+ * @param array $values A list of values`
	`145`	`+ * @param int $format A bitwise combination of the format`
	`146`	`+ * constants in this class`
`147`	`147`	`*`
`148`	`148`	`* @return string The string representation of the value list`
`149`	`149`	`*`