Merge branch '4.0'

* 4.0:
  Adding a documentation page about Bootstrap 4 form theme
  Ask users to create two commits for reproducers
  Improved variable naming

Author: javiereguiluz

components/cache.rst

@@ -60,43 +60,43 @@ instantiate :class:`Symfony\\Component\\Cache\\Simple\\FilesystemCache`::
 Now you can create, retrieve, update and delete items using this object::
 
     // save a new item in the cache
-    $cache->set('stats.num_products', 4711);
+    $cache->set('stats.products_count', 4711);
 
     // or set it with a custom ttl
-    // $cache->set('stats.num_products', 4711, 3600);
+    // $cache->set('stats.products_count', 4711, 3600);
 
     // retrieve the cache item
-    if (!$cache->has('stats.num_products')) {
+    if (!$cache->has('stats.products_count')) {
         // ... item does not exists in the cache
     }
 
     // retrieve the value stored by the item
-    $numProducts = $cache->get('stats.num_products');
+    $productsCount = $cache->get('stats.products_count');
 
     // or specify a default value, if the key doesn't exist
-    // $numProducts = $cache->get('stats.num_products', 100);
+    // $productsCount = $cache->get('stats.products_count', 100);
 
     // remove the cache key
-    $cache->delete('stats.num_products');
+    $cache->delete('stats.products_count');
 
     // clear *all* cache keys
     $cache->clear();
 
 You can also work with multiple items at once::
 
     $cache->setMultiple(array(
-        'stats.num_products' => 4711,
-        'stats.num_users' => 1356,
+        'stats.products_count' => 4711,
+        'stats.users_count' => 1356,
     ));
 
     $stats = $cache->getMultiple(array(
-        'stats.num_products',
-        'stats.num_users',
+        'stats.products_count',
+        'stats.users_count',
     ));
 
     $cache->deleteMultiple(array(
-        'stats.num_products',
-        'stats.num_users',
+        'stats.products_count',
+        'stats.users_count',
     ));
 
 Available Simple Cache (PSR-16) Classes
@@ -159,22 +159,22 @@ a filesystem-based cache, instantiate :class:`Symfony\\Component\\Cache\\Adapter
 Now you can create, retrieve, update and delete items using this cache pool::
 
     // create a new item by trying to get it from the cache
-    $numProducts = $cache->getItem('stats.num_products');
+    $productsCount = $cache->getItem('stats.products_count');
 
     // assign a value to the item and save it
-    $numProducts->set(4711);
-    $cache->save($numProducts);
+    $productsCount->set(4711);
+    $cache->save($productsCount);
 
     // retrieve the cache item
-    $numProducts = $cache->getItem('stats.num_products');
-    if (!$numProducts->isHit()) {
+    $productsCount = $cache->getItem('stats.products_count');
+    if (!$productsCount->isHit()) {
         // ... item does not exists in the cache
     }
     // retrieve the value stored by the item
-    $total = $numProducts->get();
+    $total = $productsCount->get();
 
     // remove the cache item
-    $cache->deleteItem('stats.num_products');
+    $cache->deleteItem('stats.products_count');
 
 For a list of all of the supported adapters, see :doc:`/components/cache/cache_pools`.
 

components/cache/adapters/doctrine_adapter.rst

@@ -20,7 +20,7 @@ third parameters::
 
     $provider = new SQLite3Cache(new \SQLite3(__DIR__.'/cache/data.sqlite'), 'youTableName');
 
-    $symfonyCache = new DoctrineAdapter(
+    $cache = new DoctrineAdapter(
 
         // a cache provider instance
         CacheProvider $provider,

components/cache/adapters/php_array_cache_adapter.rst

@@ -15,8 +15,8 @@ that is optimized and preloaded into OPcache memory storage::
     if ($needsWarmup) {
         // some static values
         $values = array(
-            'stats.num_products' => 4711,
-            'stats.num_users' => 1356,
+            'stats.products_count' => 4711,
+            'stats.users_count' => 1356,
         );
 
         $cache = new PhpArrayAdapter(
@@ -29,7 +29,7 @@ that is optimized and preloaded into OPcache memory storage::
     }
 
     // ... then, use the cache!
-    $cacheItem = $cache->getItem('stats.num_users');
+    $cacheItem = $cache->getItem('stats.users_count');
     echo $cacheItem->get();
 
 .. note::

components/cache/cache_items.rst

@@ -31,21 +31,21 @@ Cache items are created with the ``getItem($key)`` method of the cache pool. The
 argument is the key of the item::
 
     // $cache pool object was created before
-    $numProducts = $cache->getItem('stats.num_products');
+    $productsCount = $cache->getItem('stats.products_count');
 
 Then, use the :method:`Psr\\Cache\\CacheItemInterface::set` method to set
 the data stored in the cache item::
 
     // storing a simple integer
-    $numProducts->set(4711);
-    $cache->save($numProducts);
+    $productsCount->set(4711);
+    $cache->save($productsCount);
 
     // storing an array
-    $numProducts->set(array(
+    $productsCount->set(array(
         'category1' => 4711,
         'category2' => 2387,
     ));
-    $cache->save($numProducts);
+    $cache->save($productsCount);
 
 The key and the value of any given cache item can be obtained with the
 corresponding *getter* methods::

components/filesystem.rst

@@ -222,10 +222,10 @@ The :method:`Symfony\\Component\\Filesystem\\Filesystem::readlink` method provid
 by the Filesystem component always behaves in the same way::
 
     // returns the next direct target of the link without considering the existence of the target
-    $fs->readlink('/path/to/link');
+    $fileSystem->readlink('/path/to/link');
 
     // returns its absolute fully resolved final version of the target (if there are nested links, they are resolved)
-    $fs->readlink('/path/to/link', true);
+    $fileSystem->readlink('/path/to/link', true);
 
 Its behavior is the following::
 
@@ -297,7 +297,7 @@ appendToFile
 :method:`Symfony\\Component\\Filesystem\\Filesystem::appendToFile` adds new
 contents at the end of some file::
 
-    $fs->appendToFile('logs.txt', 'Email sent to [email protected]');
+    $fileSystem->appendToFile('logs.txt', 'Email sent to [email protected]');
 
 If either the file or its containing directory doesn't exist, this method
 creates them before appending the contents.

components/ldap.rst

@@ -118,19 +118,19 @@ delete existing ones::
         'objectClass' => array('inetOrgPerson'),
     ));
 
-    $em = $ldap->getEntryManager();
+    $entityManager = $ldap->getEntryManager();
 
     // Creating a new entry
-    $em->add($entry);
+    $entityManager->add($entry);
 
     // Finding and updating an existing entry
     $query = $ldap->query('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))');
     $result = $query->execute();
     $entry = $result[0];
     $entry->setAttribute('email', array('[email protected]'));
-    $em->update($entry);
+    $entityManager->update($entry);
 
     // Removing an existing entry
-    $em->remove(new Entry('cn=Test User,dc=symfony,dc=com'));
+    $entityManager->remove(new Entry('cn=Test User,dc=symfony,dc=com'));
 
 .. _Packagist: https://packagist.org/packages/symfony/ldap

components/routing.rst

@@ -405,8 +405,8 @@ routes with UTF-8 characters:
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
-        $collection = new RouteCollection();
-        $collection->add('route1', new Route('/category/{name}',
+        $routes = new RouteCollection();
+        $routes->add('route1', new Route('/category/{name}',
             array(
                 '_controller' => 'App\Controller\DefaultController::category',
             ),
@@ -418,7 +418,7 @@ routes with UTF-8 characters:
 
         // ...
 
-        return $collection;
+        return $routes;
 
 In this route, the ``utf8`` option set to ``true`` makes Symfony consider the
 ``.`` requirement to match any UTF-8 characters instead of just a single
@@ -482,8 +482,8 @@ You can also include UTF-8 strings as routing requirements:
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
-        $collection = new RouteCollection();
-        $collection->add('route2', new Route('/default/{default}',
+        $routes = new RouteCollection();
+        $routes->add('route2', new Route('/default/{default}',
             array(
                 '_controller' => 'App\Controller\DefaultController::default',
             ),
@@ -497,7 +497,7 @@ You can also include UTF-8 strings as routing requirements:
 
         // ...
 
-        return $collection;
+        return $routes;
 
 .. tip::
 

console/lazy_commands.rst

@@ -68,13 +68,13 @@ with command names as keys and service identifiers as values::
     use Symfony\Component\Console\CommandLoader\ContainerCommandLoader;
     use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-    $container = new ContainerBuilder();
-    $container->register(FooCommand::class, FooCommand::class);
-    $container->compile();
+    $containerBuilder = new ContainerBuilder();
+    $containerBuilder->register(FooCommand::class, FooCommand::class);
+    $containerBuilder->compile();
 
-    $commandLoader = new ContainerCommandLoader($container, array(
+    $commandLoader = new ContainerCommandLoader($containerBuilder, array(
         'app:foo' => FooCommand::class,
     ));
 
 Like this, executing the ``app:foo`` command will load the ``FooCommand`` service
-by calling ``$container->get(FooCommand::class)``.
+by calling ``$containerBuilder->get(FooCommand::class)``.

contributing/code/reproducer.rst

@@ -35,19 +35,20 @@ Reproducing Complex Bugs
 If the bug is related to the Symfony Framework or if it's too complex to create
 a PHP script, it's better to reproduce the bug by creating a new project. To do so:
 
-1. Create a new project:
+#. Create a new project:
 
 .. code-block:: terminal
 
     $ composer create-project symfony/skeleton bug_app
 
-2. Now you must add the minimum amount of code to reproduce the bug. This is the
+#. Add and commit the changes generated by Symfony.
+#. Now you must add the minimum amount of code to reproduce the bug. This is the
    trickiest part and it's explained a bit more later.
-3. Add and commit your changes.
-4. Create a `new repository`_ on GitHub (give it any name).
-5. Follow the instructions on GitHub to add the ``origin`` remote to your local project
+#. Add and commit your changes.
+#. Create a `new repository`_ on GitHub (give it any name).
+#. Follow the instructions on GitHub to add the ``origin`` remote to your local project
    and push it.
-6. Add a comment in your original issue report to share the URL of your forked
+#. Add a comment in your original issue report to share the URL of your forked
    project (e.g. ``https://github.com/YOUR-GITHUB-USERNAME/symfony_issue_23567``)
    and, if necessary, explain the steps to reproduce (e.g. "browse this URL",
    "fill in this data in the form and submit it", etc.)

event_dispatcher/method_behavior.rst

@@ -121,10 +121,10 @@ could listen to the ``mailer.post_send`` event and change the method's return va
     {
         public function onMailerPostSend(AfterSendMailEvent $event)
         {
-            $ret = $event->getReturnValue();
-            // modify the original ``$ret`` value
+            $returnValue = $event->getReturnValue();
+            // modify the original ``$returnValue`` value
 
-            $event->setReturnValue($ret);
+            $event->setReturnValue($returnValue);
         }
 
         public static function getSubscribedEvents()

form/create_custom_field_type.rst

@@ -296,14 +296,14 @@ add a ``__construct()`` method like normal::
 
     class ShippingType extends AbstractType
     {
-        private $em;
+        private $entityManager;
 
-        public function __construct(EntityManagerInterface $em)
+        public function __construct(EntityManagerInterface $entityManager)
         {
-            $this->em = $em;
+            $this->entityManager = $entityManager;
         }
 
-        // use $this->em down anywhere you want ...
+        // use $this->entityManager down anywhere you want ...
     }
 
 If you're using the default ``services.yaml`` configuration (i.e. services from the

form/form_dependencies.rst

@@ -36,11 +36,11 @@ create your form::
     // ...
     public function new()
     {
-        $em = $this->getDoctrine()->getManager();
+        $entityManager = $this->getDoctrine()->getManager();
 
         $task = ...;
         $form = $this->createForm(TaskType::class, $task, array(
-            'entity_manager' => $em,
+            'entity_manager' => $entityManager,
         ));
 
         // ...

form/unit_testing.rst

@@ -57,8 +57,9 @@ The simplest ``TypeTestCase`` implementation looks like the following::
             // submit the data to the form directly
             $form->submit($formData);
 
-            $objectToCompare = $form->getData();
             $this->assertTrue($form->isSynchronized());
+
+            // check that $objectToCompare was modified as expected when the form was submitted
             $this->assertEquals($object, $objectToCompare);
 
             $view = $form->createView();

security/form_login_setup.rst

@@ -144,13 +144,17 @@ Great! Next, add the logic to ``login()`` that displays the login form::
     // src/Controller/SecurityController.php
     use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
 
+<<<<<<< HEAD
     public function login(Request $request, AuthenticationUtils $authUtils)
+=======
+    public function loginAction(Request $request, AuthenticationUtils $authenticationUtils)
+>>>>>>> 3.4
     {
         // get the login error if there is one
-        $error = $authUtils->getLastAuthenticationError();
+        $error = $authenticationUtils->getLastAuthenticationError();
 
         // last username entered by the user
-        $lastUsername = $authUtils->getLastUsername();
+        $lastUsername = $authenticationUtils->getLastUsername();
 
         return $this->render('security/login.html.twig', array(
             'last_username' => $lastUsername,
@@ -160,10 +164,16 @@ Great! Next, add the logic to ``login()`` that displays the login form::
 
 .. note::
 
+<<<<<<< HEAD
     If you get an error that the ``$authUtils`` argument is missing, it's
     probably because the controllers of your application are not defined as
     services and tagged with the ``controller.service_arguments`` tag, as done
     in the :ref:`default services.yaml configuration <service-container-services-load-example>`.
+=======
+    If you get an error that the ``$authenticationUtils`` argument is missing,
+    it's probably because you need to activate this new feature in Symfony 3.4.
+    See this :ref:`controller service argument note <controller-service-arguments-tag>`.
+>>>>>>> 3.4
 
 Don't let this controller confuse you. As you'll see in a moment, when the
 user submits the form, the security system automatically handles the form

security/json_login_setup.rst

@@ -110,12 +110,12 @@ path:
         use Symfony\Component\Routing\RouteCollection;
         use Symfony\Component\Routing\Route;
 
-        $collection = new RouteCollection();
-        $collection->add('login', new Route('/login', array(
+        $routes = new RouteCollection();
+        $routes->add('login', new Route('/login', array(
             '_controller' => 'App\Controller\SecurityController::login',
         )));
 
-        return $collection;
+        return $routes;
 
 Don't let this empty controller confuse you. When you submit a ``POST`` request
 to the ``/login`` URL with the following JSON document as the body, the security

workflow/usage.rst

@@ -200,7 +200,7 @@ you can get the workflow by injecting the Workflow registry service::
             // Update the currentState on the post
             try {
                 $workflow->apply($post, 'to_review');
-            } catch (LogicException $e) {
+            } catch (LogicException $exception) {
                 // ... if the transition is not allowed
             }