Merge branch '2.3' into 2.7

* 2.3:
  [#6228] backport to the 2.3 branch
  Replace references of PSR-0 with PSR-4
  Update testing.rst
  Typo in default session save_path
  Update major_version.rst

Author: xabbuh

book/testing.rst

@@ -869,7 +869,7 @@ section:
 Learn more
 ----------
 
-* The :doc:`chapter about tests in the Symfony Framework Best Practices </best_practices/tests>`
+* :doc:`The chapter about tests in the Symfony Framework Best Practices </best_practices/tests>`
 * :doc:`/components/dom_crawler`
 * :doc:`/components/css_selector`
 * :doc:`/cookbook/testing/http_authentication`

cookbook/security/entity_provider.rst

@@ -433,30 +433,19 @@ interface requires three methods: ``loadUserByUsername($username)``,
 
     use Symfony\Component\Security\Core\User\UserInterface;
     use Symfony\Component\Security\Core\User\UserProviderInterface;
-    use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
     use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
     use Doctrine\ORM\EntityRepository;
 
     class UserRepository extends EntityRepository implements UserProviderInterface
     {
         public function loadUserByUsername($username)
         {
-            $user = $this->createQueryBuilder('u')
+            return $this->createQueryBuilder('u')
                 ->where('u.username = :username OR u.email = :email')
                 ->setParameter('username', $username)
                 ->setParameter('email', $username)
                 ->getQuery()
                 ->getOneOrNullResult();
-
-            if (null === $user) {
-                $message = sprintf(
-                    'Unable to find an active admin AppBundle:User object identified by "%s".',
-                    $username
-                );
-                throw new UsernameNotFoundException($message);
-            }
-
-            return $user;
         }
 
         public function refreshUser(UserInterface $user)

cookbook/upgrade/major_version.rst

@@ -134,7 +134,7 @@ Next, use Composer to download new versions of the libraries:
 
 .. code-block:: bash
 
-    $ composer update --with-dependencies symfony/symfony
+    $ composer update symfony/symfony
 
 .. include:: /cookbook/upgrade/_update_dep_errors.rst.inc
 

create_framework/http_foundation.rst

@@ -138,7 +138,7 @@ version may vary).
     ``vendor/autoload.php`` file that allows any class to be easily
     `autoloaded`_. Without autoloading, you would need to require the file
     where a class is defined before being able to use it. But thanks to
-    `PSR-0`_, we can just let Composer and PHP do the hard work for us.
+    `PSR-4`_, we can just let Composer and PHP do the hard work for us.
 
 Now, let's rewrite our application by using the ``Request`` and the
 ``Response`` classes::
@@ -309,5 +309,5 @@ applications using it (like `Symfony`_, `Drupal 8`_, `phpBB 4`_, `ezPublish
 .. _`Midgard CMS`: http://www.midgard-project.org/
 .. _`Zikula`: http://zikula.org/
 .. _`autoloaded`: http://php.net/autoload
-.. _`PSR-0`: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+.. _`PSR-4`: http://www.php-fig.org/psr/psr-4/
 .. _`more`: http://symfony.com/components/HttpFoundation

reference/configuration/framework.rst

@@ -808,7 +808,7 @@ start and depends on `gc_divisor`_ and `gc_probability`_.
 save_path
 .........
 
-**type**: ``string`` **default**: ``%kernel.cache.dir%/sessions``
+**type**: ``string`` **default**: ``%kernel.cache_dir%/sessions``
 
 This determines the argument to be passed to the save handler. If you choose
 the default file handler, this is the path where the session files are created.