Skip to content

Commit cee3fdd

Browse files
nicolas-grekasnicolas-grekas
committed
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 ac84cbb + 50b75b6 commit cee3fdd

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎Tests/DumperTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function testSetIndentation()
5454
{
5555
$this->dumper->setIndentation(7);
5656

57-
$expected = <<<EOF
57+
$expected = <<<'EOF'
5858
'': bar
5959
foo: '#bar'
6060
'foo''bar': { }
@@ -103,13 +103,13 @@ public function testSpecifications()
103103

104104
public function testInlineLevel()
105105
{
106-
$expected = <<<EOF
106+
$expected = <<<'EOF'
107107
{ '': bar, foo: '#bar', 'foo''bar': { }, bar: [1, foo], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
108108
EOF;
109109
$this->assertEquals($expected, $this->dumper->dump($this->array, -10), '->dump() takes an inline level argument');
110110
$this->assertEquals($expected, $this->dumper->dump($this->array, 0), '->dump() takes an inline level argument');
111111

112-
$expected = <<<EOF
112+
$expected = <<<'EOF'
113113
'': bar
114114
foo: '#bar'
115115
'foo''bar': { }
@@ -119,7 +119,7 @@ public function testInlineLevel()
119119
EOF;
120120
$this->assertEquals($expected, $this->dumper->dump($this->array, 1), '->dump() takes an inline level argument');
121121

122-
$expected = <<<EOF
122+
$expected = <<<'EOF'
123123
'': bar
124124
foo: '#bar'
125125
'foo''bar': { }
@@ -134,7 +134,7 @@ public function testInlineLevel()
134134
EOF;
135135
$this->assertEquals($expected, $this->dumper->dump($this->array, 2), '->dump() takes an inline level argument');
136136

137-
$expected = <<<EOF
137+
$expected = <<<'EOF'
138138
'': bar
139139
foo: '#bar'
140140
'foo''bar': { }
@@ -153,7 +153,7 @@ public function testInlineLevel()
153153
EOF;
154154
$this->assertEquals($expected, $this->dumper->dump($this->array, 3), '->dump() takes an inline level argument');
155155

156-
$expected = <<<EOF
156+
$expected = <<<'EOF'
157157
'': bar
158158
foo: '#bar'
159159
'foo''bar': { }

‎Tests/ParserTest.php

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function testTabsInYaml()
9090

9191
public function testEndOfTheDocumentMarker()
9292
{
93-
$yaml = <<<EOF
93+
$yaml = <<<'EOF'
9494
--- %YAML:1.0
9595
foo
9696
...
@@ -495,7 +495,7 @@ public function testNonUtf8Exception()
495495
*/
496496
public function testUnindentedCollectionException()
497497
{
498-
$yaml = <<<EOF
498+
$yaml = <<<'EOF'
499499
500500
collection:
501501
-item1
@@ -512,7 +512,7 @@ public function testUnindentedCollectionException()
512512
*/
513513
public function testShortcutKeyUnindentedCollectionException()
514514
{
515-
$yaml = <<<EOF
515+
$yaml = <<<'EOF'
516516
517517
collection:
518518
- key: foo
@@ -529,7 +529,7 @@ public function testShortcutKeyUnindentedCollectionException()
529529
*/
530530
public function testMultipleDocumentsNotSupportedException()
531531
{
532-
Yaml::parse(<<<EOL
532+
Yaml::parse(<<<'EOL'
533533
# Ranking of 1998 home runs
534534
---
535535
- Mark McGwire
@@ -549,7 +549,7 @@ public function testMultipleDocumentsNotSupportedException()
549549
*/
550550
public function testSequenceInAMapping()
551551
{
552-
Yaml::parse(<<<EOF
552+
Yaml::parse(<<<'EOF'
553553
yaml:
554554
hash: me
555555
- array stuff
@@ -562,7 +562,7 @@ public function testSequenceInAMapping()
562562
*/
563563
public function testMappingInASequence()
564564
{
565-
Yaml::parse(<<<EOF
565+
Yaml::parse(<<<'EOF'
566566
yaml:
567567
- array stuff
568568
hash: me
@@ -629,7 +629,7 @@ public function testMappingDuplicateKeyFlow()
629629

630630
public function testEmptyValue()
631631
{
632-
$input = <<<EOF
632+
$input = <<<'EOF'
633633
hash:
634634
EOF;
635635

@@ -647,7 +647,7 @@ public function testCommentAtTheRootIndent()
647647
'class' => 'Bar',
648648
),
649649
),
650-
), Yaml::parse(<<<EOF
650+
), Yaml::parse(<<<'EOF'
651651
# comment 1
652652
services:
653653
# comment 2
@@ -664,7 +664,7 @@ class: Bar
664664

665665
public function testStringBlockWithComments()
666666
{
667-
$this->assertEquals(array('content' => <<<EOT
667+
$this->assertEquals(array('content' => <<<'EOT'
668668
# comment 1
669669
header
670670
@@ -675,7 +675,7 @@ public function testStringBlockWithComments()
675675
676676
footer # comment3
677677
EOT
678-
), Yaml::parse(<<<EOF
678+
), Yaml::parse(<<<'EOF'
679679
content: |
680680
# comment 1
681681
header
@@ -692,7 +692,7 @@ public function testStringBlockWithComments()
692692

693693
public function testFoldedStringBlockWithComments()
694694
{
695-
$this->assertEquals(array(array('content' => <<<EOT
695+
$this->assertEquals(array(array('content' => <<<'EOT'
696696
# comment 1
697697
header
698698
@@ -703,7 +703,7 @@ public function testFoldedStringBlockWithComments()
703703
704704
footer # comment3
705705
EOT
706-
)), Yaml::parse(<<<EOF
706+
)), Yaml::parse(<<<'EOF'
707707
-
708708
content: |
709709
# comment 1
@@ -723,7 +723,7 @@ public function testNestedFoldedStringBlockWithComments()
723723
{
724724
$this->assertEquals(array(array(
725725
'title' => 'some title',
726-
'content' => <<<EOT
726+
'content' => <<<'EOT'
727727
# comment 1
728728
header
729729
@@ -734,7 +734,7 @@ public function testNestedFoldedStringBlockWithComments()
734734
735735
footer # comment3
736736
EOT
737-
)), Yaml::parse(<<<EOF
737+
)), Yaml::parse(<<<'EOF'
738738
-
739739
title: some title
740740
content: |
@@ -763,7 +763,7 @@ public function testReferenceResolvingInInlineStrings()
763763
'map' => array('key' => 'var-value'),
764764
'list_in_map' => array('key' => array('var-value')),
765765
'map_in_map' => array('foo' => array('bar' => 'var-value')),
766-
), Yaml::parse(<<<EOF
766+
), Yaml::parse(<<<'EOF'
767767
var: &var var-value
768768
scalar: *var
769769
list: [ *var ]
@@ -779,7 +779,7 @@ public function testReferenceResolvingInInlineStrings()
779779

780780
public function testYamlDirective()
781781
{
782-
$yaml = <<<EOF
782+
$yaml = <<<'EOF'
783783
%YAML 1.2
784784
---
785785
foo: 1
@@ -790,7 +790,7 @@ public function testYamlDirective()
790790

791791
public function testFloatKeys()
792792
{
793-
$yaml = <<<EOF
793+
$yaml = <<<'EOF'
794794
foo:
795795
1.2: "bar"
796796
1.3: "baz"
@@ -851,7 +851,7 @@ public function testCommentLikeStringsAreNotStrippedInBlockScalars($yaml, $expec
851851

852852
public function getCommentLikeStringInScalarBlockData()
853853
{
854-
$yaml1 = <<<EOT
854+
$yaml1 = <<<'EOT'
855855
pages:
856856
-
857857
title: some title
@@ -870,7 +870,7 @@ public function getCommentLikeStringInScalarBlockData()
870870
'pages' => array(
871871
array(
872872
'title' => 'some title',
873-
'content' => <<<EOT
873+
'content' => <<<'EOT'
874874
# comment 1
875875
header
876876
@@ -886,7 +886,7 @@ public function getCommentLikeStringInScalarBlockData()
886886
),
887887
);
888888

889-
$yaml2 = <<<EOT
889+
$yaml2 = <<<'EOT'
890890
test: |
891891
foo
892892
# bar
@@ -902,7 +902,7 @@ public function getCommentLikeStringInScalarBlockData()
902902
baz
903903
EOT;
904904
$expected2 = array(
905-
'test' => <<<EOT
905+
'test' => <<<'EOT'
906906
foo
907907
# bar
908908
baz
@@ -911,15 +911,15 @@ public function getCommentLikeStringInScalarBlockData()
911911
,
912912
'collection' => array(
913913
array(
914-
'one' => <<<EOT
914+
'one' => <<<'EOT'
915915
foo
916916
# bar
917917
baz
918918
EOT
919919
,
920920
),
921921
array(
922-
'two' => <<<EOT
922+
'two' => <<<'EOT'
923923
foo
924924
# bar
925925
baz

0 commit comments

Comments
 (0)