Merge branch '2.7' into 2.8

Conflicts: book/forms.rst cookbook/form/create_custom_field_type.rst cookbook/form/create_form_type_extension.rst cookbook/form/dynamic_form_modification.rst
symfony · Dec 21, 2015 · e67deaa · e67deaa
2 parents 3b2f4d0 + b94fc35
commit e67deaa
Show file tree

Hide file tree

Showing 16 changed files with 368 additions and 235 deletions.
diff --git a/book/forms.rst b/book/forms.rst
@@ -1237,7 +1237,7 @@ Define your form type as a service.
     .. code-block:: php
 
         // src/AppBundle/Resources/config/services.php
-        use ;
+        use Symfony\Component\DependencyInjection\Reference;
 
         $container->register('app.form.type.task', 'AppBundle\Form\Type\TaskType')
             ->addArgument(new Reference('app.my_service'))

diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
@@ -29,10 +29,9 @@ persisted to the database. Writing in flat PHP is quick and dirty:
 
     <?php
     // index.php
-    $link = mysql_connect('localhost', 'myuser', 'mypassword');
-    mysql_select_db('blog_db', $link);
+    $link = new PDO("mysql:host=localhost;dbname=blog_db", 'myuser', 'mypassword');
 
-    $result = mysql_query('SELECT id, title FROM post', $link);
+    $result = $link->query('SELECT id, title FROM post');
     ?>
 
     <!DOCTYPE html>
@@ -43,7 +42,7 @@ persisted to the database. Writing in flat PHP is quick and dirty:
         <body>
             <h1>List of Posts</h1>
             <ul>
-                <?php while ($row = mysql_fetch_assoc($result)): ?>
+                <?php while ($row = $result->fetch(PDO::FETCH_ASSOC)): ?>
                 <li>
                     <a href="/show.php?id=<?php echo $row['id'] ?>">
                         <?php echo $row['title'] ?>
@@ -55,7 +54,7 @@ persisted to the database. Writing in flat PHP is quick and dirty:
     </html>
 
     <?php
-    mysql_close($link);
+    $link = null;
     ?>
 
 That's quick to write, fast to execute, and, as your app grows, impossible
@@ -81,26 +80,24 @@ Isolating the Presentation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The code can immediately gain from separating the application "logic" from
-the code that prepares the HTML "presentation":
-
-.. code-block:: html+php
+the code that prepares the HTML "presentation"::
 
     // index.php
-    $link = mysql_connect('localhost', 'myuser', 'mypassword');
-    mysql_select_db('blog_db', $link);
+    $link = new PDO("mysql:host=localhost;dbname=blog_db", 'myuser', 'mypassword');
 
-    $result = mysql_query('SELECT id, title FROM post', $link);
+    $result = $link->query('SELECT id, title FROM post');
 
     $posts = array();
-    while ($row = mysql_fetch_assoc($result)) {
+    while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
         $posts[] = $row;
     }
 
-    mysql_close($link);
+    $link = null;
 
     // include the HTML presentation code
     require 'templates/list.php';
 
+
 The HTML code is now stored in a separate file (``templates/list.php``), which
 is primarily an HTML file that uses a template-like PHP syntax:
 
@@ -141,31 +138,29 @@ Isolating the Application (Domain) Logic
 So far the application contains only one page. But what if a second page
 needed to use the same database connection, or even the same array of blog
 posts? Refactor the code so that the core behavior and data-access functions
-of the application are isolated in a new file called ``model.php``:
-
-.. code-block:: html+php
+of the application are isolated in a new file called ``model.php``::
 
     // model.php
     function open_database_connection()
     {
-        $link = mysql_connect('localhost', 'myuser', 'mypassword');
-        mysql_select_db('blog_db', $link);
+        $link = new PDO("mysql:host=localhost;dbname=blog_db", 'myuser', 'mypassword');
 
         return $link;
     }
 
     function close_database_connection($link)
     {
-        mysql_close($link);
+        $link = null;
     }
 
     function get_all_posts()
     {
         $link = open_database_connection();
 
-        $result = mysql_query('SELECT id, title FROM post', $link);
+        $result = $link->query('SELECT id, title FROM post');
+
         $posts = array();
-        while ($row = mysql_fetch_assoc($result)) {
+        while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
             $posts[] = $row;
         }
         close_database_connection($link);
@@ -182,9 +177,7 @@ of the application are isolated in a new file called ``model.php``:
    in this example, only a portion (or none) of the model is actually concerned
    with accessing a database.
 
-The controller (``index.php``) is now very simple:
-
-.. code-block:: html+php
+The controller (``index.php``) is now very simple::
 
     require_once 'model.php';
 
@@ -261,21 +254,17 @@ an individual blog result based on a given id::
     function get_post_by_id($id)
     {
         $link = open_database_connection();
-
         $id = intval($id);
-        $query = 'SELECT created_at, title, body FROM post WHERE id = '.$id;
-        $result = mysql_query($query);
-        $row = mysql_fetch_assoc($result);
+        $result = $link->query('SELECT created_at, title, body FROM post WHERE id = '.$id);
+        $row = $result->fetch(PDO::FETCH_ASSOC);
 
         close_database_connection($link);
 
         return $row;
     }
 
 Next, create a new file called ``show.php`` - the controller for this new
-page:
-
-.. code-block:: html+php
+page::
 
     require_once 'model.php';
 
@@ -353,9 +342,7 @@ You're about to take a **big** step with the application. With one file handling
 all requests, you can centralize things such as security handling, configuration
 loading, and routing. In this application, ``index.php`` must now be smart
 enough to render the blog post list page *or* the blog post show page based
-on the requested URI:
-
-.. code-block:: html+php
+on the requested URI::
 
     // index.php
 
@@ -365,19 +352,17 @@ on the requested URI:
 
     // route the request internally
     $uri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
-    if ('/index.php' == $uri) {
+    if ('/index.php' === $uri) {
         list_action();
-    } elseif ('/index.php/show' == $uri && isset($_GET['id'])) {
+    } elseif ('/index.php/show' === $uri && isset($_GET['id'])) {
         show_action($_GET['id']);
     } else {
         header('Status: 404 Not Found');
         echo '<html><body><h1>Page Not Found</h1></body></html>';
     }
 
 For organization, both controllers (formerly ``index.php`` and ``show.php``)
-are now PHP functions and each has been moved into a separate file, ``controllers.php``:
-
-.. code-block:: php
+are now PHP functions and each has been moved into a separate file, ``controllers.php``::
 
     function list_action()
     {
@@ -455,9 +440,7 @@ to interpret each request and return a response. To this end, Symfony provides
 both a :class:`Symfony\\Component\\HttpFoundation\\Request` and a
 :class:`Symfony\\Component\\HttpFoundation\\Response` class. These classes are
 object-oriented representations of the raw HTTP request being processed and
-the HTTP response being returned. Use them to improve the blog:
-
-.. code-block:: html+php
+the HTTP response being returned. Use them to improve the blog::
 
     // index.php
     require_once 'vendor/autoload.php';
@@ -468,9 +451,9 @@ the HTTP response being returned. Use them to improve the blog:
     $request = Request::createFromGlobals();
 
     $uri = $request->getPathInfo();
-    if ('/' == $uri) {
+    if ('/' === $uri) {
         $response = list_action();
-    } elseif ('/show' == $uri && $request->query->has('id')) {
+    } elseif ('/show' === $uri && $request->query->has('id')) {
         $response = show_action($request->query->get('id'));
     } else {
         $html = '<html><body><h1>Page Not Found</h1></body></html>';
@@ -482,9 +465,7 @@ the HTTP response being returned. Use them to improve the blog:
 
 The controllers are now responsible for returning a ``Response`` object.
 To make this easier, you can add a new ``render_template()`` function, which,
-incidentally, acts quite a bit like the Symfony templating engine:
-
-.. code-block:: php
+incidentally, acts quite a bit like the Symfony templating engine::
 
     // controllers.php
     use Symfony\Component\HttpFoundation\Response;

diff --git a/cookbook/assetic/apply_to_option.rst b/cookbook/assetic/apply_to_option.rst
@@ -29,14 +29,24 @@ An example configuration might look like this:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <assetic:config>
-            <assetic:filter
-                name="coffee"
-                bin="/usr/bin/coffee/"
-                node="/usr/bin/node/">
-                <assetic:node-path>/usr/lib/node_modules/</assetic:node-path>
-            </assetic:filter>
-        </assetic:config>
+        <?xml version="1.0" encoding="UTF-8"?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:assetic="http://symfony.com/schema/dic/assetic"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/assetic
+                http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
+
+            <assetic:config>
+                <assetic:filter
+                    name="coffee"
+                    bin="/usr/bin/coffee/"
+                    node="/usr/bin/node/">
+                    <assetic:node-path>/usr/lib/node_modules/</assetic:node-path>
+                </assetic:filter>
+            </assetic:config>
+        </container>
 
     .. code-block:: php
 
@@ -139,14 +149,24 @@ In this case you can specify that the ``coffee`` filter is applied to all
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <assetic:config>
-            <assetic:filter
-                name="coffee"
-                bin="/usr/bin/coffee"
-                node="/usr/bin/node"
-                apply_to="\.coffee$" />
-                <assetic:node-paths>/usr/lib/node_modules/</assetic:node-path>
-        </assetic:config>
+        <?xml version="1.0" encoding="UTF-8"?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:assetic="http://symfony.com/schema/dic/assetic"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/assetic
+                http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
+
+            <assetic:config>
+                <assetic:filter
+                    name="coffee"
+                    bin="/usr/bin/coffee"
+                    node="/usr/bin/node"
+                    apply_to="\.coffee$" />
+                    <assetic:node-paths>/usr/lib/node_modules/</assetic:node-path>
+            </assetic:config>
+        </container>
 
     .. code-block:: php
 

diff --git a/cookbook/assetic/asset_management.rst b/cookbook/assetic/asset_management.rst
@@ -384,7 +384,12 @@ configuration under the ``assetic`` section. Read more in the
         <!-- app/config/config.xml -->
         <?xml version="1.0" encoding="UTF-8"?>
         <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:assetic="http://symfony.com/schema/dic/assetic">
+            xmlns:assetic="http://symfony.com/schema/dic/assetic"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/assetic
+                http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
 
             <assetic:config>
                 <assetic:asset name="jquery_and_ui">
@@ -471,11 +476,21 @@ should be defined:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-        <assetic:config>
-            <assetic:filter
-                name="uglifyjs2"
-                bin="/usr/local/bin/uglifyjs" />
-        </assetic:config>
+        <?xml version="1.0" encoding="UTF-8"?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:assetic="http://symfony.com/schema/dic/assetic"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/assetic
+                http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
+
+            <assetic:config>
+                <assetic:filter
+                    name="uglifyjs2"
+                    bin="/usr/local/bin/uglifyjs" />
+            </assetic:config>
+        </container>
 
     .. code-block:: php
 
@@ -611,7 +626,17 @@ the following change in your ``config_dev.yml`` file:
     .. code-block:: xml
 
         <!-- app/config/config_dev.xml -->
-        <assetic:config use-controller="false" />
+        <?xml version="1.0" encoding="UTF-8"?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:assetic="http://symfony.com/schema/dic/assetic"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/assetic
+                http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
+
+            <assetic:config use-controller="false" />
+        </container>
 
     .. code-block:: php