Merge branch '3.2'

* 3.2:
  Documented the getIterator() method
  [#7844] add XML and PHP config examples
  Property access
  fix remaining setDefinition() call
  mention old way to create PHPUnit mock objects
  Explain how to override the default templates directory
  Added a new article about linting translation files
  Removed any reference to X-Status-Code

Author: xabbuh

components/process.rst

@@ -65,6 +65,22 @@ for new output before going to the next iteration::
         }
     }
 
+.. tip::
+
+    The Process component internally uses a PHP iterator to get the output while
+    it is generated. That iterator is exposed via the ``getIterator()`` method
+    to allow customizing its behavior::
+
+        $process = new Process('ls -lsa');
+        $process->start();
+        $iterator = $process->getIterator($process::ITER_SKIP_ERR | $process::ITER_KEEP_OUTPUT);
+        foreach ($iterator as $data) {
+            echo $data."\n";
+        }
+
+    .. versionadded:: 3.2
+        The ``getIterator()`` method was introduced in Symfony 3.2.
+
 The ``mustRun()`` method is identical to ``run()``, except that it will throw
 a :class:`Symfony\\Component\\Process\\Exception\\ProcessFailedException`
 if the process couldn't be executed successfully (i.e. the process exited

configuration/override_dir_structure.rst

@@ -13,6 +13,8 @@ directory structure is:
     your-project/
     ├─ app/
     │  ├─ config/
+    │  ├─ Resources/
+    │  │  └─ views/
     │  └─ ...
     ├─ bin/
     │  └─ ...
@@ -86,6 +88,50 @@ method::
 
 Here you have changed the location of the directory to ``var/{environment}/logs``.
 
+.. _override-templates-dir:
+
+Override the Templates Directory
+--------------------------------
+
+If your templates are not stored in the default ``app/Resources/views/``
+directory, use the :ref:`twig.paths <config-twig-paths>` configuration option to
+define your own templates directory (or directories):
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/config.yml
+        twig:
+            # ...
+            paths: ["%kernel.root_dir%/../templates"]
+
+    .. code-block:: xml
+
+        <!-- app/config/config.xml -->
+        <?xml version="1.0" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:twig="http://symfony.com/schema/dic/twig"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/twig
+                http://symfony.com/schema/dic/twig/twig-1.0.xsd">
+
+            <twig:config>
+                <twig:path>%kernel.root_dir%/../templates</twig:path>
+            </twig:config>
+        </container>
+
+    .. code-block:: php
+
+        // app/config/config.php
+        $container->loadFromExtension('twig', array(
+            'paths' => array(
+                '%kernel.root_dir%/../templates',
+            ),
+        ));
+
 .. _override-web-dir:
 
 Override the ``web`` Directory

create_framework/unit_testing.rst

@@ -97,6 +97,9 @@ We are now ready to write our first test::
         private function getFrameworkForException($exception)
         {
             $matcher = $this->createMock(Routing\Matcher\UrlMatcherInterface::class);
+            // use getMock() on PHPUnit 5.3 or below
+            // $matcher = $this->getMock(Routing\Matcher\UrlMatcherInterface::class);
+
             $matcher
                 ->expects($this->once())
                 ->method('match')
@@ -155,6 +158,9 @@ Response::
     public function testControllerResponse()
     {
         $matcher = $this->createMock(Routing\Matcher\UrlMatcherInterface::class);
+        // use getMock() on PHPUnit 5.3 or below
+        // $matcher = $this->getMock(Routing\Matcher\UrlMatcherInterface::class);
+
         $matcher
             ->expects($this->once())
             ->method('match')

form/unit_testing.rst

@@ -184,6 +184,8 @@ allows you to return a list of extensions to register::
         protected function getExtensions()
         {
             $this->validator = $this->createMock(ValidatorInterface::class);
+            // use getMock() on PHPUnit 5.3 or below
+            // $this->validator = $this->getMock(ValidatorInterface::class);
             $this->validator
                 ->method('validate')
                 ->will($this->returnValue(new ConstraintViolationList()));

reference/configuration/twig.rst

@@ -248,6 +248,8 @@ on. Set it to ``0`` to disable all the optimizations. You can even enable or
 disable these optimizations selectively, as explained in the Twig documentation
 about `the optimizer extension`_.
 
+.. _config-twig-paths:
+
 paths
 ~~~~~
 

reference/events.rst

@@ -242,19 +242,8 @@ and set a new ``Exception`` object, or do nothing::
 
 .. note::
 
-    If you want to overwrite the status code (which you should do not without a good
-    reason), set the ``X-Status-Code`` header::
-
-        $response = new Response(
-            'Error',
-            404, // this status code will be ignored
-            array(
-                'X-Status-Code' => 200 // this status code will actually be sent to the client
-            )
-        );
-
-    If you do **not** set the ``X-Status-Code`` header, then Symfony uses the following
-    logic to determine the status code:
+    Symfony uses the following logic to determine the HTTP status code of the
+    response:
 
     * If :method:`Symfony\\Component\\HttpFoundation\\Response::isClientError`,
       :method:`Symfony\\Component\\HttpFoundation\\Response::isServerError` or

security/custom_authentication_provider.rst

@@ -460,7 +460,7 @@ to service ids that do not exist yet: ``wsse.security.authentication.provider``
             ))
             ->setPublic(false);
 
-        $container->setDefinition('wsse.security.authentication.listener', WsseListener::class)
+        $container->register('wsse.security.authentication.listener', WsseListener::class)
             ->setArguments(array(
                 new Reference('security.token_storage'),
                 new Reference('security.authentication.manager'),

testing/database.rst

@@ -75,6 +75,8 @@ it's easy to pass a mock object within a test::
         {
             // First, mock the object to be used in the test
             $employee = $this->createMock(Employee::class);
+            // use getMock() on PHPUnit 5.3 or below
+            // $employee = $this->getMock(Employee::class);
             $employee->expects($this->once())
                 ->method('getSalary')
                 ->will($this->returnValue(1000));