Merge branch '2.7' into 2.8

* 2.7:
  [#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/property_access.rst

@@ -259,23 +259,31 @@ can use setters, the magic ``__set()`` method or properties to set values::
             $this->lastName = $name;
         }
 
+        public function getLastName()
+        {
+            return $this->lastName;
+        }
+
+        public function getChildren()
+        {
+            return $this->children;
+        }
+
         public function __set($property, $value)
         {
             $this->$property = $value;
         }
-
-        // ...
     }
 
     $person = new Person();
 
     $accessor->setValue($person, 'firstName', 'Wouter');
-    $accessor->setValue($person, 'lastName', 'de Jong');
-    $accessor->setValue($person, 'children', array(new Person()));
+    $accessor->setValue($person, 'lastName', 'de Jong'); // setLastName is called
+    $accessor->setValue($person, 'children', array(new Person())); // __set is called
 
     var_dump($person->firstName); // 'Wouter'
     var_dump($person->getLastName()); // 'de Jong'
-    var_dump($person->children); // array(Person());
+    var_dump($person->getChildren()); // array(Person());
 
 You can also use ``__call()`` to set values but you need to enable the feature,
 see `Enable other Features`_.

configuration/override_dir_structure.rst

@@ -15,6 +15,8 @@ directory structure is:
     │  ├─ cache/
     │  ├─ config/
     │  ├─ logs/
+    │  ├─ Resources/
+    │  │  └─ views/
     │  └─ ...
     ├─ src/
     │  └─ ...
@@ -80,6 +82,50 @@ method::
 
 Here you have changed the location of the directory to ``app/{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

@@ -93,6 +93,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')
@@ -149,6 +152,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

@@ -189,6 +189,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

@@ -249,6 +249,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

@@ -241,19 +241,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

@@ -465,7 +465,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

@@ -71,6 +71,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));

translation/lint.rst

@@ -0,0 +1,31 @@
+.. index::
+    single: Translation; Lint
+    single: Translation; Translation File Errors
+
+How to Find Errors in Translation Files
+=======================================
+
+Symfony processes all the application translation files as part of the process
+that compiles the application code before executing it. If there's an error in
+any translation file, you'll see an error message explaining the problem.
+
+If you prefer, you can also validate the contents of any YAML translation file
+using the ``lint:yaml`` command:
+
+.. code-block:: terminal
+
+    # lint a single file
+    $ ./bin/console lint:yaml app/Resources/translations/messages.en.yml
+
+    # lint a whole directory
+    $ ./bin/console lint:yaml app/Resources/translations
+
+    # lint a specific bundle
+    $ ./bin/console lint:yaml @AppBundle
+
+The linter results can be exported to JSON using the ``--format`` option:
+
+.. code-block:: terminal
+
+    # lint a single file
+    $ ./bin/console lint:yaml app/Resources/translations --format=json