Merge branch '2.8' into 3.0

xabbuh · xabbuh · commit bfd32d782422 · 2016-04-30T14:59:06.000+02:00
* 2.8:
  On line 360 the  header not working
  The `$link` argument must be passed as a reference
  Fix snippet
diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
@@ -148,7 +148,7 @@ of the application are isolated in a new file called ``model.php``::
         return $link;
     }
 
-    function close_database_connection($link)
+    function close_database_connection(&$link)
     {
         $link = null;
     }
@@ -357,7 +357,7 @@ on the requested URI::
     } elseif ('/index.php/show' === $uri && isset($_GET['id'])) {
         show_action($_GET['id']);
     } else {
-        header('Status: 404 Not Found');
+        header('HTTP/1.1 404 Not Found');
         echo '<html><body><h1>Page Not Found</h1></body></html>';
     }
 
diff --git a/components/dependency_injection/parentservices.rst b/components/dependency_injection/parentservices.rst
@@ -384,7 +384,7 @@ to the ``NewsletterManager`` class, the config would look like this:
 
         $mailManager = new Definition();
         $mailManager
-            ->setAbstract(true);
+            ->setAbstract(true)
             ->addMethodCall('setMailer', array(
                 new Reference('my_mailer'),
             ))

Original file line number	Diff line number	Diff line change
@@ -148,7 +148,7 @@ of the application are isolated in a new file called ``model.php``::
`148`	`148`	`return $link;`
`149`	`149`	`}`
`150`	`150`
`151`		`- function close_database_connection($link)`
	`151`	`+ function close_database_connection(&$link)`
`152`	`152`	`{`
`153`	`153`	`$link = null;`
`154`	`154`	`}`
`@@ -357,7 +357,7 @@ on the requested URI::`
`357`	`357`	`} elseif ('/index.php/show' === $uri && isset($_GET['id'])) {`
`358`	`358`	`show_action($_GET['id']);`
`359`	`359`	`} else {`
`360`		`- header('Status: 404 Not Found');`
	`360`	`+ header('HTTP/1.1 404 Not Found');`
`361`	`361`	`echo '<html><body><h1>Page Not Found</h1></body></html>';`
`362`	`362`	`}`
`363`	`363`