Merge branch '2.7' into 2.8

* 2.7:
  fixed CS
  fixed CS fixer config

Author: fabpot

.php_cs.dist

@@ -8,33 +8,34 @@ return PhpCsFixer\Config::create()
         'no_unreachable_default_argument_value' => false,
         'braces' => array('allow_single_line_closure' => true),
         'heredoc_to_nowdoc' => false,
+        'phpdoc_annotation_without_dot' => false,
     ))
     ->setRiskyAllowed(true)
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->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',
-                'src/Symfony/Component/Routing/Tests/Fixtures/dumper',
+                'Symfony/Component/DependencyInjection/Tests/Fixtures',
+                'Symfony/Component/Routing/Tests/Fixtures/dumper',
                 // fixture templates
-                'src/Symfony/Component/Templating/Tests/Fixtures/templates',
-                'src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom',
+                'Symfony/Component/Templating/Tests/Fixtures/templates',
+                'Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom',
                 // generated fixtures
-                'src/Symfony/Component/VarDumper/Tests/Fixtures',
+                'Symfony/Component/VarDumper/Tests/Fixtures',
                 // resource templates
-                'src/Symfony/Bundle/FrameworkBundle/Resources/views/Form',
+                'Symfony/Bundle/FrameworkBundle/Resources/views/Form',
             ))
             // file content autogenerated by `var_export`
-            ->notPath('src/Symfony/Component/Translation/Tests/fixtures/resources.php')
+            ->notPath('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')
+            ->notPath('Symfony/Component/Console/Tests/Fixtures/application_1.xml')
+            ->notPath('Symfony/Component/Console/Tests/Fixtures/application_2.xml')
             // yml
-            ->notPath('src/Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
+            ->notPath('Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
             // test template
-            ->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
+            ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
             // explicit heredoc test
-            ->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
+            ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
     )
 ;

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);

src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php

@@ -298,7 +298,7 @@ private function htmlEncode($s)
     {
         $html = '';
 
-        $dumper = new HtmlDumper(function ($line) use (&$html) {$html .= $line;}, $this->charset);
+        $dumper = new HtmlDumper(function ($line) use (&$html) { $html .= $line; }, $this->charset);
         $dumper->setDumpHeader('');
         $dumper->setDumpBoundaries('', '');