Merge branch '3.1'

Author: wouterj

book/controller.rst

@@ -533,6 +533,18 @@ console command:
 
 For more information, see the :doc:`/book/service_container` chapter.
 
+.. tip::
+
+    To get a container configuration parameter in controller you can use the
+    :method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::getParameter`
+    method::
+
+        $from = $this->getParameter('app.mailer.from');
+
+    .. versionadded:: 2.7
+        The ``Controller::getParameter()`` method was introduced in Symfony
+        2.7. Use ``$this->container->getParameter()`` in versions prior to 2.7.
+
 .. index::
    single: Controller; Managing errors
    single: Controller; 404 pages

book/from_flat_php_to_symfony2.rst

@@ -254,9 +254,13 @@ an individual blog result based on a given id::
     function get_post_by_id($id)
     {
         $link = open_database_connection();
-        $id = intval($id);
-        $result = $link->query('SELECT created_at, title, body FROM post WHERE id = '.$id);
-        $row = $result->fetch(PDO::FETCH_ASSOC);
+
+        $query = 'SELECT created_at, title, body FROM post WHERE  id=:id';
+        $statement = $link->prepare($query);
+        $statement->bindValue(':id', $id, PDO::PARAM_INT);
+        $statement->execute();
+
+        $row = $statement->fetch(PDO::FETCH_ASSOC);
 
         close_database_connection($link);
 
@@ -294,9 +298,7 @@ Creating the second page is now very easy and no code is duplicated. Still,
 this page introduces even more lingering problems that a framework can solve
 for you. For example, a missing or invalid ``id`` query parameter will cause
 the page to crash. It would be better if this caused a 404 page to be rendered,
-but this can't really be done easily yet. Worse, had you forgotten to clean
-the ``id`` parameter via the ``intval()`` function, your
-entire database would be at risk for an SQL injection attack.
+but this can't really be done easily yet.
 
 Another major problem is that each individual controller file must include
 the ``model.php`` file. What if each controller file suddenly needed to include
@@ -417,7 +419,7 @@ content:
 
     {
         "require": {
-            "symfony/symfony": "3.0.*"
+            "symfony/symfony": "3.1.*"
         },
         "autoload": {
             "files": ["model.php","controllers.php"]

components/browser_kit/introduction.rst

@@ -112,7 +112,7 @@ Cookies
 Retrieving Cookies
 ~~~~~~~~~~~~~~~~~~
 
-The ``Crawler`` object exposes cookies (if any) through a
+The ``Client`` implementation exposes cookies (if any) through a
 :class:`Symfony\\Component\\BrowserKit\\CookieJar`, which allows you to store and
 retrieve any cookie while making requests with the client::
 
@@ -123,7 +123,7 @@ retrieve any cookie while making requests with the client::
     $crawler = $client->request('GET', 'http://symfony.com');
 
     // Get the cookie Jar
-    $cookieJar = $crawler->getCookieJar();
+    $cookieJar = $client->getCookieJar();
 
     // Get a cookie by name
     $cookie = $cookieJar->get('name_of_the_cookie');
@@ -155,7 +155,7 @@ Looping Through Cookies
     $crawler = $client->request('GET', 'http://symfony.com');
 
     // Get the cookie Jar
-    $cookieJar = $crawler->getCookieJar();
+    $cookieJar = $client->getCookieJar();
 
     // Get array with all cookies
     $cookies = $cookieJar->all();

components/cache/cache_pools.rst

@@ -153,7 +153,7 @@ application as if they were Symfony Cache adapters::
     use Doctrine\Common\Cache\SQLite3Cache;
     use Symfony\Component\Cache\Adapter\DoctrineAdapter;
 
-    $doctrineCache = new SQLite3(__DIR__.'/cache/data.sqlite');
+    $doctrineCache = new SQLite3Cache(__DIR__.'/cache/data.sqlite');
     $symfonyCache = new DoctrineAdapter($doctrineCache);
 
 This adapter also defines two optional arguments called  ``namespace`` (default:

components/class_loader/class_loader.rst

@@ -33,11 +33,6 @@ is straightforward::
 
     $loader->register();
 
-.. note::
-
-    The autoloader is automatically registered in a Symfony application
-    (see ``app/autoload.php``).
-
 Use :method:`Symfony\\Component\\ClassLoader\\ClassLoader::addPrefix` or
 :method:`Symfony\\Component\\ClassLoader\\ClassLoader::addPrefixes` to register
 your classes::

components/console/usage.rst

@@ -101,7 +101,7 @@ to get this information output:
 
     Acme Console Application version 1.2
 
-If you do not provide both arguments then it will just output:
+If you do not provide a console name then it will just output:
 
 .. code-block:: text
 

components/finder.rst

@@ -31,7 +31,7 @@ directories::
 
     foreach ($finder as $file) {
         // Dump the absolute path
-        var_dump($file->getRealpath());
+        var_dump($file->getRealPath());
 
         // Dump the relative path to the file, omitting the filename
         var_dump($file->getRelativePath());
@@ -159,7 +159,7 @@ You can also define your own sorting algorithm with ``sort()`` method::
 
     $sort = function (\SplFileInfo $a, \SplFileInfo $b)
     {
-        return strcmp($a->getRealpath(), $b->getRealpath());
+        return strcmp($a->getRealPath(), $b->getRealPath());
     };
 
     $finder->sort($sort);

components/http_foundation/introduction.rst

@@ -474,14 +474,18 @@ non-ASCII filenames is more involving. The
 :method:`Symfony\\Component\\HttpFoundation\\ResponseHeaderBag::makeDisposition`
 abstracts the hard work behind a simple API::
 
+    use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 
-    $d = $response->headers->makeDisposition(
+    $fileContent = ...; // the generated file content
+    $response = new Response($fileContent);
+
+    $disposition = $response->headers->makeDisposition(
         ResponseHeaderBag::DISPOSITION_ATTACHMENT,
         'foo.pdf'
     );
 
-    $response->headers->set('Content-Disposition', $d);
+    $response->headers->set('Content-Disposition', $disposition);
 
 Alternatively, if you are serving a static file, you can use a
 :class:`Symfony\\Component\\HttpFoundation\\BinaryFileResponse`::
@@ -503,6 +507,7 @@ if it should::
 With the ``BinaryFileResponse``, you can still set the ``Content-Type`` of the sent file,
 or change its ``Content-Disposition``::
 
+    // ...
     $response->headers->set('Content-Type', 'text/plain');
     $response->setContentDisposition(
         ResponseHeaderBag::DISPOSITION_ATTACHMENT,

contributing/code/standards.rst

@@ -175,6 +175,9 @@ Structure
   switched to opt-in via ``@`` operator.
   Read more at :ref:`contributing-code-conventions-deprecations`.
 
+* Do not use ``else``, ``elseif``, ``break`` after ``if`` and ``case`` conditions
+  which return or throw something.
+
 Naming Conventions
 ------------------
 

cookbook/controller/upload_file.rst

@@ -136,7 +136,7 @@ Finally, you need to update the code of the controller that handles the form::
 
                 // Move the file to the directory where brochures are stored
                 $file->move(
-                    $this->container->getParameter('brochures_directory'),
+                    $this->getParameter('brochures_directory'),
                     $fileName
                 );
 
@@ -404,7 +404,7 @@ Now, register this class as a Doctrine listener:
 
         // app/config/services.php
         use Symfony\Component\DependencyInjection\Reference;
-        
+
         // ...
         $definition = new Definition(
             'AppBundle\EventListener\BrochureUploaderListener',