Merge branch '3.0'

* 3.0:
  [#6228] backport to the 2.3 branch
  Update form_collections.rst
  removed unnecesary exception form repository
  Replace references of PSR-0 with PSR-4
  change translation getMessages() to getCatalogue()
  Remove 2.3.* from composer snippets in the form component doc
  Update testing.rst
  add versionadded directive for range type
  Typo in default session save_path
  [book] fixes typo about redirect status codes in the controller chapter.
  Update major_version.rst
  fix types
  Revert "revert form login CSRF changes on wrong branch"
  revert form login CSRF changes on wrong branch

Author: xabbuh

book/controller.rst

@@ -438,7 +438,7 @@ If you want to redirect the user to another page, use the ``redirectToRoute()``
         return $this->redirectToRoute('homepage');
 
         // redirectToRoute is equivalent to using redirect() and generateUrl() together:
-        // return $this->redirect($this->generateUrl('homepage'), 301);
+        // return $this->redirect($this->generateUrl('homepage'));
     }
 
 Or, if you want to redirect externally, just use ``redirect()`` and pass it the URL::

book/testing.rst

@@ -860,7 +860,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`

components/form/introduction.rst

@@ -163,14 +163,14 @@ component offers a rich integration.
 
 To use the integration, you'll need the ``TwigBridge``, which provides integration
 between Twig and several Symfony components. If you're using Composer, you
-could install the latest 2.3 version by adding the following ``require``
+could install the latest 3.x version by adding the following ``require``
 line to your ``composer.json`` file:
 
 .. code-block:: json
 
     {
         "require": {
-            "symfony/twig-bridge": "2.3.*"
+            "symfony/twig-bridge": "~3.0"
         }
     }
 
@@ -243,15 +243,15 @@ via your own Twig extension.
 
 To use the built-in integration, be sure that your project has Symfony's
 Translation and :doc:`Config </components/config/introduction>` components
-installed. If you're using Composer, you could get the latest 2.3 version
+installed. If you're using Composer, you could get the latest 3.x version
 of each of these by adding the following to your ``composer.json`` file:
 
 .. code-block:: json
 
     {
         "require": {
-            "symfony/translation": "2.3.*",
-            "symfony/config": "2.3.*"
+            "symfony/translation": "~3.0",
+            "symfony/config": "~3.0"
         }
     }
 
@@ -295,13 +295,13 @@ array or object) and pass it through your own validation system.
 
 To use the integration with Symfony's Validator component, first make sure
 it's installed in your application. If you're using Composer and want to
-install the latest 2.3 version, add this to your ``composer.json``:
+install the latest 3.x version, add this to your ``composer.json``:
 
 .. code-block:: json
 
     {
         "require": {
-            "symfony/validator": "2.3.*"
+            "symfony/validator": "~3.0"
         }
     }
 

components/translation/usage.rst

@@ -376,7 +376,11 @@ In case you want to use the same translation catalogue outside your application
 (e.g. use translation on the client side), it's possible to fetch raw translation
 messages. Just specify the required locale::
 
-    $messages = $translator->getMessages('fr_FR');
+    $catalogue = $translator->getCatalogue('fr_FR');
+    $messages = $catalogue->all();
+    while ($catalogue = $catalogue->getFallbackCatalogue()) {
+        $messages = array_replace_recursive($catalogue->all(), $messages);
+    }
 
 The ``$messages`` variable will have the following structure::
 

cookbook/form/form_collections.rst

@@ -689,7 +689,7 @@ the relationship between the removed ``Tag`` and ``Task`` object.
                 $originalTags->add($tag);
             }
 
-            $editForm = $this->createForm(new TaskType::class, $task);
+            $editForm = $this->createForm(TaskType::class, $task);
 
             $editForm->handleRequest($request);
 

cookbook/form/unit_testing.rst

@@ -52,7 +52,7 @@ The simplest ``TypeTestCase`` implementation looks like the following::
                 'test2' => 'test2',
             );
 
-            $type = new TestedType();
+            $type = TestedType::class;
             $form = $this->factory->create($type);
 
             $object = TestObject::fromArray($formData);
@@ -78,7 +78,7 @@ First you verify if the ``FormType`` compiles. This includes basic class
 inheritance, the ``buildForm`` function and options resolution. This should
 be the first test you write::
 
-    $type = new TestedType();
+    $type = TestedType::class;
     $form = $this->factory->create($type);
 
 This test checks that none of your data transformers used by the form
@@ -139,7 +139,7 @@ before creating the parent form using the ``PreloadedExtension`` class::
     {
         protected function getExtensions()
         {
-            $childType = new TestChildType();
+            $childType = TestChildType::class;
 
             return array(new PreloadedExtension(array(
                 $childType->getName() => $childType,
@@ -148,7 +148,7 @@ before creating the parent form using the ``PreloadedExtension`` class::
 
         public function testSubmitValidData()
         {
-            $type = new TestedType();
+            $type = TestedType::class;
             $form = $this->factory->create($type);
 
             // ... your test

cookbook/security/entity_provider.rst

@@ -430,29 +430,18 @@ interface only requires one method: ``loadUserByUsername($username)``::
 
     use Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface;
     use Symfony\Component\Security\Core\User\UserInterface;
-    use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
     use Doctrine\ORM\EntityRepository;
 
     class UserRepository extends EntityRepository implements UserLoaderInterface
     {
         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;
         }
     }
 

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.