Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 2d0634d

Browse filesBrowse files
committed
Merge branch '2.7' into 2.8
* 2.7: fixed CS fixed CS fixer config
2 parents a784d5c + b6507c8 commit 2d0634d
Copy full SHA for 2d0634d

File tree

Expand file treeCollapse file tree

3 files changed

+14
-14
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+14
-14
lines changed

‎.php_cs.dist

Copy file name to clipboardExpand all lines: .php_cs.dist
+13-12Lines changed: 13 additions & 12 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()
1516
->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
;

‎src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/CheckCircularReferencesPass.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ private function checkOutEdges(array $edges)
6060
$id = $node->getId();
6161

6262
if (empty($this->checkedNodes[$id])) {
63-
6463
// don't check circular dependencies for lazy services
6564
if (!$node->getValue() || !$node->getValue()->isLazy()) {
6665
$searchKey = array_search($id, $this->currentPath);

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ private function htmlEncode($s)
298298
{
299299
$html = '';
300300

301-
$dumper = new HtmlDumper(function ($line) use (&$html) {$html .= $line;}, $this->charset);
301+
$dumper = new HtmlDumper(function ($line) use (&$html) { $html .= $line; }, $this->charset);
302302
$dumper->setDumpHeader('');
303303
$dumper->setDumpBoundaries('', '');
304304

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.