Merge branch '2.1' into 2.2

Author: weaverryan

book/controller.rst

@@ -332,6 +332,14 @@ working with forms, for example::
 .. index::
    single: Controller; Base controller class
 
+Creating Static Pages
+---------------------
+
+You can create a static page without even creating a controller (only a route
+and template are needed).
+
+Use it! See :doc:`/cookbook/templating/render_without_controller`.
+
 The Base Controller Class
 -------------------------
 

book/doctrine.rst

@@ -1313,7 +1313,7 @@ the current date, only when the entity is first persisted (i.e. inserted):
             type: entity
             # ...
             lifecycleCallbacks:
-                prePersist: [ setCreatedValue ]
+                prePersist: [setCreatedValue]
 
     .. code-block:: xml
 

book/installation.rst

@@ -294,8 +294,10 @@ Symfony2 should welcome and congratulate you for your hard work so far!
     this is not required for development it is recommended at the time your 
     application goes into production as all system and configuration files
     become inaccessible to clients then. For information on configuring 
-    your specific web server document root, see the following 
-    documentation: `Apache`_ | `Nginx`_ .
+    your specific web server document root, read
+    :doc:`/cookbook/configuration/web_server_configuration`
+    or consult the official documentation of your webserver:
+    `Apache`_ | `Nginx`_ .
 
 Beginning Development
 ---------------------

book/page_creation.rst

@@ -439,6 +439,8 @@ the same basic and recommended directory structure:
 
 * ``web/``: This is the web root directory and contains any publicly accessible files;
 
+.. _the-web-directory:
+
 The Web Directory
 ~~~~~~~~~~~~~~~~~
 

book/routing.rst

@@ -770,6 +770,7 @@ a slash. URLs matching this route might look like:
 
 * ``/articles/en/2010/my-post``
 * ``/articles/fr/2010/my-post.rss``
+* ``/articles/en/2013/my-latest-post.html``
 
 .. _book-routing-format-param:
 
@@ -1062,7 +1063,7 @@ the command by running the following from the root of your project.
 
     $ php app/console router:debug
 
-The command will print a helpful list of *all* the configured routes in
+This command will print a helpful list of *all* the configured routes in
 your application:
 
 .. code-block:: text
@@ -1081,16 +1082,18 @@ the route name after the command:
 
     $ php app/console router:debug article_show
 
-.. versionadded:: 2.1
-    The ``router:match`` command was added in Symfony 2.1
-
-You can check which, if any, route matches a path with the ``router:match``
-console command:
+Likewise, if you want to test whether a URL matches a given route, you can
+use the ``router:match`` console command:
 
 .. code-block:: bash
 
-    $ php app/console router:match /articles/en/2012/article.rss
-    Route "article_show" matches
+    $ php app/console router:match /blog/my-latest-post
+
+This command will print which route the URL matches.
+
+.. code-block:: text
+
+    Route "blog_show" matches
 
 .. index::
    single: Routing; Generating URLs

book/service_container.rst

@@ -192,7 +192,7 @@ straightforward. Parameters make defining services more organized and flexible:
         services:
             my_mailer:
                 class:        "%my_mailer.class%"
-                arguments:    [%my_mailer.transport%]
+                arguments:    ["%my_mailer.transport%"]
 
     .. code-block:: xml
 
@@ -244,6 +244,23 @@ looks up the value of each parameter and uses it in the service definition.
             # This will be parsed as string "@securepass"
             mailer_password: "@@securepass"
 
+.. note::
+
+    The percent sign inside a parameter or argument, as part of the string, must
+    be escaped with another percent sign:
+
+    .. code-block:: xml
+
+        <argument type="string">http://symfony.com/?foo=%%s&bar=%%d</argument>
+
+.. caution::
+
+    You may receive a 
+    :class:`Symfony\\Component\\DependencyInjection\\Exception\\ScopeWideningInjectionException`
+    when passing the ``request`` service as an argument. To understand this
+    problem better and learn how to solve it, refer to the cookbook article
+    :doc:`/cookbook/service_container/scopes`.
+
 The purpose of parameters is to feed information into services. Of course
 there was nothing wrong with defining the service without using any parameters.
 Parameters, however, have several advantages:
@@ -318,7 +335,7 @@ directories don't exist, create them.
         services:
             my_mailer:
                 class:        "%my_mailer.class%"
-                arguments:    [%my_mailer.transport%]
+                arguments:    ["%my_mailer.transport%"]
 
     .. code-block:: xml
 
@@ -358,7 +375,7 @@ configuration.
 
         # app/config/config.yml
         imports:
-            - { resource: @AcmeHelloBundle/Resources/config/services.yml }
+            - { resource: "@AcmeHelloBundle/Resources/config/services.yml" }
 
     .. code-block:: xml
 
@@ -557,7 +574,7 @@ the service container gives you a much more appealing option:
                 # ...
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
-                arguments: [@my_mailer]
+                arguments: ["@my_mailer"]
 
     .. code-block:: xml
 
@@ -648,7 +665,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
                 calls:
-                    - [ setMailer, [ @my_mailer ] ]
+                    - [setMailer, ["@my_mailer"]]
 
     .. code-block:: xml
 
@@ -715,7 +732,7 @@ it exists and do nothing if it doesn't:
         services:
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
-                arguments: [@?my_mailer]
+                arguments: ["@?my_mailer"]
 
     .. code-block:: xml
 
@@ -820,7 +837,7 @@ Configuring the service container is easy:
         services:
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
-                arguments: [@mailer, @templating]
+                arguments: ["@mailer", "@templating"]
 
     .. code-block:: xml
 

components/dependency_injection/factories.rst

@@ -162,7 +162,7 @@ in the previous example takes the ``templating`` service as an argument:
                 factory_service:  newsletter_factory
                 factory_method:   get
                 arguments:
-                    -             @templating
+                    - "@templating"
 
     .. code-block:: xml
 

components/dependency_injection/introduction.rst

@@ -236,11 +236,11 @@ config files:
         services:
             mailer:
                 class:     Mailer
-                arguments: [%mailer.transport%]
+                arguments: ["%mailer.transport%"]
             newsletter_manager:
                 class:     NewsletterManager
                 calls:
-                    - [ setMailer, [ @mailer ] ]
+                    - [setMailer, ["@mailer"]]
 
     .. code-block:: xml
 

components/dependency_injection/parentservices.rst

@@ -64,14 +64,14 @@ The service config for these classes would look something like this:
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
                 calls:
-                    - [ setMailer, [ @my_mailer ] ]
-                    - [ setEmailFormatter, [ @my_email_formatter] ]
+                    - [setMailer, ["@my_mailer"]]
+                    - [setEmailFormatter, ["@my_email_formatter"]]
 
             greeting_card_manager:
                 class:     "%greeting_card_manager.class%"
                 calls:
-                    - [ setMailer, [ @my_mailer ] ]
-                    - [ setEmailFormatter, [ @my_email_formatter] ]
+                    - [setMailer, ["@my_mailer"]]
+                    - [setEmailFormatter, ["@my_email_formatter"]]
 
     .. code-block:: xml
 
@@ -192,8 +192,8 @@ a parent for a service.
             mail_manager:
                 abstract:  true
                 calls:
-                    - [ setMailer, [ @my_mailer ] ]
-                    - [ setEmailFormatter, [ @my_email_formatter] ]
+                    - [setMailer, ["@my_mailer"]]
+                    - [setEmailFormatter, ["@my_email_formatter"]]
 
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
@@ -312,15 +312,26 @@ to the ``NewsletterManager`` class, the config would look like this:
             mail_manager:
                 abstract:  true
                 calls:
+<<<<<<< HEAD
                     - [ setMailer, [ @my_mailer ] ]
                     - [ setEmailFormatter, [ @my_email_formatter] ]
 
+=======
+                    - [setMailer, ["@my_mailer"]]
+                    - [setEmailFormatter, ["@my_email_formatter"]]
+            
+>>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
                 parent: mail_manager
                 calls:
+<<<<<<< HEAD
                     - [ setMailer, [ @my_alternative_mailer ] ]
 
+=======
+                    - [setMailer, ["@my_alternative_mailer"]]
+            
+>>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
             greeting_card_manager:
                 class:     "%greeting_card_manager.class%"
                 parent: mail_manager
@@ -439,14 +450,24 @@ If you had the following config:
             mail_manager:
                 abstract:  true
                 calls:
+<<<<<<< HEAD
                     - [ setFilter, [ @my_filter ] ]
 
+=======
+                    - [setFilter, ["@my_filter"]]
+                    
+>>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
             newsletter_manager:
                 class:     "%newsletter_manager.class%"
                 parent: mail_manager
                 calls:
+<<<<<<< HEAD
                     - [ setFilter, [ @another_filter ] ]
 
+=======
+                    - [setFilter, ["@another_filter"]]
+            
+>>>>>>> e1ae126cb094754b7f4e72bbdb4388fed7f2d188
     .. code-block:: xml
 
         <parameters>

components/dependency_injection/tags.rst

@@ -79,7 +79,7 @@ For example you may add the following transports as services:
             acme_mailer.transport.smtp:
                 class: \Swift_SmtpTransport
                 arguments:
-                    - %mailer_host%
+                    - "%mailer_host%"
                 tags:
                     -  { name: acme_mailer.transport }
             acme_mailer.transport.sendmail:
@@ -219,7 +219,7 @@ To answer this, change the service declaration:
             acme_mailer.transport.smtp:
                 class: \Swift_SmtpTransport
                 arguments:
-                    - %mailer_host%
+                    - "%mailer_host%"
                 tags:
                     -  { name: acme_mailer.transport, alias: foo }
             acme_mailer.transport.sendmail:

components/dependency_injection/types.rst

@@ -43,7 +43,7 @@ service container configuration:
                 # ...
             newsletter_manager:
                 class:     NewsletterManager
-                arguments: [@my_mailer]
+                arguments: ["@my_mailer"]
 
     .. code-block:: xml
 
@@ -119,7 +119,7 @@ accepts the dependency::
             newsletter_manager:
                 class:     NewsletterManager
                 calls:
-                    - [ setMailer, [ @my_mailer ] ]
+                    - [setMailer, ["@my_mailer"]]
 
     .. code-block:: xml
 
@@ -186,7 +186,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
 

components/index.rst

@@ -17,6 +17,7 @@ The Components
     http_foundation/index
     http_kernel/index
     locale
+    options_resolver
     process
     property_access/index
     routing/index

components/map.rst.inc

@@ -70,6 +70,10 @@
 
   * :doc:`/components/locale`
 
+* **Options Resolver**
+
+  * :doc:`/components/options_resolver`
+
 * **Process**
 
   * :doc:`/components/process`