Merge branch '3.0'

* 3.0: [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 bumped Symfony version to 3.0.2 Do not use HttpKernel Extension when not needed updated VERSION for 3.0.1 updated CHANGELOG for 3.0.1 bumped Symfony version to 2.8.2 updated VERSION for 2.8.1 updated CHANGELOG for 2.8.1 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/HttpKernel/Kernel.php
lwrbakro · Dec 28, 2015 · 4260112 · 4260112
2 parents f944ae7 + 533721c
commit 4260112
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Tests/CrawlerTest.php b/Tests/CrawlerTest.php
@@ -136,7 +136,7 @@ public function testAddHtmlContentWithErrors()
         $internalErrors = libxml_use_internal_errors(true);
 
         $crawler = new Crawler();
-        $crawler->addHtmlContent(<<<EOF
+        $crawler->addHtmlContent(<<<'EOF'
 <!DOCTYPE html>
 <html>
     <head>
@@ -177,7 +177,7 @@ public function testAddXmlContentWithErrors()
         $internalErrors = libxml_use_internal_errors(true);
 
         $crawler = new Crawler();
-        $crawler->addXmlContent(<<<EOF
+        $crawler->addXmlContent(<<<'EOF'
 <!DOCTYPE html>
 <html>
     <head>
@@ -677,7 +677,7 @@ public function testSelectButton()
 
     public function testSelectButtonWithSingleQuotesInNameAttribute()
     {
-        $html = <<<HTML
+        $html = <<<'HTML'
 <!DOCTYPE html>
 <html lang="en">
 <body>
@@ -698,7 +698,7 @@ public function testSelectButtonWithSingleQuotesInNameAttribute()
 
     public function testSelectButtonWithDoubleQuotesInNameAttribute()
     {
-        $html = <<<HTML
+        $html = <<<'HTML'
 <!DOCTYPE html>
 <html lang="en">
 <body>
@@ -757,7 +757,7 @@ public function testInvalidLinks()
 
     public function testSelectLinkAndLinkFiltered()
     {
-        $html = <<<HTML
+        $html = <<<'HTML'
 <!DOCTYPE html>
 <html lang="en">
 <body>