Merge branch '5.4' into 6.0

* 5.4:
  User --webapp instead of --full
  [Doctrine] use executeQuery instead of execute

Author: javiereguiluz

doctrine.rst

@@ -848,7 +848,7 @@ In addition, you can query directly with SQL if you need to::
                 ORDER BY p.price ASC
                 ';
             $stmt = $conn->prepare($sql);
-            $stmt->execute(['price' => $price]);
+            $stmt->executeQuery(['price' => $price]);
 
             // returns an array of arrays (i.e. a raw data set)
             return $stmt->fetchAllAssociative();

setup.rst

@@ -53,13 +53,13 @@ application:
 .. code-block:: terminal
 
     # run this if you are building a traditional web application
-    $ symfony new my_project_directory --full
+    $ symfony new my_project_directory --webapp
 
     # run this if you are building a microservice, console application or API
     $ symfony new my_project_directory
 
 The only difference between these two commands is the number of packages
-installed by default. The ``--full`` option installs all the packages that you
+installed by default. The ``--webapp`` option installs all the packages that you
 usually need to build web applications, so the installation size will be bigger.
 
 If you're not using the Symfony binary, run these commands to create the new
@@ -68,7 +68,9 @@ Symfony application using Composer:
 .. code-block:: terminal
 
     # run this if you are building a traditional web application
-    $ composer create-project symfony/website-skeleton my_project_directory
+    $ composer create-project symfony/skeleton my_project_directory
+    $ cd my_project_directory
+    $ composer require webapp
 
     # run this if you are building a microservice, console application or API
     $ composer create-project symfony/skeleton my_project_directory