Merge branch '2.8' into 3.4

javiereguiluz · javiereguiluz · commit 3f53b03b10b5 · 2018-03-11T18:39:56.000+01:00
* 2.8:
  Fix the explanation about registering commands
  Add a 2nd argument to create()
diff --git a/console.rst b/console.rst
@@ -64,10 +64,16 @@ method. Then you can optionally define a help message and the
 Registering the Command
 -----------------------
 
-Symfony commands must be registered as services and :doc:`tagged </service_container/tags>`
-with the ``console.command`` tag. If the PHP class of your command extends from
-:class:`Symfony\\Component\\Console\\Command\\Command`, Symfony does this for
-you automatically.
+Symfony commands must be registered before using them. In order to be registered
+automatically, a command must be:
+
+#. Stored in a directory called ``Command/``;
+#. Defined in a class whose name ends with ``Command``;
+#. Defined in a class that extends from
+   :class:`Symfony\\Component\\Console\\Command\\Command`.
+
+If you can't meet these conditions for some command, the alternative is to
+manually :doc`register the command as a service </console/commands_as_services>`.
 
 Executing the Command
 ---------------------
diff --git a/form/unit_testing.rst b/form/unit_testing.rst
@@ -47,16 +47,19 @@ The simplest ``TypeTestCase`` implementation looks like the following::
                 'test2' => 'test2',
             );
 
-            $form = $this->factory->create(TestedType::class);
+            $objectToCompare = new TestObject();
+            // $objectToCompare will retrieve data from the form submission; pass it as the second argument
+            $form = $this->factory->create(TestedType::class, $objectToCompare);
 
             $object = new TestObject();
             // ...populate $object properties with the data stored in $formData
 
             // submit the data to the form directly
             $form->submit($formData);
 
+            $objectToCompare = $form->getData();
             $this->assertTrue($form->isSynchronized());
-            $this->assertEquals($object, $form->getData());
+            $this->assertEquals($object, $objectToCompare);
 
             $view = $form->createView();
             $children = $view->children;
@@ -73,7 +76,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::
 
-    $form = $this->factory->create(TestedType::class);
+    $form = $this->factory->create(TestedType::class, $objectToCompare);
 
 This test checks that none of your data transformers used by the form
 failed. The :method:`Symfony\\Component\\Form\\FormInterface::isSynchronized`
@@ -91,7 +94,7 @@ method is only set to ``false`` if a data transformer throws an exception::
 Next, verify the submission and mapping of the form. The test below
 checks if all the fields are correctly specified::
 
-    $this->assertEquals($object, $form->getData());
+    $this->assertEquals($object, $objectToCompare);
 
 Finally, check the creation of the ``FormView``. You should check if all
 widgets you want to display are available in the children property::
