[#5811] Minor fixes to flat PHP to Symfony article

wouterj · wouterj · commit 9960f9cf67b4 · 2015-12-21T11:12:02.000+01:00
diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
@@ -30,11 +30,10 @@ persisted to the database. Writing in flat PHP is quick and dirty:
     <?php
     // index.php
     $link = new PDO("mysql:host=localhost;dbname=blog_db", 'myuser', 'mypassword');
-    
+
     $result = $link->query('SELECT id, title FROM post');
-    $result->setFetchMode(PDO::FETCH_ASSOC);
     ?>
-    
+
     <!DOCTYPE html>
     <html>
         <head>
@@ -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 = $result->fetch()): ?>
+                <?php while ($row = $result->fetch(PDO::FETCH_ASSOC)): ?>
                 <li>
                     <a href="/show.php?id=<?php echo $row['id'] ?>">
                         <?php echo $row['title'] ?>
@@ -53,7 +52,7 @@ persisted to the database. Writing in flat PHP is quick and dirty:
             </ul>
         </body>
     </html>
-    
+
     <?php
     $link = null;
     ?>
@@ -81,23 +80,20 @@ 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 = new PDO("mysql:host=localhost;dbname=blog_db", 'myuser', 'mypassword');
-    
+
     $result = $link->query('SELECT id, title FROM post');
-    $result->setFetchMode(PDO::FETCH_ASSOC);
-    
+
     $posts = array();
-    while ($row = $result->fetch()) {
+    while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
         $posts[] = $row;
     }
-    
+
     $link = null;
-    
+
     // include the HTML presentation code
     require 'templates/list.php';
 
@@ -142,35 +138,33 @@ 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 = new PDO("mysql:host=localhost;dbname=blog_db", 'myuser', 'mypassword');
+        $link = new PDO("mysql:host=localhost;dbname=blog_db", 'myuser', 'mypassword');
+
         return $link;
     }
-    
+
     function close_database_connection($link)
     {
         $link = null;
     }
-    
+
     function get_all_posts()
     {
         $link = open_database_connection();
-    
-      	$result = $link->query('SELECT id, title FROM post');
-      	$result->setFetchMode(PDO::FETCH_ASSOC);
-        
+
+        $result = $link->query('SELECT id, title FROM post');
+
         $posts = array();
-        while ($row = $result->fetch()) {
+        while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
             $posts[] = $row;
         }
         close_database_connection($link);
-    
+
         return $posts;
     }
 
@@ -183,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';
 
@@ -263,18 +255,16 @@ an individual blog result based on a given 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);
+        $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';
 
@@ -352,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
 
@@ -364,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()
     {
@@ -454,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';
@@ -467,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>';
@@ -481,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;
