Merge pull request #29 from GawainLynch/symfony-5

Symfony 5
hostnet · Mar 6, 2020 · e8e7a78 · e8e7a78
2 parents 0d2cb34 + 55fe584
commit e8e7a78
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -14,14 +14,14 @@
     ],
     "require": {
         "php":                     "^7.2",
-        "symfony/form":            "^4.0",
-        "symfony/http-foundation": "^4.0"
+        "symfony/form":            "^4.0||^5.0",
+        "symfony/http-foundation": "^4.0||^5.0"
     },
     "require-dev": {
         "hostnet/phpcs-tool":     "^8.3.11",
         "phpunit/phpunit":        "^8.0",
-        "symfony/debug":          "^4.0",
-        "symfony/phpunit-bridge": "^4.0"
+        "symfony/debug":          "^4.0||^5.0",
+        "symfony/phpunit-bridge": "^4.0||^5.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

diff --git a/test/Form/Simple/SimpleFormProviderTest.php b/test/Form/Simple/SimpleFormProviderTest.php
@@ -10,6 +10,7 @@
 use Hostnet\Component\Form\FormHandlerInterface;
 use Hostnet\Component\Form\NamedFormHandlerInterface;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -125,6 +126,11 @@ public function testNoForm(): void
             ->method('setForm')
             ->with($this->form);
 
+        $this->handler
+            ->expects(self::once())
+            ->method('getType')
+            ->willReturn(FormType::class);
+
         $provider = new SimpleFormProvider($this->factory);
         $provider->handle(new Request(), $this->handler);
     }
@@ -152,6 +158,11 @@ public function testNamedForm(): void
             ->method('setForm')
             ->with($this->form);
 
+        $named_handler
+            ->expects(self::once())
+            ->method('getType')
+            ->willReturn(FormType::class);
+
         $provider = new SimpleFormProvider($this->factory);
         $provider->handle(new Request(), $named_handler);
     }
@@ -179,6 +190,11 @@ public function testNamedFormWithNoName(): void
             ->method('setForm')
             ->with($this->form);
 
+        $named_handler
+            ->expects(self::once())
+            ->method('getType')
+            ->willReturn(FormType::class);
+
         $provider = new SimpleFormProvider($this->factory);
         $provider->handle(new Request(), $named_handler);
     }
@@ -190,6 +206,11 @@ public function testNoFormNotFound(): void
             ->method('getOptions')
             ->willReturn([]);
 
+        $this->handler
+            ->expects(self::any())
+            ->method('getType')
+            ->willReturn(FormType::class);
+
         $provider = new SimpleFormProvider($this->factory);
 
         $this->expectException(FormNotFoundException::class);

diff --git a/test/FormHandler/HandlerTypeAdapterTest.php b/test/FormHandler/HandlerTypeAdapterTest.php
@@ -12,7 +12,6 @@
 use Hostnet\Component\FormHandler\Fixtures\TestType;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 
 /**