Skip to content

Commit 56996fa

Browse files
Merge branch '2.7' into 2.8
* 2.7: [travis] timeout the sigchild tests at 60s CS: Single line comments should use double slashes (//) and not hash (#). Do not use HttpKernel Extension when not needed for 2.7 Do not use HttpKernel Extension when not needed bumped Symfony version to 2.7.9 updated VERSION for 2.7.8 updated CHANGELOG for 2.7.8 bumped Symfony version to 2.3.37 updated VERSION for 2.3.36 update CONTRIBUTORS for 2.3.36 updated CHANGELOG for 2.3.36 Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"" Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)" use nowdoc instead of heredoc Conflicts: src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Security/Acl/Dbal/AclProvider.php src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
2 parents a5d5d25 + 340b7a3 commit 56996fa

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Definition/Dumper/YamlReferenceDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function testDumper()
2828

2929
private function getConfigurationAsString()
3030
{
31-
return <<<EOL
31+
return <<<'EOL'
3232
acme_root:
3333
boolean: true
3434
scalar_empty: ~

0 commit comments

Comments
 (0)