Merge branch '3.0' into 3.1

wouterj · wouterj · commit 8a53e58f669d · 2016-08-05T11:38:11.000+02:00
diff --git a/best_practices/templates.rst b/best_practices/templates.rst
@@ -81,7 +81,7 @@ extension. The service definition only requires the path to the class:
     # app/config/services.yml
     services:
         # ...
-        markdown:
+        app.markdown:
             class: AppBundle\Utils\Markdown
 
 And the ``Markdown`` class just needs to define one single method to transform
@@ -156,7 +156,7 @@ name is irrelevant because you never use it in your own code):
     services:
         app.twig.app_extension:
             class:     AppBundle\Twig\AppExtension
-            arguments: ['@markdown']
+            arguments: ['@app.markdown']
             public:    false
             tags:
                 - { name: twig.extension }
diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst
@@ -176,7 +176,9 @@ Structure
   Read more at :ref:`contributing-code-conventions-deprecations`;
 
 * Do not use ``else``, ``elseif``, ``break`` after ``if`` and ``case`` conditions
-  which return or throw something.
+  which return or throw something;
+
+* Do not use spaces around ``[`` offset accessor and before ``]`` offset accessor.
 
 Naming Conventions
 ------------------
diff --git a/controller/error_pages.rst b/controller/error_pages.rst
@@ -99,7 +99,6 @@ To override the 404 error template for HTML pages, create a new
     {% block body %}
         <h1>Page not found</h1>
 
-        {# example security usage, see below #}
         {% if is_granted('IS_AUTHENTICATED_FULLY') %}
             {# ... #}
         {% endif %}
diff --git a/form/form_collections.rst b/form/form_collections.rst
@@ -607,7 +607,7 @@ Template Modifications
 
 The ``allow_delete`` option has one consequence: if an item of a collection
 isn't sent on submission, the related data is removed from the collection
-on the server. The solution is thus to remove the form element from the DOM.
+on the server. The solution is to remove the form element from the DOM.
 
 First, add a "delete this tag" link to each tag form:
 
diff --git a/form/form_customization.rst b/form/form_customization.rst
@@ -479,7 +479,7 @@ rendered.
         # app/config/config.yml
         twig:
             form_themes:
-		- 'form/fields.html.twig'
+                - 'form/fields.html.twig'
             # ...
 
     .. code-block:: xml
@@ -495,7 +495,7 @@ rendered.
         // app/config/config.php
         $container->loadFromExtension('twig', array(
             'form_themes' => array(
-		'form/fields.html.twig',
+                'form/fields.html.twig',
             ),
 
             // ...
@@ -675,7 +675,7 @@ customize the ``name`` field only:
 
         <?php echo $view['form']->widget($form['name']); ?>
 
-        <!-- app/Resources/views/Form/_product_name_widget.html.php -->
+        <!-- app/Resources/views/form/_product_name_widget.html.php -->
         <div class="text_widget">
             <?php echo $view['form']->block('form_widget_simple') ?>
         </div>
@@ -733,7 +733,7 @@ You can also override the markup for an entire field row using the same method:
 
         <?php echo $view['form']->row($form['name']); ?>
 
-        <!-- app/Resources/views/Form/_product_name_row.html.php -->
+        <!-- app/Resources/views/form/_product_name_row.html.php -->
         <div class="name_row">
             <?php echo $view['form']->label($form) ?>
             <?php echo $view['form']->errors($form) ?>
diff --git a/form/form_themes.rst b/form/form_themes.rst
@@ -271,7 +271,7 @@ to define form output.
 PHP
 ...
 
-To automatically include the customized templates from the ``app/Resources/views/Form``
+To automatically include the customized templates from the ``app/Resources/views/form``
 directory created earlier in *all* templates, modify your application configuration
 file:
 
@@ -284,7 +284,7 @@ file:
             templating:
                 form:
                     resources:
-                        - 'Form'
+                        - 'form'
         # ...
 
     .. code-block:: xml
@@ -300,7 +300,7 @@ file:
             <framework:config>
                 <framework:templating>
                     <framework:form>
-                        <framework:resource>Form</framework:resource>
+                        <framework:resource>form</framework:resource>
                     </framework:form>
                 </framework:templating>
                 <!-- ... -->
@@ -314,14 +314,14 @@ file:
             'templating' => array(
                 'form' => array(
                     'resources' => array(
-                        'Form',
+                        'form',
                     ),
                 ),
             ),
             // ...
         ));
 
-Any fragments inside the ``app/Resources/views/Form`` directory are now used
+Any fragments inside the ``app/Resources/views/form`` directory are now used
 globally to define form output.
 
 .. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
diff --git a/forms.rst b/forms.rst
@@ -234,7 +234,7 @@ your controller::
 
         $form->handleRequest($request);
 
-        if ($form->isSubmitted() && $form->()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             // $form->getData() holds the submitted values
             // but, the original `$task` variable has also been updated
             $task = $form->getData();
diff --git a/http_cache.rst b/http_cache.rst
@@ -221,8 +221,8 @@ The *easiest* way to cache a response is by caching it for a specific amount of
         // somehow create a Response object, like by rendering a template
         $response = $this->render('blog/index.html.twig', []);
 
-        // cache for 600 seconds
-        $response->setSharedMaxAge(600);
+        // cache for 3600 seconds
+        $response->setSharedMaxAge(3600);
 
         // (optional) set a custom Cache-Control directive
         $response->headers->addCacheControlDirective('must-revalidate', true);
diff --git a/logging/disable_microsecond_precision.rst b/logging/disable_microsecond_precision.rst
diff --git a/routing/conditions.rst b/routing/conditions.rst
@@ -1,5 +1,5 @@
 .. index::
-    :single: Routing; Conditions
+    single: Routing; Conditions
 
 How to Restrict Route Matching through Conditions
 =================================================
diff --git a/service_container/service_decoration.rst b/service_container/service_decoration.rst
@@ -40,11 +40,11 @@ the original service is lost:
 
     .. code-block:: php
 
-        $container->register('mailer', 'AppBundle\Mailer');
+        $container->register('app.mailer', 'AppBundle\Mailer');
 
         // this replaces the old app.mailer definition with the new one, the
         // old definition is lost
-        $container->register('mailer', 'AppBundle\DecoratingMailer');
+        $container->register('app.mailer', 'AppBundle\DecoratingMailer');
 
 Most of the time, that's exactly what you want to do. But sometimes,
 you might want to decorate the old one instead. In this case, the
diff --git a/setup/file_permissions.rst b/setup/file_permissions.rst
@@ -31,8 +31,8 @@ needed permissions:
 
 .. code-block:: bash
 
-    $ rm -rf app/cache/*
-    $ rm -rf app/logs/*
+    $ rm -rf var/cache/*
+    $ rm -rf var/logs/*
 
     $ HTTPDUSER=`ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1`
     $ sudo chmod -R +a "$HTTPDUSER allow delete,write,append,file_inherit,directory_inherit" var
diff --git a/validation/custom_constraint.rst b/validation/custom_constraint.rst
@@ -158,7 +158,7 @@ Constraint Validators with Dependencies
 If your constraint validator has dependencies, such as a database connection,
 it will need to be configured as a service in the Dependency Injection
 Container. This service must include the ``validator.constraint_validator``
-tag so that the validation system knows about it::
+tag so that the validation system knows about it:
 
 .. configuration-block::
 
