herdani
diff --git a/‎book/controller.rst
Copy file name to clipboardExpand all lines: book/controller.rst
+7-6Lines changed: 7 additions & 6 deletions b/‎book/controller.rst
Copy file name to clipboardExpand all lines: book/controller.rst
+7-6Lines changed: 7 additions & 6 deletions
diff --git a/‎book/doctrine.rst
Copy file name to clipboardExpand all lines: book/doctrine.rst
+17-12Lines changed: 17 additions & 12 deletions b/‎book/doctrine.rst
Copy file name to clipboardExpand all lines: book/doctrine.rst
+17-12Lines changed: 17 additions & 12 deletions
diff --git a/‎book/forms.rst
Copy file name to clipboardExpand all lines: book/forms.rst
+3-18Lines changed: 3 additions & 18 deletions b/‎book/forms.rst
Copy file name to clipboardExpand all lines: book/forms.rst
+3-18Lines changed: 3 additions & 18 deletions
diff --git a/‎book/from_flat_php_to_symfony2.rst
Copy file name to clipboardExpand all lines: book/from_flat_php_to_symfony2.rst
+6-6Lines changed: 6 additions & 6 deletions b/‎book/from_flat_php_to_symfony2.rst
Copy file name to clipboardExpand all lines: book/from_flat_php_to_symfony2.rst
+6-6Lines changed: 6 additions & 6 deletions
@@ -276,7 +276,7 @@ the following guidelines in mind while you develop.
 
         public function indexAction($last_name, $color, $first_name)
         {
-            // ..
+            // ...
         }
 
 * **Each required controller argument must match up with a routing parameter**
@@ -286,15 +286,15 @@ the following guidelines in mind while you develop.
 
         public function indexAction($first_name, $last_name, $color, $foo)
         {
-            // ..
+            // ...
         }
 
     Making the argument optional, however, is perfectly ok. The following
     example would not throw an exception::
 
         public function indexAction($first_name, $last_name, $color, $foo = 'bar')
         {
-            // ..
+            // ...
         }
 
 * **Not all routing parameters need to be arguments on your controller**
@@ -304,7 +304,7 @@ the following guidelines in mind while you develop.
 
         public function indexAction($first_name, $color)
         {
-            // ..
+            // ...
         }
 
 .. tip::
@@ -448,7 +448,7 @@ object that's returned from that controller::
             'color' => 'green'
         ));
 
-        // further modify the response or return it directly
+        // ... further modify the response or return it directly
 
         return $response;
     }
@@ -570,7 +570,8 @@ If you're extending the base controller class, do the following::
 
     public function indexAction()
     {
-        $product = // retrieve the object from database
+        // retrieve the object from database
+        $product = ...;
         if (!$product) {
             throw $this->createNotFoundException('The product does not exist');
         }
 
@@ -48,13 +48,13 @@ information. By convention, this information is usually configured in an
 
 .. code-block:: yaml
 
-    # app/config/parameters.yml
-    parameters:
-        database_driver:   pdo_mysql
-        database_host:     localhost
-        database_name:     test_project
-        database_user:     root
-        database_password: password
+    ; app/config/parameters.ini
+    [parameters]
+        database_driver   = pdo_mysql
+        database_host     = localhost
+        database_name     = test_project
+        database_user     = root
+        database_password = password
 
 .. note::
 
@@ -64,6 +64,7 @@ information. By convention, this information is usually configured in an
 
     .. code-block:: yaml
     
+        # app/config/config.yml
         doctrine:
             dbal:
                 driver:   %database_driver%
@@ -366,9 +367,10 @@ of the bundle:
     :linenos:
 
     // src/Acme/StoreBundle/Controller/DefaultController.php
+
+    // ...
     use Acme\StoreBundle\Entity\Product;
     use Symfony\Component\HttpFoundation\Response;
-    // ...
 
     public function createAction()
     {
@@ -444,7 +446,7 @@ on its ``id`` value::
             throw $this->createNotFoundException('No product found for id '.$id);
         }
 
-        // do something, like pass the $product object into a template
+        // ... do something, like pass the $product object into a template
     }
 
 When you query for a particular type of object, you always use what's known
@@ -605,7 +607,7 @@ for just one object, you can use the ``getSingleResult()`` method instead::
     returned (if you're querying on something that could feasibly return
     more than one result)::
     
-        $query = $em->createQuery('SELECT ....')
+        $query = $em->createQuery('SELECT ...')
             ->setMaxResults(1);
         
         try {
@@ -710,6 +712,7 @@ To do this, add the name of the repository class to your mapping definition.
     .. code-block:: xml
 
         <!-- src/Acme/StoreBundle/Resources/config/doctrine/Product.orm.xml -->
+
         <!-- ... -->
         <doctrine-mapping>
 
@@ -792,6 +795,7 @@ To relate the ``Category`` and ``Product`` entities, start by creating a
     .. code-block:: php-annotations
 
         // src/Acme/StoreBundle/Entity/Category.php
+
         // ...
         use Doctrine\Common\Collections\ArrayCollection;
         
@@ -852,6 +856,7 @@ object, you'll want to add a ``$category`` property to the ``Product`` class:
     .. code-block:: php-annotations
 
         // src/Acme/StoreBundle/Entity/Product.php
+
         // ...
     
         class Product
@@ -928,10 +933,10 @@ Saving Related Entities
 Now, let's see the code in action. Imagine you're inside a controller::
 
     // ...
+
     use Acme\StoreBundle\Entity\Category;
     use Acme\StoreBundle\Entity\Product;
     use Symfony\Component\HttpFoundation\Response;
-    // ...
 
     class DefaultController extends Controller
     {
@@ -1058,7 +1063,6 @@ can avoid the second query by issuing a join in the original query. Add the
 following method to the ``ProductRepository`` class::
 
     // src/Acme/StoreBundle/Repository/ProductRepository.php
-
     public function findOneByIdJoinedToCategory($id)
     {
         $query = $this->getManager()
@@ -1162,6 +1166,7 @@ the current date, only when the entity is first persisted (i.e. inserted):
     .. code-block:: xml
 
         <!-- src/Acme/StoreBundle/Resources/config/doctrine/Product.orm.xml -->
+
         <!-- ... -->
         <doctrine-mapping>
 
 
@@ -147,7 +147,6 @@ helper functions:
     .. code-block:: html+jinja
 
         {# src/Acme/TaskBundle/Resources/views/Default/new.html.twig #}
-
         <form action="{{ path('task_new') }}" method="post" {{ form_enctype(form) }}>
             {{ form_widget(form) }}
 
@@ -157,7 +156,6 @@ helper functions:
     .. code-block:: html+php
 
         <!-- src/Acme/TaskBundle/Resources/views/Default/new.html.php -->
-
         <form action="<?php echo $view['router']->generate('task_new') ?>" method="post" <?php echo $view['form']->enctype($form) ?> >
             <?php echo $view['form']->widget($form) ?>
 
@@ -391,8 +389,7 @@ you'll need to specify which validation group(s) your form should use::
 
     $form = $this->createFormBuilder($users, array(
         'validation_groups' => array('registration'),
-    ))->add(...)
-    ;
+    ))->add(...);
 
 If you're creating :ref:`form classes<book-form-creating-form-classes>` (a
 good practice), then you'll need to add the following to the ``setDefaultOptions()``
@@ -607,7 +604,6 @@ of code. Of course, you'll usually need much more flexibility when rendering:
     .. code-block:: html+jinja
 
         {# src/Acme/TaskBundle/Resources/views/Default/new.html.twig #}
-
         <form action="{{ path('task_new') }}" method="post" {{ form_enctype(form) }}>
             {{ form_errors(form) }}
 
@@ -621,8 +617,7 @@ of code. Of course, you'll usually need much more flexibility when rendering:
 
     .. code-block:: html+php
 
-        <!-- // src/Acme/TaskBundle/Resources/views/Default/newAction.html.php -->
-
+        <!-- src/Acme/TaskBundle/Resources/views/Default/newAction.html.php -->
         <form action="<?php echo $view['router']->generate('task_new') ?>" method="post" <?php echo $view['form']->enctype($form) ?>>
             <?php echo $view['form']->errors($form) ?>
 
@@ -835,7 +830,7 @@ form "type"). It can be used to quickly build a form object in the controller:
 
     public function newAction()
     {
-        $task = // ...
+        $task = ...;
         $form = $this->createForm(new TaskType(), $task);
 
         // ...
@@ -1107,7 +1102,6 @@ do this, create a new template file that will store the new markup:
     .. code-block:: html+jinja
 
         {# src/Acme/TaskBundle/Resources/views/Form/fields.html.twig #}
-
         {% block field_row %}
         {% spaceless %}
             <div class="form_row">
@@ -1121,7 +1115,6 @@ do this, create a new template file that will store the new markup:
     .. code-block:: html+php
 
         <!-- src/Acme/TaskBundle/Resources/views/Form/field_row.html.php -->
-
         <div class="form_row">
             <?php echo $view['form']->label($form, $label) ?>
             <?php echo $view['form']->errors($form) ?>
@@ -1138,7 +1131,6 @@ renders the form:
     .. code-block:: html+jinja
 
         {# src/Acme/TaskBundle/Resources/views/Default/new.html.twig #}
-
         {% form_theme form 'AcmeTaskBundle:Form:fields.html.twig' %}
 
         {% form_theme form 'AcmeTaskBundle:Form:fields.html.twig' 'AcmeTaskBundle:Form:fields2.html.twig' %}
@@ -1148,7 +1140,6 @@ renders the form:
     .. code-block:: html+php
 
         <!-- src/Acme/TaskBundle/Resources/views/Default/new.html.php -->
-
         <?php $view['form']->setTheme($form, array('AcmeTaskBundle:Form')) ?>
 
         <?php $view['form']->setTheme($form, array('AcmeTaskBundle:Form', 'AcmeTaskBundle:Form')) ?>
@@ -1287,7 +1278,6 @@ file:
     .. code-block:: yaml
 
         # app/config/config.yml
-
         twig:
             form:
                 resources:
@@ -1297,7 +1287,6 @@ file:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-
         <twig:config ...>
                 <twig:form>
                     <resource>AcmeTaskBundle:Form:fields.html.twig</resource>
@@ -1308,7 +1297,6 @@ file:
     .. code-block:: php
 
         // app/config/config.php
-
         $container->loadFromExtension('twig', array(
             'form' => array('resources' => array(
                 'AcmeTaskBundle:Form:fields.html.twig',
@@ -1365,7 +1353,6 @@ file:
     .. code-block:: yaml
 
         # app/config/config.yml
-
         framework:
             templating:
                 form:
@@ -1377,7 +1364,6 @@ file:
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
-
         <framework:config ...>
             <framework:templating>
                 <framework:form>
@@ -1390,7 +1376,6 @@ file:
     .. code-block:: php
 
         // app/config/config.php
-
         $container->loadFromExtension('framework', array(
             'templating' => array('form' =>
                 array('resources' => array(
 
@@ -27,13 +27,13 @@ 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);
 
     $result = mysql_query('SELECT id, title FROM post', $link);
     ?>
 
+    <!doctype html>
     <html>
         <head>
             <title>List of Posts</title>
@@ -54,6 +54,7 @@ persisted to the database. Writing in flat PHP is quick and dirty:
 
     <?php
     mysql_close($link);
+    ?>
 
 That's quick to write, fast to execute, and, as your app grows, impossible
 to maintain. There are several problems that need to be addressed:
@@ -85,7 +86,6 @@ the code that prepares the HTML "presentation":
 
     <?php
     // index.php
-
     $link = mysql_connect('localhost', 'myuser', 'mypassword');
     mysql_select_db('blog_db', $link);
 
@@ -106,6 +106,7 @@ is primarily an HTML file that uses a template-like PHP syntax:
 
 .. code-block:: html+php
 
+    <!doctype html>
     <html>
         <head>
             <title>List of Posts</title>
@@ -146,7 +147,6 @@ of the application are isolated in a new file called ``model.php``:
 
     <?php
     // model.php
-
     function open_database_connection()
     {
         $link = mysql_connect('localhost', 'myuser', 'mypassword');
@@ -602,6 +602,7 @@ The layout is nearly identical:
 .. code-block:: html+php
 
     <!-- app/Resources/views/layout.html.php -->
+    <!doctype html>
     <html>
         <head>
             <title><?php echo $view['slots']->output('title', 'Default title') ?></title>
@@ -699,7 +700,6 @@ for example, the list template written in Twig:
 .. code-block:: html+jinja
 
     {# src/Acme/BlogBundle/Resources/views/Blog/list.html.twig #}
-
     {% extends "::layout.html.twig" %}
     {% block title %}List of Posts{% endblock %}
 
@@ -708,7 +708,7 @@ for example, the list template written in Twig:
         <ul>
             {% for post in posts %}
             <li>
-                <a href="{{ path('blog_show', { 'id': post.id }) }}">
+                <a href="{{ path('blog_show', {'id': post.id}) }}">
                     {{ post.title }}
                 </a>
             </li>
@@ -721,7 +721,7 @@ The corresponding ``layout.html.twig`` template is also easier to write:
 .. code-block:: html+jinja
 
     {# app/Resources/views/layout.html.twig #}
-
+    <!doctype html>
     <html>
         <head>
             <title>{% block title %}Default title{% endblock %}</title>
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ the following guidelines in mind while you develop.`
`276`	`276`
`277`	`277`	`public function indexAction($last_name, $color, $first_name)`
`278`	`278`	`{`
`279`		`- // ..`
	`279`	`+ // ...`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`* Each required controller argument must match up with a routing parameter`
`@@ -286,15 +286,15 @@ the following guidelines in mind while you develop.`
`286`	`286`
`287`	`287`	`public function indexAction($first_name, $last_name, $color, $foo)`
`288`	`288`	`{`
`289`		`- // ..`
	`289`	`+ // ...`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`Making the argument optional, however, is perfectly ok. The following`
`293`	`293`	`example would not throw an exception::`
`294`	`294`
`295`	`295`	`public function indexAction($first_name, $last_name, $color, $foo = 'bar')`
`296`	`296`	`{`
`297`		`- // ..`
	`297`	`+ // ...`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`* Not all routing parameters need to be arguments on your controller`
`@@ -304,7 +304,7 @@ the following guidelines in mind while you develop.`
`304`	`304`
`305`	`305`	`public function indexAction($first_name, $color)`
`306`	`306`	`{`
`307`		`- // ..`
	`307`	`+ // ...`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`.. tip::`
`@@ -448,7 +448,7 @@ object that's returned from that controller::`
`448`	`448`	`'color' => 'green'`
`449`	`449`	`));`
`450`	`450`
`451`		`- // further modify the response or return it directly`
	`451`	`+ // ... further modify the response or return it directly`
`452`	`452`
`453`	`453`	`return $response;`
`454`	`454`	`}`
`@@ -570,7 +570,8 @@ If you're extending the base controller class, do the following::`
`570`	`570`
`571`	`571`	`public function indexAction()`
`572`	`572`	`{`
`573`		`- $product = // retrieve the object from database`
	`573`	`+ // retrieve the object from database`
	`574`	`+ $product = ...;`
`574`	`575`	`if (!$product) {`
`575`	`576`	`throw $this->createNotFoundException('The product does not exist');`
`576`	`577`	`}`