Skip to content

Commit a7e4c1c

Browse files
committed
Merge branch '4.4'
* 4.4: Add Product dependency in fixtures example code Removed the Action suffix in a controller method name fix typo
2 parents 1de98f9 + df71809 commit a7e4c1c

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

components/phpunit_bridge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ deprecations but:
255255
* forget to mark appropriate tests with the ``@group legacy`` annotations.
256256

257257
By using ``SYMFONY_DEPRECATIONS_HELPER=max[self]=0``, deprecations that are
258-
triggered outside the ``vendors`` directory will be accounted for seperately,
258+
triggered outside the ``vendors`` directory will be accounted for separately,
259259
while deprecations triggered from a library inside it will not (unless you reach
260260
999999 of these), giving you the best of both worlds.
261261

forms.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ use the ``createForm()`` helper (otherwise, use the ``create()`` method of the
200200

201201
// src/Controller/TaskController.php
202202
namespace App\Controller;
203-
203+
204204
use App\Form\Type\TaskType;
205205
// ...
206206

@@ -232,7 +232,7 @@ the ``data_class`` option by adding the following to your form type class::
232232

233233
// src/Form/Type/TaskType.php
234234
namespace App\Form\Type;
235-
235+
236236
use App\Entity\Task;
237237
use Symfony\Component\OptionsResolver\OptionsResolver;
238238
// ...
@@ -524,7 +524,7 @@ object.
524524
525525
// src/Entity/Task.php
526526
namespace App\Entity;
527-
527+
528528
use Symfony\Component\Validator\Constraints\NotBlank;
529529
use Symfony\Component\Validator\Constraints\Type;
530530
use Symfony\Component\Validator\Mapping\ClassMetadata;
@@ -562,7 +562,7 @@ argument of ``createForm()``::
562562

563563
// src/Controller/TaskController.php
564564
namespace App\Controller;
565-
565+
566566
use App\Form\Type\TaskType;
567567
// ...
568568

@@ -588,7 +588,7 @@ options they accept using the ``configureOptions()`` method::
588588

589589
// src/Form/Type/TaskType.php
590590
namespace App\Form\Type;
591-
591+
592592
use Symfony\Component\OptionsResolver\OptionsResolver;
593593
// ...
594594

@@ -769,13 +769,13 @@ method::
769769

770770
// src/Controller/TaskController.php
771771
namespace App\Controller;
772-
772+
773773
use App\Form\TaskType;
774774
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
775775

776776
class TaskController extends AbstractController
777777
{
778-
public function newAction()
778+
public function new()
779779
{
780780
$task = ...;
781781
$form = $this->get('form.factory')->createNamed('my_name', TaskType::class, $task);

testing/database.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ Customize the new class to load ``Product`` objects into Doctrine::
9191
// src/DataFixtures/ProductFixture.php
9292
namespace App\DataFixtures;
9393

94+
use App\Entity\Product;
9495
use Doctrine\Bundle\FixturesBundle\Fixture;
9596
use Doctrine\Common\Persistence\ObjectManager;
9697

0 commit comments

Comments
 (0)