Merge remote-tracking branch 'upstream/master'

javiereguiluz · javiereguiluz · commit e3402671b655 · 2016-04-05T17:02:51.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ cache:
         - $HOME/.cache/pip
         - _build
 
-install: pip install sphinx~=1.3 git+https://github.com/fabpot/sphinx-php.git
+install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
 
 script: sphinx-build -nW -b html -d _build/doctrees . _build/html
 
diff --git a/book/controller.rst b/book/controller.rst
diff --git a/book/doctrine.rst b/book/doctrine.rst
diff --git a/book/installation.rst b/book/installation.rst
@@ -204,11 +204,7 @@ your `Apache`_ or `Nginx`_ web server as explained in
 :doc:`/cookbook/configuration/web_server_configuration`.
 
 When you are finished working on your Symfony application, you can stop the
-server with the ``server:stop`` command:
-
-.. code-block:: bash
-
-    $ php bin/console server:stop
+server by pressing `Ctrl+C` from terminal.
 
 Checking Symfony Application Configuration and Setup
 ----------------------------------------------------
diff --git a/book/templating.rst b/book/templating.rst
@@ -382,7 +382,7 @@ Template Naming and Locations
 By default, templates can live in two different locations:
 
 ``app/Resources/views/``
-    The applications ``views`` directory can contain application-wide base templates
+    The application's ``views`` directory can contain application-wide base templates
     (i.e. your application's layouts and templates of the application bundle) as
     well as templates that override third party bundle templates
     (see :ref:`overriding-bundle-templates`).
@@ -616,7 +616,7 @@ articles::
         }
     }
 
-The ``recentList`` template is perfectly straightforward:
+The ``recent_list`` template is perfectly straightforward:
 
 .. configuration-block::
 
@@ -975,7 +975,7 @@ route:
 
 In this case, you need to specify both the route name (``article_show``) and
 a value for the ``{slug}`` parameter. Using this route, revisit the
-``recentList`` template from the previous section and link to the articles
+``recent_list`` template from the previous section and link to the articles
 correctly:
 
 .. configuration-block::
@@ -1053,7 +1053,7 @@ being used and generating the correct paths accordingly.
 
 Additionally, if you use the ``asset`` function, Symfony can automatically
 append a query string to your asset, in order to guarantee that updated static
-assets won't be cached when deployed. For example, ``/images/logo.png`` might
+assets won't be loaded from cache after being deployed. For example, ``/images/logo.png`` might
 look like ``/images/logo.png?v2``. For more information, see the :ref:`reference-framework-assets-version`
 configuration option.
 
diff --git a/book/translation.rst b/book/translation.rst
@@ -927,5 +927,5 @@ steps:
 .. _`i18n`: https://en.wikipedia.org/wiki/Internationalization_and_localization
 .. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
 .. _`ISO 639-1`: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
-.. _`Translatable Extension`: https://github.com/l3pp4rd/DoctrineExtensions
+.. _`Translatable Extension`: http://atlantic18.github.io/DoctrineExtensions/doc/translatable.html
 .. _`Translatable Behavior`: https://github.com/KnpLabs/DoctrineBehaviors
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -147,25 +147,28 @@ exist::
     // the query string is '?foo=bar'
 
     $request->query->get('foo');
-    // returns bar
+    // returns 'bar'
 
     $request->query->get('bar');
     // returns null
 
-    $request->query->get('bar', 'bar');
-    // returns 'bar'
+    $request->query->get('bar', 'baz');
+    // returns 'baz'
 
 When PHP imports the request query, it handles request parameters like
 ``foo[bar]=bar`` in a special way as it creates an array. So you can get the
 ``foo`` parameter and you will get back an array with a ``bar`` element::
 
-    // the query string is '?foo[bar]=bar'
+    // the query string is '?foo[bar]=baz'
 
     $request->query->get('foo');
-    // returns array('bar' => 'bar')
+    // returns array('bar' => 'baz')
 
     $request->query->get('foo[bar]');
-    // returns null   
+    // returns null
+
+    $request->query->get('foo')['bar'];
+    // returns 'baz'
 
 .. _component-foundation-attributes:
 
@@ -500,7 +503,8 @@ if it should::
 
     BinaryFileResponse::trustXSendfileTypeHeader();
 
-You can still set the ``Content-Type`` of the sent file, or change its ``Content-Disposition``::
+With the ``BinaryFileResponse``, you can still set the ``Content-Type`` of the sent file,
+or change its ``Content-Disposition``::
 
     $response->headers->set('Content-Type', 'text/plain');
     $response->setContentDisposition(
diff --git a/components/var_dumper/introduction.rst b/components/var_dumper/introduction.rst
@@ -17,6 +17,11 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/var-dumper`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/var-dumper).
 
+.. note::
+
+    If using it inside a Symfony application, make sure that the
+    DebugBundle is enabled in your ``app/AppKernel.php`` file.
+
 .. _components-var-dumper-dump:
 
 The dump() Function
diff --git a/components/yaml/yaml_format.rst b/components/yaml/yaml_format.rst
@@ -50,7 +50,7 @@ can use double quotes, for these characters it is more convenient to use single
 quotes, which avoids having to escape any backslash ``\``:
 
 * ``:``, ``{``, ``}``, ``[``, ``]``, ``,``, ``&``, ``*``, ``#``, ``?``, ``|``,
-  ``-``, ``<``, ``>``, ``=``, ``!``, ``%``, ``@``, ``\```
+  ``-``, ``<``, ``>``, ``=``, ``!``, ``%``, ``@``, `````
 
 The double-quoted style provides a way to express arbitrary strings, by
 using ``\`` to escape characters and sequences. For instance, it is very useful
diff --git a/contributing/code/bc.rst b/contributing/code/bc.rst
@@ -236,7 +236,6 @@ Change return type                                  No
 Add private method                                  Yes
 Remove private method                               Yes
 Change name                                         Yes
-Reduce visibility                                   Yes
 Add argument without a default value                Yes
 Add argument with a default value                   Yes
 Remove argument                                     Yes
diff --git a/contributing/code/patches.rst b/contributing/code/patches.rst
@@ -272,49 +272,10 @@ pull request message, like in:
     [Yaml] fixed something
     [Form] [Validator] [FrameworkBundle] added something
 
-The pull request description must include the following checklist at the top
-to ensure that contributions may be reviewed without needless feedback
-loops and that your contributions can be included into Symfony as quickly as
-possible:
-
-.. code-block:: text
-
-    | Q             | A
-    | ------------- | ---
-    | Bug fix?      | [yes|no]
-    | New feature?  | [yes|no]
-    | BC breaks?    | [yes|no]
-    | Deprecations? | [yes|no]
-    | Tests pass?   | [yes|no]
-    | Fixed tickets | [comma separated list of tickets fixed by the PR]
-    | License       | MIT
-    | Doc PR        | [The reference to the documentation PR if any]
-
-An example submission could now look as follows:
-
-.. code-block:: text
-
-    | Q             | A
-    | ------------- | ---
-    | Bug fix?      | no
-    | New feature?  | no
-    | BC breaks?    | no
-    | Deprecations? | no
-    | Tests pass?   | yes
-    | Fixed tickets | #12, #43
-    | License       | MIT
-    | Doc PR        | symfony/symfony-docs#123
-
-The whole table must be included (do **not** remove lines that you think are
-not relevant). For simple typos, minor changes in the PHPDocs, or changes in
-translation files, use the shorter version of the check-list:
-
-.. code-block:: text
-
-    | Q             | A
-    | ------------- | ---
-    | Fixed tickets | [comma separated list of tickets fixed by the PR]
-    | License       | MIT
+The default pull request description contains a table which you must fill in
+with the appropriate answers. This ensures that contributions may be reviewed
+without needless feedback loops and that your contributions can be included into
+Symfony as quickly as possible.
 
 Some answers to the questions trigger some more requirements:
 
diff --git a/contributing/community/releases.rst b/contributing/community/releases.rst
@@ -91,7 +91,19 @@ Below is the schedule for the first few versions that use this release model:
 * **Blue** represents the Stabilization phase
 * **Green** represents the Maintenance period
 
-This results in very predictable dates and maintenance periods:
+.. tip::
+
+    If you want to learn more about the timeline of any given Symfony version,
+    use the online `timeline calculator`_.
+
+.. tip::
+
+    Whenever an important event related to Symfony versions happens (a version
+    reaches end of maintenance or a new patch version is released for
+    instance), you can automatically receive an email notification if you
+    subscribed on the `roadmap notification`_ page.
+
+.. _version-history:
 
 =======  ==============  =======  ========================  ===========
 Version  Feature Freeze  Release  End of Maintenance        End of Life
@@ -123,19 +135,6 @@ Version  Feature Freeze  Release  End of Maintenance        End of Life
 .. [2] Symfony 2.8 is the last version of the Symfony 2.x branch.
 .. [3] Symfony 3.0 is the first version to use the new release process based on five minor releases.
 
-.. tip::
-
-    If you want to learn more about the timeline of any given Symfony version,
-    use the online `timeline calculator`_. You can also get all data as a JSON
-    string via a URL like `https://symfony.com/roadmap.json?version=2.x`.
-
-.. tip::
-
-    Whenever an important event related to Symfony versions happens (a version
-    reaches end of maintenance or a new patch version is released for
-    instance), you can automatically receive an email notification if you
-    subscribed on the `roadmap notification`_ page.
-
 Backwards Compatibility
 -----------------------
 
diff --git a/cookbook/assetic/php.rst b/cookbook/assetic/php.rst
@@ -42,7 +42,7 @@ Organizing your Web Asset Files
 -------------------------------
 
 This example will include a setup using the Bootstrap CSS framework, jQuery, FontAwesome
-and some regular CSS and and JavaScript application files (called ``main.css`` and
+and some regular CSS and JavaScript application files (called ``main.css`` and
 ``main.js``). The recommended directory structure for this set-up looks like this:
 
 .. code-block:: text
diff --git a/cookbook/event_dispatcher/event_listener.rst b/cookbook/event_dispatcher/event_listener.rst
@@ -141,9 +141,7 @@ listen to the same ``kernel.exception`` event::
     namespace AppBundle\EventSubscriber;
 
     use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-    use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-    use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
     class ExceptionSubscriber implements EventSubscriberInterface
     {
diff --git a/cookbook/form/create_custom_field_type.rst b/cookbook/form/create_custom_field_type.rst
@@ -109,7 +109,7 @@ link for details), create a ``gender_widget`` block to handle this:
 
     .. code-block:: html+twig
 
-        {# app/Resources/views/Form/fields.html.twig #}
+        {# app/Resources/views/form/fields.html.twig #}
         {% block gender_widget %}
             {% spaceless %}
                 {% if expanded %}
@@ -130,7 +130,7 @@ link for details), create a ``gender_widget`` block to handle this:
 
     .. code-block:: html+php
 
-        <!-- app/Resources/views/Form/gender_widget.html.php -->
+        <!-- app/Resources/views/form/gender_widget.html.php -->
         <?php if ($expanded) : ?>
             <ul <?php $view['form']->block($form, 'widget_container_attributes') ?>>
             <?php foreach ($form as $child) : ?>
diff --git a/cookbook/form/create_form_type_extension.rst b/cookbook/form/create_form_type_extension.rst
@@ -323,7 +323,7 @@ Generic Form Type Extensions
 
 You can modify several form types at once by specifying their common parent
 (:doc:`/reference/forms/types`). For example, several form types natively
-available in Symfony inherit from the ``TextType`` form type (such as ``email``,
+available in Symfony inherit from the ``TextType`` form type (such as ``EmailType``,
 ``SearchType``, ``UrlType``, etc.). A form type extension applying to ``TextType``
 (i.e. whose ``getExtendedType`` method returns ``TextType::class``) would apply
 to all of these form types.
diff --git a/cookbook/form/unit_testing.rst b/cookbook/form/unit_testing.rst
@@ -128,6 +128,8 @@ make sure the ``FormRegistry`` uses the created instance::
         {
             // mock any dependencies
             $this->entityManager = $this->getMock('Doctrine\Common\Persistence\ObjectManager');
+
+            parent::setUp();
         }
 
         protected function getExtensions()
diff --git a/cookbook/security/impersonating_user.rst b/cookbook/security/impersonating_user.rst
@@ -222,7 +222,7 @@ how to change the sticky locale:
 
 .. code-block:: php
 
-        // src/AppBundle/EventListener/SwitchUserListener.pnp
+        // src/AppBundle/EventListener/SwitchUserListener.php
         namespace AppBundle\EventListener;
 
         use Symfony\Component\Security\Http\Event\SwitchUserEvent;
diff --git a/reference/constraints/Image.rst b/reference/constraints/Image.rst
@@ -99,7 +99,7 @@ that it is between a certain size, add the following:
     .. code-block:: yaml
 
         # src/AppBundle/Resources/config/validation.yml
-        AppBundle\Entity\Author
+        AppBundle\Entity\Author:
             properties:
                 headshot:
                     - Image:
diff --git a/reference/constraints/Isbn.rst b/reference/constraints/Isbn.rst
@@ -38,8 +38,8 @@ on an object that will contain an ISBN.
         {
             /**
              * @Assert\Isbn(
-             *     type = isbn10,
-             *     message: This value is not  valid.
+             *     type = "isbn10",
+             *     message = "This value is not  valid."
              * )
              */
             protected $isbn;
@@ -89,7 +89,7 @@ on an object that will contain an ISBN.
             public static function loadValidatorMetadata(ClassMetadata $metadata)
             {
                 $metadata->addPropertyConstraint('isbn', new Assert\Isbn(array(
-                    'type'    => isbn10,
+                    'type'    => 'isbn10',
                     'message' => 'This value is not valid.'
                 )));
             }
