minor symfony#21363 CS fixes (fabpot)

fabpot · fabpot · commit 2b317c1de171 · 2017-01-21T08:34:55.000-08:00
This PR was squashed before being merged into the 2.7 branch (closes symfony#21363). Discussion ---------- CS fixes | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 6830d9f fixed typo 5176f97 fixed CS
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -12,7 +12,7 @@ return PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
     ->setFinder(
         PhpCsFixer\Finder::create()
-            ->in(__DIR__)
+            ->in(__DIR__.'/src')
             ->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',
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -109,15 +109,15 @@ public static function register($mode = false)
                     return "\x1B[{$color}m{$str}\x1B[0m";
                 };
             } else {
-                $colorize = function ($str) {return $str;};
+                $colorize = function ($str) { return $str; };
             }
             register_shutdown_function(function () use ($getMode, &$deprecations, $deprecationHandler, $colorize) {
                 $mode = $getMode();
                 $currErrorHandler = set_error_handler('var_dump');
                 restore_error_handler();
 
                 if ('weak' === $mode) {
-                    $colorize = function ($str) {return $str;};
+                    $colorize = function ($str) { return $str; };
                 }
                 if ($currErrorHandler !== $deprecationHandler) {
                     echo "\n", $colorize('THE ERROR HANDLER HAS CHANGED!', true), "\n";
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
@@ -31,14 +31,14 @@ class FooTestCase
     public function testLegacyFoo()
     {
         @trigger_error('silenced foo deprecation', E_USER_DEPRECATED);
-        trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
-        trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
+        @trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
+        @trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
     }
 
     public function testNonLegacyBar()
     {
         @trigger_error('silenced bar deprecation', E_USER_DEPRECATED);
-        trigger_error('unsilenced bar deprecation', E_USER_DEPRECATED);
+        @trigger_error('unsilenced bar deprecation', E_USER_DEPRECATED);
     }
 }
 
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt
@@ -23,7 +23,7 @@ class FooTestCase
     public function testLegacyFoo()
     {
         @trigger_error('silenced foo deprecation', E_USER_DEPRECATED);
-        trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
+        @trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
     }
 }
 
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
@@ -125,29 +125,20 @@ public function __unset($name)
         unset($this->valueHolder5157dd96e88c0->$name);
     }
 
-    /**
-     *
-     */
     public function __clone()
     {
         $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__clone', array());
 
         $this->valueHolder5157dd96e88c0 = clone $this->valueHolder5157dd96e88c0;
     }
 
-    /**
-     *
-     */
     public function __sleep()
     {
         $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__sleep', array());
 
         return array('valueHolder5157dd96e88c0');
     }
 
-    /**
-     *
-     */
     public function __wakeup()
     {
     }
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_with_hints.php
@@ -120,29 +120,20 @@ public function __unset($name)
         unset($this->valueHolder5157dd96e88c0->$name);
     }
 
-    /**
-     *
-     */
     public function __clone()
     {
         $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__clone', array());
 
         $this->valueHolder5157dd96e88c0 = clone $this->valueHolder5157dd96e88c0;
     }
 
-    /**
-     *
-     */
     public function __sleep()
     {
         $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__sleep', array());
 
         return array('valueHolder5157dd96e88c0');
     }
 
-    /**
-     *
-     */
     public function __wakeup()
     {
     }
@@ -166,15 +157,15 @@ public function getProxyInitializer()
     /**
      * {@inheritdoc}
      */
-    public function initializeProxy() : bool
+    public function initializeProxy(): bool
     {
         return $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, 'initializeProxy', array());
     }
 
     /**
      * {@inheritdoc}
      */
-    public function isProxyInitialized() : bool
+    public function isProxyInitialized(): bool
     {
         return null !== $this->valueHolder5157dd96e88c0;
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
@@ -32,7 +32,7 @@ public function testDumpTag($template, $debug, $expectedOutput, $expectedDumped)
 
         $dumped = null;
         $exception = null;
-        $prevDumper = VarDumper::setHandler(function ($var) use (&$dumped) {$dumped = $var;});
+        $prevDumper = VarDumper::setHandler(function ($var) use (&$dumped) { $dumped = $var; });
 
         try {
             $this->assertEquals($expectedOutput, $twig->render('template'));
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
@@ -87,17 +87,17 @@ public function getTransTests()
 
             // transchoice
             array('{% transchoice count from "messages" %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
-                'There is no apples', array('count' => 0)),
+                'There is no apples', array('count' => 0), ),
             array('{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
-                'There is 5 apples', array('count' => 5)),
+                'There is 5 apples', array('count' => 5), ),
             array('{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
-                'There is 5 apples (Symfony)', array('count' => 5, 'name' => 'Symfony')),
+                'There is 5 apples (Symfony)', array('count' => 5, 'name' => 'Symfony'), ),
             array('{% transchoice count with { \'%name%\': \'Symfony\' } %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
-                'There is 5 apples (Symfony)', array('count' => 5)),
+                'There is 5 apples (Symfony)', array('count' => 5), ),
             array('{% transchoice count into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
-                'There is no apples', array('count' => 0)),
+                'There is no apples', array('count' => 0), ),
             array('{% transchoice 5 into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
-                'There is 5 apples'),
+                'There is 5 apples', ),
 
             // trans filter
             array('{{ "Hello"|trans }}', 'Hello'),
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'widget_attributes') ?>
+<?php echo $view['form']->block($form, 'widget_attributes');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/button_widget.html.php
@@ -1,4 +1,6 @@
-<?php if (!$label) { $label = isset($label_format)
+<?php if (!$label) {
+    $label = isset($label_format)
     ? strtr($label_format, array('%name%' => $name, '%id%' => $id))
-    : $view['form']->humanize($name); } ?>
+    : $view['form']->humanize($name);
+} ?>
 <button type="<?php echo isset($type) ? $view->escape($type) : 'button' ?>" <?php echo $view['form']->block($form, 'button_attributes') ?>><?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></button>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_options.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_options.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'choice_widget_options') ?>
+<?php echo $view['form']->block($form, 'choice_widget_options');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_options.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_options.html.php
@@ -1,6 +1,6 @@
 <?php use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
 
-$translatorHelper = $view['translator']; // outside of the loop for performance reasons! ?>
+$translatorHelper = $view['translator']; // outside of the loop for performance reasons!?>
 <?php $formHelper = $view['form']; ?>
 <?php foreach ($choices as $group_label => $choice): ?>
     <?php if (is_array($choice) || $choice instanceof ChoiceGroupView): ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/container_attributes.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/container_attributes.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'widget_container_attributes') ?>
+<?php echo $view['form']->block($form, 'widget_container_attributes');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/email_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'email')) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'email'));
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_label.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_label.html.php
@@ -1,8 +1,16 @@
 <?php if (false !== $label): ?>
-<?php if ($required) { $label_attr['class'] = trim((isset($label_attr['class']) ? $label_attr['class'] : '').' required'); } ?>
-<?php if (!$compound) { $label_attr['for'] = $id; } ?>
-<?php if (!$label) { $label = isset($label_format)
+<?php if ($required) {
+    $label_attr['class'] = trim((isset($label_attr['class']) ? $label_attr['class'] : '').' required');
+} ?>
+<?php if (!$compound) {
+    $label_attr['for'] = $id;
+} ?>
+<?php if (!$label) {
+    $label = isset($label_format)
     ? strtr($label_format, array('%name%' => $name, '%id%' => $id))
-    : $view['form']->humanize($name); } ?>
-<label <?php foreach ($label_attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, array(), $translation_domain) : $label) ?></label>
+    : $view['form']->humanize($name);
+} ?>
+<label <?php foreach ($label_attr as $k => $v) {
+    printf('%s="%s" ', $view->escape($k), $view->escape($v));
+} ?>><?php echo $view->escape(false !== $translation_domain ? $view['translator']->trans($label, array(), $translation_domain) : $label) ?></label>
 <?php endif ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_start.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_start.html.php
@@ -1,6 +1,8 @@
 <?php $method = strtoupper($method) ?>
 <?php $form_method = $method === 'GET' || $method === 'POST' ? $method : 'POST' ?>
-<form name="<?php echo $name ?>" method="<?php echo strtolower($form_method) ?>" action="<?php echo $action ?>"<?php foreach ($attr as $k => $v) { printf(' %s="%s"', $view->escape($k), $view->escape($v)); } ?><?php if ($multipart): ?> enctype="multipart/form-data"<?php endif ?>>
+<form name="<?php echo $name ?>" method="<?php echo strtolower($form_method) ?>" action="<?php echo $action ?>"<?php foreach ($attr as $k => $v) {
+    printf(' %s="%s"', $view->escape($k), $view->escape($v));
+} ?><?php if ($multipart): ?> enctype="multipart/form-data"<?php endif ?>>
 <?php if ($form_method !== $method): ?>
     <input type="hidden" name="_method" value="<?php echo $method ?>" />
 <?php endif ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/hidden_row.html.php
@@ -1 +1 @@
-<?php echo $view['form']->widget($form) ?>
+<?php echo $view['form']->widget($form);
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/money_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_widget.html.php
@@ -1 +1 @@
-<?php echo str_replace('{{ widget }}', $view['form']->block($form, 'form_widget_simple'), $money_pattern) ?>
+<?php echo str_replace('{{ widget }}', $view['form']->block($form, 'form_widget_simple'), $money_pattern);
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/repeated_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_rows') ?>
+<?php echo $view['form']->block($form, 'form_rows');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/reset_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/reset_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'reset')) ?>
+<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'reset'));
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/submit_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/submit_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'submit')) ?>
+<?php echo $view['form']->block($form, 'button_widget', array('type' => isset($type) ? $type : 'submit'));
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/Templating/Helper/Resources/Custom/_name_c_entry_label.html.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_c_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 name label: <?php echo $view->escape($view['translator']->trans($label, array(), $translation_domain)) ?></label>
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
@@ -390,11 +390,11 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
 
         $providerNodeBuilder
             ->validate()
-                ->ifTrue(function ($v) {return count($v) > 1;})
+                ->ifTrue(function ($v) { return count($v) > 1; })
                 ->thenInvalid('You cannot set multiple provider types for the same provider')
             ->end()
             ->validate()
-                ->ifTrue(function ($v) {return count($v) === 0;})
+                ->ifTrue(function ($v) { return count($v) === 0; })
                 ->thenInvalid('You must set a provider definition for the provider.')
             ->end()
         ;
diff --git a/src/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithStrictTypes.php b/src/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced/WithStrictTypes.php
@@ -4,7 +4,7 @@
  * foo
  */
 
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace Namespaced;
 
diff --git a/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/src/Symfony/Component/Debug/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
@@ -179,7 +179,7 @@ private function convertFileToClass($path, $file, $prefix)
         );
 
         if ($prefix) {
-            $candidates = array_filter($candidates, function ($candidate) use ($prefix) {return 0 === strpos($candidate, $prefix);});
+            $candidates = array_filter($candidates, function ($candidate) use ($prefix) { return 0 === strpos($candidate, $prefix); });
         }
 
         // We cannot use the autoloader here as most of them use require; but if the class
diff --git a/src/Symfony/Component/Debug/Resources/ext/tests/001.phpt b/src/Symfony/Component/Debug/Resources/ext/tests/001.phpt
@@ -1,7 +1,9 @@
 --TEST--
 Test symfony_zval_info API
 --SKIPIF--
-<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
+<?php if (!extension_loaded('symfony_debug')) {
+    print 'skip';
+} ?>
 --FILE--
 <?php
 
diff --git a/src/Symfony/Component/Debug/Resources/ext/tests/002.phpt b/src/Symfony/Component/Debug/Resources/ext/tests/002.phpt
@@ -1,7 +1,9 @@
 --TEST--
 Test symfony_debug_backtrace in case of fatal error
 --SKIPIF--
-<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
+<?php if (!extension_loaded('symfony_debug')) {
+    print 'skip';
+} ?>
 --FILE--
 <?php
 
diff --git a/src/Symfony/Component/Debug/Resources/ext/tests/002_1.phpt b/src/Symfony/Component/Debug/Resources/ext/tests/002_1.phpt
@@ -1,7 +1,9 @@
 --TEST--
 Test symfony_debug_backtrace in case of non fatal error
 --SKIPIF--
-<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
+<?php if (!extension_loaded('symfony_debug')) {
+    print 'skip';
+} ?>
 --FILE--
 <?php
 
diff --git a/src/Symfony/Component/Debug/Resources/ext/tests/003.phpt b/src/Symfony/Component/Debug/Resources/ext/tests/003.phpt
@@ -1,7 +1,9 @@
 --TEST--
 Test ErrorHandler in case of fatal error
 --SKIPIF--
-<?php if (!extension_loaded('symfony_debug')) print 'skip'; ?>
+<?php if (!extension_loaded('symfony_debug')) {
+    print 'skip';
+} ?>
 --FILE--
 <?php
 
diff --git a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
@@ -176,7 +176,7 @@ public function testDeprecatedSuper($class, $super, $type)
     {
         set_error_handler(function () { return false; });
         $e = error_reporting(0);
-        trigger_error('', E_USER_DEPRECATED);
+        @trigger_error('', E_USER_DEPRECATED);
 
         class_exists('Test\\'.__NAMESPACE__.'\\'.$class, true);
 
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
@@ -60,7 +60,6 @@ private function checkOutEdges(array $edges)
             $id = $node->getId();
 
             if (empty($this->checkedNodes[$id])) {
-
                 // don't check circular dependencies for lazy services
                 if (!$node->getValue() || !$node->getValue()->isLazy()) {
                     $searchKey = array_search($id, $this->currentPath);
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -219,7 +219,7 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER)
      */
     public function has($id)
     {
-        for ($i = 2;;) {
+        for ($i = 2; ;) {
             if ('service_container' === $id
                 || isset($this->aliases[$id])
                 || isset($this->services[$id])
@@ -258,7 +258,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
         // available services. Service IDs are case insensitive, however since
         // this method can be called thousands of times during a request, avoid
         // calling strtolower() unless necessary.
-        for ($i = 2;;) {
+        for ($i = 2; ;) {
             if ('service_container' === $id) {
                 return $this;
             }
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -158,7 +158,7 @@ public function setDecoratedService($id, $renamedId = null)
     }
 
     /**
-     * Gets the service that decorates this service.
+     * Gets the service that this service is decorating.
      *
      * @return null|array An array composed of the decorated service id and the new id for it, null if no service is decorated
      */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container14.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container14.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-/**
+/*
  * This file is included in Tests\Dumper\GraphvizDumperTest::testDumpWithFrozenCustomClassContainer
  * and Tests\Dumper\XmlDumperTest::testCompiledContainerCanBeDumped.
  */
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Symfony\Component\DependencyInjection\Dump;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
diff --git a/src/Symfony/Component/Process/Pipes/AbstractPipes.php b/src/Symfony/Component/Process/Pipes/AbstractPipes.php
diff --git a/src/Symfony/Component/Process/Pipes/WindowsPipes.php b/src/Symfony/Component/Process/Pipes/WindowsPipes.php
diff --git a/src/Symfony/Component/Process/Tests/SignalListener.php b/src/Symfony/Component/Process/Tests/SignalListener.php
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php
diff --git a/src/Symfony/Component/Templating/Tests/Fixtures/templates/foo.php b/src/Symfony/Component/Templating/Tests/Fixtures/templates/foo.php
diff --git a/src/Symfony/Component/Translation/Tests/fixtures/resources.php b/src/Symfony/Component/Translation/Tests/fixtures/resources.php
diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
diff --git a/src/Symfony/Component/Yaml/Escaper.php b/src/Symfony/Component/Yaml/Escaper.php

Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,14 @@ class FooTestCase`
`31`	`31`	`public function testLegacyFoo()`
`32`	`32`	`{`
`33`	`33`	`@trigger_error('silenced foo deprecation', E_USER_DEPRECATED);`
`34`		`- trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);`
`35`		`- trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);`
	`34`	`+ @trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);`
	`35`	`+ @trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public function testNonLegacyBar()`
`39`	`39`	`{`
`40`	`40`	`@trigger_error('silenced bar deprecation', E_USER_DEPRECATED);`
`41`		`- trigger_error('unsilenced bar deprecation', E_USER_DEPRECATED);`
	`41`	`+ @trigger_error('unsilenced bar deprecation', E_USER_DEPRECATED);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class FooTestCase`
`23`	`23`	`public function testLegacyFoo()`
`24`	`24`	`{`
`25`	`25`	`@trigger_error('silenced foo deprecation', E_USER_DEPRECATED);`
`26`		`- trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);`
	`26`	`+ @trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -125,29 +125,20 @@ public function __unset($name)`
`125`	`125`	`unset($this->valueHolder5157dd96e88c0->$name);`
`126`	`126`	`}`
`127`	`127`
`128`		`- /**`
`129`		`- *`
`130`		`- */`
`131`	`128`	`public function __clone()`
`132`	`129`	`{`
`133`	`130`	`$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__clone', array());`
`134`	`131`
`135`	`132`	`$this->valueHolder5157dd96e88c0 = clone $this->valueHolder5157dd96e88c0;`
`136`	`133`	`}`
`137`	`134`
`138`		`- /**`
`139`		`- *`
`140`		`- */`
`141`	`135`	`public function __sleep()`
`142`	`136`	`{`
`143`	`137`	`$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__sleep', array());`
`144`	`138`
`145`	`139`	`return array('valueHolder5157dd96e88c0');`
`146`	`140`	`}`
`147`	`141`
`148`		`- /**`
`149`		`- *`
`150`		`- */`
`151`	`142`	`public function __wakeup()`
`152`	`143`	`{`
`153`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,29 +120,20 @@ public function __unset($name)`
`120`	`120`	`unset($this->valueHolder5157dd96e88c0->$name);`
`121`	`121`	`}`
`122`	`122`
`123`		`- /**`
`124`		`- *`
`125`		`- */`
`126`	`123`	`public function __clone()`
`127`	`124`	`{`
`128`	`125`	`$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__clone', array());`
`129`	`126`
`130`	`127`	`$this->valueHolder5157dd96e88c0 = clone $this->valueHolder5157dd96e88c0;`
`131`	`128`	`}`
`132`	`129`
`133`		`- /**`
`134`		`- *`
`135`		`- */`
`136`	`130`	`public function __sleep()`
`137`	`131`	`{`
`138`	`132`	`$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__sleep', array());`
`139`	`133`
`140`	`134`	`return array('valueHolder5157dd96e88c0');`
`141`	`135`	`}`
`142`	`136`
`143`		`- /**`
`144`		`- *`
`145`		`- */`
`146`	`137`	`public function __wakeup()`
`147`	`138`	`{`
`148`	`139`	`}`
`@@ -166,15 +157,15 @@ public function getProxyInitializer()`
`166`	`157`	`/**`
`167`	`158`	`* {@inheritdoc}`
`168`	`159`	`*/`
`169`		`- public function initializeProxy() : bool`
	`160`	`+ public function initializeProxy(): bool`
`170`	`161`	`{`
`171`	`162`	`return $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, 'initializeProxy', array());`
`172`	`163`	`}`
`173`	`164`
`174`	`165`	`/**`
`175`	`166`	`* {@inheritdoc}`
`176`	`167`	`*/`
`177`		`- public function isProxyInitialized() : bool`
	`168`	`+ public function isProxyInitialized(): bool`
`178`	`169`	`{`
`179`	`170`	`return null !== $this->valueHolder5157dd96e88c0;`
`180`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<?php echo $view['form']->block($form, 'widget_attributes') ?>`
	`1`	`+<?php echo $view['form']->block($form, 'widget_attributes');`