Merge branch '2.8' into 3.0

Conflicts: book/page_creation.rst cookbook/deployment/platformsh.rst cookbook/symfony1.rst
symfony · Dec 9, 2015 · 8d21262 · 8d21262
2 parents 8c17033 + 78d11d8
commit 8d21262
Show file tree

Hide file tree

Showing 52 changed files with 138 additions and 143 deletions.
diff --git a/best_practices/business-logic.rst b/best_practices/business-logic.rst
@@ -149,7 +149,7 @@ the class namespace as a parameter:
 
     services:
         app.slugger:
-            class: "%slugger.class%"
+            class: '%slugger.class%'
 
 This practice is cumbersome and completely unnecessary for your own services:
 

diff --git a/best_practices/controllers.rst b/best_practices/controllers.rst
@@ -43,7 +43,7 @@ configuration to the main routing configuration file:
 
     # app/config/routing.yml
     app:
-        resource: "@AppBundle/Controller/"
+        resource: '@AppBundle/Controller/'
         type:     annotation
 
 This configuration will load annotations from any controller stored inside the

diff --git a/book/configuration.rst b/book/configuration.rst
@@ -21,14 +21,14 @@ format you prefer:
             - { resource: security.yml }
 
         framework:
-            secret:          "%secret%"
-            router:          { resource: "%kernel.root_dir%/config/routing.yml" }
+            secret:          '%secret%'
+            router:          { resource: '%kernel.root_dir%/config/routing.yml' }
             # ...
 
         # Twig Configuration
         twig:
-            debug:            "%kernel.debug%"
-            strict_variables: "%kernel.debug%"
+            debug:            '%kernel.debug%'
+            strict_variables: '%kernel.debug%'
 
         # ...
 
@@ -226,7 +226,7 @@ the configuration file for the ``dev`` environment.
             - { resource: config.yml }
 
         framework:
-            router:   { resource: "%kernel.root_dir%/config/routing_dev.yml" }
+            router:   { resource: '%kernel.root_dir%/config/routing_dev.yml' }
             profiler: { only_exceptions: false }
 
         # ...

diff --git a/book/doctrine.rst b/book/doctrine.rst
@@ -64,11 +64,11 @@ information. By convention, this information is usually configured in an
             # app/config/config.yml
             doctrine:
                 dbal:
-                    driver:   "%database_driver%"
-                    host:     "%database_host%"
-                    dbname:   "%database_name%"
-                    user:     "%database_user%"
-                    password: "%database_password%"
+                    driver:   '%database_driver%'
+                    host:     '%database_host%'
+                    dbname:   '%database_name%'
+                    user:     '%database_user%'
+                    password: '%database_password%'
 
         .. code-block:: xml
 
@@ -162,7 +162,7 @@ for you:
             doctrine:
                 dbal:
                     driver: pdo_sqlite
-                    path: "%kernel.root_dir%/sqlite.db"
+                    path: '%kernel.root_dir%/sqlite.db'
                     charset: UTF8
 
         .. code-block:: xml

diff --git a/book/forms.rst b/book/forms.rst
@@ -242,7 +242,7 @@ controller::
 
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             // ... perform some action, such as saving the task to the database
 
             return $this->redirectToRoute('task_success');

diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
@@ -85,7 +85,6 @@ the code that prepares the HTML "presentation":
 
 .. code-block:: html+php
 
-    <?php
     // index.php
     $link = mysql_connect('localhost', 'myuser', 'mypassword');
     mysql_select_db('blog_db', $link);
@@ -146,7 +145,6 @@ of the application are isolated in a new file called ``model.php``:
 
 .. code-block:: html+php
 
-    <?php
     // model.php
     function open_database_connection()
     {
@@ -188,7 +186,6 @@ The controller (``index.php``) is now very simple:
 
 .. code-block:: html+php
 
-    <?php
     require_once 'model.php';
 
     $posts = get_all_posts();
@@ -280,7 +277,6 @@ page:
 
 .. code-block:: html+php
 
-    <?php
     require_once 'model.php';
 
     $post = get_post_by_id($_GET['id']);
@@ -361,7 +357,6 @@ on the requested URI:
 
 .. code-block:: html+php
 
-    <?php
     // index.php
 
     // load and initialize any global libraries
@@ -464,7 +459,6 @@ the HTTP response being returned. Use them to improve the blog:
 
 .. code-block:: html+php
 
-    <?php
     // index.php
     require_once 'vendor/autoload.php';
 

diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst
@@ -149,8 +149,7 @@ known as HTTP headers. For example, one important HTTP response header is
 ``Content-Type``. The body of the same resource could be returned in multiple
 different formats like HTML, XML, or JSON and the ``Content-Type`` header uses
 Internet Media Types like ``text/html`` to tell the client which format is
-being returned. A list of common media types can be found on Wikipedia's
-`List of common media types`_ article.
+being returned. You can see a `list of common media types`_ from IANA.
 
 Many other headers exist, some of which are very powerful. For example, certain
 headers can be used to create a powerful caching system.
@@ -578,6 +577,6 @@ sensible defaults. For more advanced users, the sky is the limit.
 .. _`Live HTTP Headers`: https://addons.mozilla.org/en-US/firefox/addon/live-http-headers/
 .. _`List of HTTP status codes`: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
 .. _`List of HTTP header fields`: https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
-.. _`List of common media types`: https://www.iana.org/assignments/media-types/media-types.xhtml
+.. _`list of common media types`: https://www.iana.org/assignments/media-types/media-types.xhtml
 .. _`Validator`: https://github.com/symfony/validator
 .. _`Swift Mailer`: http://swiftmailer.org/
diff --git a/book/page_creation.rst b/book/page_creation.rst
@@ -39,11 +39,10 @@ a method inside of it that will be executed when someone goes to ``/lucky/number
     // src/AppBundle/Controller/LuckyController.php
     namespace AppBundle\Controller;
 
-    use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
     use Symfony\Component\HttpFoundation\Response;
 
-    class LuckyController extends Controller
+    class LuckyController
     {
         /**
          * @Route("/lucky/number")
@@ -104,7 +103,7 @@ Just add a second method to ``LuckyController``::
     // src/AppBundle/Controller/LuckyController.php
 
     // ...
-    class LuckyController extends Controller
+    class LuckyController
     {
         // ...
 
@@ -137,7 +136,7 @@ You can even shorten this with the handy :class:`Symfony\\Component\\HttpFoundat
     // --> don't forget this new use statement
     use Symfony\Component\HttpFoundation\JsonResponse;
 
-    class LuckyController extends Controller
+    class LuckyController
     {
         // ...
 
@@ -170,7 +169,7 @@ at the end:
         // src/AppBundle/Controller/LuckyController.php
 
         // ...
-        class LuckyController extends Controller
+        class LuckyController
         {
             /**
              * @Route("/lucky/number/{count}")
@@ -224,7 +223,7 @@ The best part is that you can access this value and use it in your controller::
     // src/AppBundle/Controller/LuckyController.php
     // ...
 
-    class LuckyController extends Controller
+    class LuckyController
     {
 
         /**
@@ -489,14 +488,14 @@ is ``app/config/config.yml``:
 
         # ...
         framework:
-            secret: "%secret%"
+            secret: '%secret%'
             router:
-                resource: "%kernel.root_dir%/config/routing.yml"
+                resource: '%kernel.root_dir%/config/routing.yml'
             # ...
 
         twig:
-            debug:            "%kernel.debug%"
-            strict_variables: "%kernel.debug%"
+            debug:            '%kernel.debug%'
+            strict_variables: '%kernel.debug%'
 
         # ...
 

diff --git a/book/routing.rst b/book/routing.rst
@@ -164,7 +164,7 @@ file:
         # app/config/config.yml
         framework:
             # ...
-            router: { resource: "%kernel.root_dir%/config/routing.yml" }
+            router: { resource: '%kernel.root_dir%/config/routing.yml' }
 
     .. code-block:: xml
 
@@ -1257,7 +1257,7 @@ configuration:
 
         # app/config/routing.yml
         app:
-            resource: "@AppBundle/Controller/"
+            resource: '@AppBundle/Controller/'
             type:     annotation # required to enable the Annotation reader for this resource
 
     .. code-block:: xml
@@ -1308,7 +1308,7 @@ directory are parsed and put into the routing.
 
             # app/config/routing.yml
             app:
-                resource: "@AcmeOtherBundle/Resources/config/routing.yml"
+                resource: '@AcmeOtherBundle/Resources/config/routing.yml'
 
         .. code-block:: xml
 
@@ -1347,7 +1347,7 @@ suppose you want to prefix all routes in the AppBundle with ``/site`` (e.g.
 
         # app/config/routing.yml
         app:
-            resource: "@AppBundle/Controller/"
+            resource: '@AppBundle/Controller/'
             type:     annotation
             prefix:   /site
 

diff --git a/book/service_container.rst b/book/service_container.rst
@@ -225,8 +225,8 @@ parameter and uses it in the service definition.
 
         # app/config/parameters.yml
         parameters:
-            # This will be parsed as string "@securepass"
-            mailer_password: "@@securepass"
+            # This will be parsed as string '@securepass'
+            mailer_password: '@@securepass'
 
 .. note::
 
@@ -356,7 +356,7 @@ configuration.
 
         # app/config/config.yml
         imports:
-            - { resource: "@AcmeHelloBundle/Resources/config/services.yml" }
+            - { resource: '@AcmeHelloBundle/Resources/config/services.yml' }
 
     .. code-block:: xml
 
@@ -433,7 +433,7 @@ invokes the service container extension inside the FrameworkBundle:
             secret:          xxxxxxxxxx
             form:            true
             csrf_protection: true
-            router:        { resource: "%kernel.root_dir%/config/routing.yml" }
+            router:        { resource: '%kernel.root_dir%/config/routing.yml' }
             # ...
 
     .. code-block:: xml

diff --git a/book/translation.rst b/book/translation.rst
@@ -618,7 +618,7 @@ not empty, add the following:
         AppBundle\Entity\Author:
             properties:
                 name:
-                    - NotBlank: { message: "author.name.not_blank" }
+                    - NotBlank: { message: 'author.name.not_blank' }
 
     .. code-block:: xml
 

diff --git a/book/validation.rst b/book/validation.rst
@@ -307,7 +307,7 @@ rules). In order to validate an object, simply map one or more constraints
 to its class and then pass it to the ``validator`` service.
 
 Behind the scenes, a constraint is simply a PHP object that makes an assertive
-statement. In real life, a constraint could be: "The cake must not be burned".
+statement. In real life, a constraint could be: 'The cake must not be burned'.
 In Symfony, constraints are similar: they are assertions that a condition
 is true. Given a value, a constraint will tell you if that value
 adheres to the rules of the constraint.
@@ -644,7 +644,7 @@ this method must return ``true``:
         AppBundle\Entity\Author:
             getters:
                 passwordLegal:
-                    - "True": { message: "The password cannot match your first name" }
+                    - 'True': { message: 'The password cannot match your first name' }
 
     .. code-block:: xml
 
@@ -954,8 +954,8 @@ username and the password are different only if all other validation passes
                 - Strict
             getters:
                 passwordLegal:
-                    - "True":
-                        message: "The password cannot match your username"
+                    - 'True':
+                        message: 'The password cannot match your username'
                         groups: [Strict]
             properties:
                 username:

diff --git a/components/dependency_injection/advanced.rst b/components/dependency_injection/advanced.rst
@@ -128,7 +128,7 @@ service by asking for the ``bar`` service like this::
         services:
            foo:
              class: Example\Foo
-           bar: "@foo"
+           bar: '@foo'
 
 Decorating Services
 -------------------

diff --git a/components/dependency_injection/parentservices.rst b/components/dependency_injection/parentservices.rst
@@ -63,14 +63,14 @@ The service config for these classes would look something like this:
             newsletter_manager:
                 class: NewsletterManager
                 calls:
-                    - [setMailer, ["@my_mailer"]]
-                    - [setEmailFormatter, ["@my_email_formatter"]]
+                    - [setMailer, ['@my_mailer']]
+                    - [setEmailFormatter, ['@my_email_formatter']]
 
             greeting_card_manager:
-                class: "GreetingCardManager"
+                class: 'GreetingCardManager'
                 calls:
-                    - [setMailer, ["@my_mailer"]]
-                    - [setEmailFormatter, ["@my_email_formatter"]]
+                    - [setMailer, ['@my_mailer']]
+                    - [setEmailFormatter, ['@my_email_formatter']]
 
     .. code-block:: xml
 

diff --git a/components/dependency_injection/types.rst b/components/dependency_injection/types.rst
@@ -199,7 +199,7 @@ Another possibility is just setting public fields of the class directly::
             newsletter_manager:
                 class: NewsletterManager
                 properties:
-                    mailer: "@my_mailer"
+                    mailer: '@my_mailer'
 
     .. code-block:: xml
 

diff --git a/components/routing/hostname_pattern.rst b/components/routing/hostname_pattern.rst
@@ -180,9 +180,9 @@ instance, if you want to match both ``m.example.com`` and
                 host:     "m.{domain}"
                 defaults:
                     _controller: AcmeDemoBundle:Main:mobileHomepage
-                    domain: "%domain%"
+                    domain: '%domain%'
                 requirements:
-                    domain: "%domain%"
+                    domain: '%domain%'
 
             homepage:
                 path:  /
@@ -243,7 +243,7 @@ You can also set the host option on imported routes:
     .. code-block:: yaml
 
         acme_hello:
-            resource: "@AcmeHelloBundle/Resources/config/routing.yml"
+            resource: '@AcmeHelloBundle/Resources/config/routing.yml'
             host:     "hello.example.com"
 
     .. code-block:: xml

diff --git a/components/security/authorization.rst b/components/security/authorization.rst
@@ -46,7 +46,7 @@ the votes (either positive, negative or neutral) it has received. It
 recognizes several strategies:
 
 ``affirmative`` (default)
-    grant access as soon as any voter returns an affirmative response;
+    grant access as soon as there is one voter granting access;
 
 ``consensus``
     grant access if there are more voters granting access than there are denying;