Merge branch '2.3' into 2.7

* 2.3:
  [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
  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
  use nowdoc instead of heredoc

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
	src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php

Author: nicolas-grekas

Tests/DumperTest.php

@@ -54,7 +54,7 @@ public function testSetIndentation()
     {
         $this->dumper->setIndentation(7);
 
-        $expected = <<<EOF
+        $expected = <<<'EOF'
 '': bar
 foo: '#bar'
 'foo''bar': {  }
@@ -103,13 +103,13 @@ public function testSpecifications()
 
     public function testInlineLevel()
     {
-        $expected = <<<EOF
+        $expected = <<<'EOF'
 { '': bar, foo: '#bar', 'foo''bar': {  }, bar: [1, foo], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
 EOF;
         $this->assertEquals($expected, $this->dumper->dump($this->array, -10), '->dump() takes an inline level argument');
         $this->assertEquals($expected, $this->dumper->dump($this->array, 0), '->dump() takes an inline level argument');
 
-        $expected = <<<EOF
+        $expected = <<<'EOF'
 '': bar
 foo: '#bar'
 'foo''bar': {  }
@@ -119,7 +119,7 @@ public function testInlineLevel()
 EOF;
         $this->assertEquals($expected, $this->dumper->dump($this->array, 1), '->dump() takes an inline level argument');
 
-        $expected = <<<EOF
+        $expected = <<<'EOF'
 '': bar
 foo: '#bar'
 'foo''bar': {  }
@@ -134,7 +134,7 @@ public function testInlineLevel()
 EOF;
         $this->assertEquals($expected, $this->dumper->dump($this->array, 2), '->dump() takes an inline level argument');
 
-        $expected = <<<EOF
+        $expected = <<<'EOF'
 '': bar
 foo: '#bar'
 'foo''bar': {  }
@@ -153,7 +153,7 @@ public function testInlineLevel()
 EOF;
         $this->assertEquals($expected, $this->dumper->dump($this->array, 3), '->dump() takes an inline level argument');
 
-        $expected = <<<EOF
+        $expected = <<<'EOF'
 '': bar
 foo: '#bar'
 'foo''bar': {  }

Tests/ParserTest.php

@@ -90,7 +90,7 @@ public function testTabsInYaml()
 
     public function testEndOfTheDocumentMarker()
     {
-        $yaml = <<<EOF
+        $yaml = <<<'EOF'
 --- %YAML:1.0
 foo
 ...
@@ -495,7 +495,7 @@ public function testNonUtf8Exception()
      */
     public function testUnindentedCollectionException()
     {
-        $yaml = <<<EOF
+        $yaml = <<<'EOF'
 
 collection:
 -item1
@@ -512,7 +512,7 @@ public function testUnindentedCollectionException()
      */
     public function testShortcutKeyUnindentedCollectionException()
     {
-        $yaml = <<<EOF
+        $yaml = <<<'EOF'
 
 collection:
 -  key: foo
@@ -529,7 +529,7 @@ public function testShortcutKeyUnindentedCollectionException()
      */
     public function testMultipleDocumentsNotSupportedException()
     {
-        Yaml::parse(<<<EOL
+        Yaml::parse(<<<'EOL'
 # Ranking of 1998 home runs
 ---
 - Mark McGwire
@@ -549,7 +549,7 @@ public function testMultipleDocumentsNotSupportedException()
      */
     public function testSequenceInAMapping()
     {
-        Yaml::parse(<<<EOF
+        Yaml::parse(<<<'EOF'
 yaml:
   hash: me
   - array stuff
@@ -562,7 +562,7 @@ public function testSequenceInAMapping()
      */
     public function testMappingInASequence()
     {
-        Yaml::parse(<<<EOF
+        Yaml::parse(<<<'EOF'
 yaml:
   - array stuff
   hash: me
@@ -629,7 +629,7 @@ public function testMappingDuplicateKeyFlow()
 
     public function testEmptyValue()
     {
-        $input = <<<EOF
+        $input = <<<'EOF'
 hash:
 EOF;
 
@@ -647,7 +647,7 @@ public function testCommentAtTheRootIndent()
                     'class' => 'Bar',
                 ),
             ),
-        ), Yaml::parse(<<<EOF
+        ), Yaml::parse(<<<'EOF'
 # comment 1
 services:
 # comment 2
@@ -664,7 +664,7 @@ class: Bar
 
     public function testStringBlockWithComments()
     {
-        $this->assertEquals(array('content' => <<<EOT
+        $this->assertEquals(array('content' => <<<'EOT'
 # comment 1
 header
 
@@ -675,7 +675,7 @@ public function testStringBlockWithComments()
 
 footer # comment3
 EOT
-        ), Yaml::parse(<<<EOF
+        ), Yaml::parse(<<<'EOF'
 content: |
     # comment 1
     header
@@ -692,7 +692,7 @@ public function testStringBlockWithComments()
 
     public function testFoldedStringBlockWithComments()
     {
-        $this->assertEquals(array(array('content' => <<<EOT
+        $this->assertEquals(array(array('content' => <<<'EOT'
 # comment 1
 header
 
@@ -703,7 +703,7 @@ public function testFoldedStringBlockWithComments()
 
 footer # comment3
 EOT
-        )), Yaml::parse(<<<EOF
+        )), Yaml::parse(<<<'EOF'
 -
     content: |
         # comment 1
@@ -723,7 +723,7 @@ public function testNestedFoldedStringBlockWithComments()
     {
         $this->assertEquals(array(array(
             'title' => 'some title',
-            'content' => <<<EOT
+            'content' => <<<'EOT'
 # comment 1
 header
 
@@ -734,7 +734,7 @@ public function testNestedFoldedStringBlockWithComments()
 
 footer # comment3
 EOT
-        )), Yaml::parse(<<<EOF
+        )), Yaml::parse(<<<'EOF'
 -
     title: some title
     content: |
@@ -763,7 +763,7 @@ public function testReferenceResolvingInInlineStrings()
             'map' => array('key' => 'var-value'),
             'list_in_map' => array('key' => array('var-value')),
             'map_in_map' => array('foo' => array('bar' => 'var-value')),
-        ), Yaml::parse(<<<EOF
+        ), Yaml::parse(<<<'EOF'
 var:  &var var-value
 scalar: *var
 list: [ *var ]
@@ -779,7 +779,7 @@ public function testReferenceResolvingInInlineStrings()
 
     public function testYamlDirective()
     {
-        $yaml = <<<EOF
+        $yaml = <<<'EOF'
 %YAML 1.2
 ---
 foo: 1
@@ -790,7 +790,7 @@ public function testYamlDirective()
 
     public function testFloatKeys()
     {
-        $yaml = <<<EOF
+        $yaml = <<<'EOF'
 foo:
     1.2: "bar"
     1.3: "baz"
@@ -816,7 +816,7 @@ public function testCommentLikeStringsAreNotStrippedInBlockScalars($yaml, $expec
 
     public function getCommentLikeStringInScalarBlockData()
     {
-        $yaml1 = <<<EOT
+        $yaml1 = <<<'EOT'
 pages:
     -
         title: some title
@@ -835,7 +835,7 @@ public function getCommentLikeStringInScalarBlockData()
             'pages' => array(
                 array(
                     'title' => 'some title',
-                    'content' => <<<EOT
+                    'content' => <<<'EOT'
 # comment 1
 header
 
@@ -851,7 +851,7 @@ public function getCommentLikeStringInScalarBlockData()
             ),
         );
 
-        $yaml2 = <<<EOT
+        $yaml2 = <<<'EOT'
 test: |
     foo
     # bar
@@ -867,7 +867,7 @@ public function getCommentLikeStringInScalarBlockData()
         baz
 EOT;
         $expected2 = array(
-            'test' => <<<EOT
+            'test' => <<<'EOT'
 foo
 # bar
 baz
@@ -876,15 +876,15 @@ public function getCommentLikeStringInScalarBlockData()
             ,
             'collection' => array(
                 array(
-                    'one' => <<<EOT
+                    'one' => <<<'EOT'
 foo
 # bar
 baz
 EOT
                     ,
                 ),
                 array(
-                    'two' => <<<EOT
+                    'two' => <<<'EOT'
 foo
 # bar
 baz