Merge branch '3.1' into 3.2

* 3.1: (31 commits)
  fixed CS
  fixed CS
  fixed CS fixer config
  fixed typo
  Revert "fixed typo"
  fixed typo
  fixed CS
  Avoid setting request attributes from signature arguments in AnnotationClassLoader
  [DependencyInjection] Add some missing typehints in YamlFileLoader
  [DependencyInjection] minor: Fix a DocBlock
  [HttpKernel] Give higher priority to adding request formats
  [PropertyInfo] Don't try to access a property thru a static method
  [PropertyInfo] Exclude static methods form properties guessing
  [FrameworkBundle] Fix third level headers for MarkdownDescriptor
  [Ldap] Using Ldap stored username instead of form submitted one
  [Ldap] load users with the good username case
  [DoctrineBridge] Fixed invalid unique value as composite key
  [Doctrine Bridge] fix UniqueEntityValidator for composite object primary keys
  [TwigBundle] do not lose already set method calls
  symfony#20411 fix Yaml parsing for very long quoted strings
  ...

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__)
+            ->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')
     )
 ;