Add support for Symfony 6 (#367)

sonata-project · Sep 19, 2021 · f6260cd · f6260cd
1 parent 00415db
commit f6260cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -21,14 +21,14 @@
     ],
     "require": {
         "php": "^7.3 || ^8.0",
-        "symfony/config": "^3.4 || ^4.4 || ^5.0",
-        "symfony/dependency-injection": "^3.4 || ^4.4 || ^5.0",
-        "symfony/form": "^3.4 || ^4.4 || ^5.0",
-        "symfony/http-kernel": "^3.4 || ^4.4 || ^5.0"
+        "symfony/config": "^3.4 || ^4.4 || ^5.3 || ^6.0",
+        "symfony/dependency-injection": "^3.4 || ^4.4 || ^5.3 || ^6.0",
+        "symfony/form": "^3.4 || ^4.4 || ^5.3 || ^6.0",
+        "symfony/http-kernel": "^3.4 || ^4.4 || ^5.3 || ^6.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.4",
-        "symfony/phpunit-bridge": "^5.1.8"
+        "symfony/phpunit-bridge": "^5.3 || ^6.0"
     },
     "config": {
         "sort-packages": true

diff --git a/tests/Datagrid/DatagridTest.php b/tests/Datagrid/DatagridTest.php
@@ -21,6 +21,7 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormFactoryInterface;
 
 class TestEntity
@@ -78,8 +79,10 @@ protected function setUp(): void
 
         $this->formBuilder
             ->method('add')
-            ->willReturnCallback(function ($name, $type, $options) use ($eventDispatcher, $formFactory): void {
+            ->willReturnCallback(function ($name, $type, $options) use ($eventDispatcher, $formFactory): FormBuilderInterface {
                 $this->formTypes[$name] = new FormBuilder($name, TestEntity::class, $eventDispatcher, $formFactory, $options);
+
+                return $this->formBuilder;
             });
 
         $form = $this->createMock(Form::class);