Merge remote-tracking branch 'upstream/2.7' into 2.7

Author: javiereguiluz

contributing/code/core_team.rst

@@ -81,7 +81,10 @@ Active Core Members
     components and the SecurityBundle_;
 
   * **Maxime Steinhausser** (`ogizanagi`_) can merge into Config_, Console_,
-    Form_, Serializer_, DependencyInjection_, and HttpKernel_ components.
+    Form_, Serializer_, DependencyInjection_, and HttpKernel_ components;
+
+  * **Tobias Nyholm** (`Nyholm`) manages the official and contrib recipes
+    repositories.
 
 * **Deciders** (``@symfony/deciders`` on GitHub):
 
@@ -223,4 +226,4 @@ discretion of the **Project Leader**.
 .. _`lyrixx`: https://github.com/lyrixx/
 .. _`chalasr`: https://github.com/chalasr/
 .. _`ogizanagi`: https://github.com/ogizanagi/
-.. _`csarrazi`: https://github.com/csarrazi/
+.. _`Nyholm`: https://github.com/Nyholm

contributing/code/patches.rst

@@ -157,6 +157,22 @@ Then create a new branch off the ``2.7`` branch to work on the bugfix:
 The above checkout commands automatically switch the code to the newly created
 branch (check the branch you are working on with ``git branch``).
 
+Use your Branch in an Existing Project
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you want to test your code in an existing project that uses ``symfony/symfony``
+or Symfony components, you can use the ``link`` utility provided in the Git repository
+you cloned previously.
+This tool scans the ``vendor/`` directory of your project, finds Symfony packages it
+uses, and replaces them by symbolic links to the ones in the Git repository.
+
+.. code-block:: terminal
+
+    $ php link /path/to/your/project
+
+Before running the ``link`` command, be sure that the dependencies of the project you
+want to debug are installed by running ``composer install`` inside it.
+
 Work on your Patch
 ~~~~~~~~~~~~~~~~~~
 

deployment.rst

@@ -78,13 +78,15 @@ Using Build Scripts and other Tools
 There are also tools to help ease the pain of deployment. Some of them have been
 specifically tailored to the requirements of Symfony.
 
-`Capistrano`_ with `Symfony plugin`_
-    `Capistrano`_ is a remote server automation and deployment tool written in Ruby.
-    `Symfony plugin`_ is a plugin to ease Symfony related tasks, inspired by `Capifony`_
-    (which works only with Capistrano 2).
+`EasyDeployBundle`_
+    A Symfony bundle that adds easy deploy tools to your application.
 
-`sf2debpkg`_
-    Helps you build a native Debian package for your Symfony project.
+`Deployer`_
+    This is another native PHP rewrite of Capistrano, with some ready recipes for
+    Symfony.
+
+`Ansistrano`_
+    An Ansible role that allows you to configure a powerful deploy via YAML files.
 
 `Magallanes`_
     This Capistrano-like deployment tool is built in PHP, and may be easier
@@ -94,13 +96,14 @@ specifically tailored to the requirements of Symfony.
     This Python-based library provides a basic suite of operations for executing
     local or remote shell commands and uploading/downloading files.
 
-`Deployer`_
-    This is another native PHP rewrite of Capistrano, with some ready recipes for
-    Symfony.
+`Capistrano`_ with `Symfony plugin`_
+    `Capistrano`_ is a remote server automation and deployment tool written in Ruby.
+    `Symfony plugin`_ is a plugin to ease Symfony related tasks, inspired by `Capifony`_
+    (which works only with Capistrano 2).
+
+`sf2debpkg`_
+    Helps you build a native Debian package for your Symfony project.
 
-Bundles
-    There are some `bundles that add deployment features`_ directly into your
-    Symfony console.
 
 Basic scripting
     You can of course use shell, `Ant`_ or any other build tool to script
@@ -212,10 +215,11 @@ other potential things like pushing assets to a CDN (see `Common Post-Deployment
 .. _`Capistrano`: http://capistranorb.com/
 .. _`sf2debpkg`: https://github.com/liip/sf2debpkg
 .. _`Fabric`: http://www.fabfile.org/
+.. _`Ansistrano`: https://ansistrano.com/
 .. _`Magallanes`: https://github.com/andres-montanez/Magallanes
 .. _`Ant`: http://blog.sznapka.pl/deploying-symfony2-applications-with-ant
-.. _`bundles that add deployment features`: https://github.com/search?utf8=✓&q=topic%3Asymfony-bundle+topic%3Adeploy&type=Repositories&ref=searchresults
 .. _`Memcached`: http://memcached.org/
 .. _`Redis`: http://redis.io/
 .. _`Symfony plugin`: https://github.com/capistrano/symfony/
 .. _`Deployer`: http://deployer.org/
+.. _`EasyDeployBundle`: https://github.com/EasyCorp/easy-deploy-bundle

doctrine/event_listeners_subscribers.rst

@@ -131,14 +131,14 @@ a ``postPersist()`` method, which will be called when the event is dispatched::
     {
         public function postPersist(LifecycleEventArgs $args)
         {
-            $object = $args->getObject();
+            $entity = $args->getEntity();
 
             // only act on some "Product" entity
-            if (!$object instanceof Product) {
+            if (!$entity instanceof Product) {
                 return;
             }
 
-            $objectManager = $args->getObjectManager();
+            $entityManager = $args->getEntityManager();
             // ... do something with the Product
         }
     }
@@ -195,7 +195,7 @@ interface and have an event method for each event it subscribes to::
 
         public function index(LifecycleEventArgs $args)
         {
-            $entity = $args->getObject();
+            $entity = $args->getEntity();
 
             // perhaps you only want to act on some "Product" entity
             if ($entity instanceof Product) {

form/without_class.rst

@@ -63,7 +63,7 @@ an array.
 Adding Validation
 ~~~~~~~~~~~~~~~~~
 
-The only missing piece is validation. Usually, when you call ``$form->isValid()``,
+The only missing piece is validation. Usually, when you call ``$form->handleRequest($request)``,
 the object is validated by reading the constraints that you applied to that
 class. If your form is mapped to an object (i.e. you're using the ``data_class``
 option or passing an object to your form), this is almost always the approach

performance.rst

@@ -79,14 +79,12 @@ real and absolute file system paths. This increases the performance for
 applications like Symfony that open many PHP files, especially on Windows
 systems.
 
-By default, PHP sets a ``realpath_cache_size`` of ``16K`` which is too low for
-Symfony. Consider updating this value at least to ``4096K``. In addition, cached
-paths are only stored for ``120`` seconds by default. Consider updating this
-value too using the ``realpath_cache_ttl`` option:
+Consider increasing the ``realpath_cache_size`` and ``realpath_cache_ttl``:
 
 .. code-block:: ini
 
     ; php.ini
+    ; 4096k is the default value in PHP 7.2
     realpath_cache_size=4096K
     realpath_cache_ttl=600
 

reference/constraints/Expression.rst

@@ -60,15 +60,6 @@ One way to accomplish this is with the Expression constraint:
 
 .. configuration-block::
 
-    .. code-block:: yaml
-
-        # src/AppBundle/Resources/config/validation.yml
-        AppBundle\Model\BlogPost:
-            constraints:
-                - Expression:
-                    expression: "this.getCategory() in ['php', 'symfony'] or !this.isTechnicalPost()"
-                    message: "If this is a tech post, the category should be either php or symfony!"
-
     .. code-block:: php-annotations
 
         // src/AppBundle/Model/BlogPost.php
@@ -87,6 +78,15 @@ One way to accomplish this is with the Expression constraint:
             // ...
         }
 
+    .. code-block:: yaml
+
+        # src/AppBundle/Resources/config/validation.yml
+        AppBundle\Model\BlogPost:
+            constraints:
+                - Expression:
+                    expression: "this.getCategory() in ['php', 'symfony'] or !this.isTechnicalPost()"
+                    message: "If this is a tech post, the category should be either php or symfony!"
+
     .. code-block:: xml
 
         <!-- src/AppBundle/Resources/config/validation.xml -->
@@ -141,16 +141,6 @@ more about the expression language syntax, see
 
     .. configuration-block::
 
-        .. code-block:: yaml
-
-            # src/AppBundle/Resources/config/validation.yml
-            AppBundle\Model\BlogPost:
-                properties:
-                    isTechnicalPost:
-                        - Expression:
-                            expression: "this.getCategory() in ['php', 'symfony'] or value == false"
-                            message: "If this is a tech post, the category should be either php or symfony!"
-
         .. code-block:: php-annotations
 
             // src/AppBundle/Model/BlogPost.php
@@ -173,6 +163,16 @@ more about the expression language syntax, see
                 // ...
             }
 
+        .. code-block:: yaml
+
+            # src/AppBundle/Resources/config/validation.yml
+            AppBundle\Model\BlogPost:
+                properties:
+                    isTechnicalPost:
+                        - Expression:
+                            expression: "this.getCategory() in ['php', 'symfony'] or value == false"
+                            message: "If this is a tech post, the category should be either php or symfony!"
+
         .. code-block:: xml
 
             <!-- src/AppBundle/Resources/config/validation.xml -->

service_container.rst

@@ -60,7 +60,7 @@ Find out by running:
 
 .. code-block:: terminal
 
-     $ php bin/console debug:container
+     $ php app/console debug:container
 
 This is just a *small* sample of the output:
 
@@ -222,7 +222,7 @@ and set it on a ``$logger`` property::
 
     The ``LoggerInterface`` type-hint in the ``__construct()`` method is optional,
     but a good idea. You can find the correct type-hint by reading the docs for the
-    service or by using the ``php bin/console debug:container`` console command.
+    service or by using the ``php app/console debug:container`` console command.
 
 Next, tell the container the service has a constructor argument: