Merge branch '2.3' into 2.7

* 2.3: On line 360 the header not working The `$link` argument must be passed as a reference Fix snippet
symfony · Apr 30, 2016 · 84a1afd · 84a1afd
2 parents 373ef72 + 1e1ab96
commit 84a1afd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
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
@@ -385,7 +385,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'),
             ))