10000 Merge branch '2.8' into 3.1 · symfony/symfony@20bdaa6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 20bdaa6

Browse files
fabpotfabpot
committed
Merge branch '2.8' into 3.1
* 2.8: (26 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 [TwigBundle] do not lose already set method calls #20411 fix Yaml parsing for very long quoted strings CS: apply is_null DX: remove invalid inheritdoc bumped Symfony version to 2.8.17 updated VERSION for 2.8.16 ...
2 parents 0dd6a90 + 4a46c6f commit 20bdaa6

File tree

45 files changed

+194
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+194
-132
lines changed

‎.php_cs.dist

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,34 @@ return PhpCsFixer\Config::create()
88
'no_unreachable_default_argument_value' => false,
99
'braces' => array('allow_single_line_closure' => true),
1010
'heredoc_to_nowdoc' => false,
11+
'phpdoc_annotation_without_dot' => false,
1112
))
1213
->setRiskyAllowed(true)
1314
->setFinder(
1415
PhpCsFixer\Finder::create()
15-
->in(__DIR__)
16+
->in(__DIR__.'/src')
1617
->exclude(array(
1718
// directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
18-
'src/Symfony/Component/DependencyInjection/Tests/Fixtures',
19-
'src/Symfony/Component/Routing/Tests/Fixtures/dumper',
19+
'Symfony/Component/DependencyInjection/Tests/Fixtures',
20+
'Symfony/Component/Routing/Tests/Fixtures/dumper',
2021
// fixture templates
21-
'src/Symfony/Component/Templating/Tests/Fixtures/templates',
22-
'src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom',
22+
'Symfony/Component/Templating/Tests/Fixtures/templates',
23+
'Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom',
2324
// generated fixtures
24-
'src/Symfony/Component/VarDumper/Tests/Fixtures',
25+
'Symfony/Component/VarDumper/Tests/Fixtures',
2526
// resource templates
26-
'src/Symfony/Bundle/FrameworkBundle/Resources/views/Form',
27+
'Symfony/Bundle/FrameworkBundle/Resources/views/Form',
2728
))
2829
// file content autogenerated by `var_export`
29-
->notPath('src/Symfony/Component/Translation/Tests/fixtures/resources.php')
30+
->notPath('Symfony/Component/Translation/Tests/fixtures/resources.php')
3031
// autogenerated xmls
31-
->notPath('src/Symfony/Component/Console/Tests/Fixtures/application_1.xml')
32-
->notPath('src/Symfony/Component/Console/Tests/Fixtures/application_2.xml')
32+
->notPath('Symfony/Component/Console/Tests/Fixtures/application_1.xml')
33+
->notPath('Symfony/Component/Console/Tests/Fixtures/application_2.xml')
3334
// yml
34-
->notPath('src/Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
35+
->notPath('Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
3536
// test template
36-
->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
37+
->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
3738
// explicit heredoc test
38-
->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
39+
->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
3940
)
4041
;

0 commit comments

Comments
 (0)
0