Support Symfony 5 (phiamo#1268)

deguif · web-flow · commit c66e63184e3d · 2020-10-07T14:13:15.000+02:00
* Support Symfony 5

* Fix wrong return type-hints
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ matrix:
   fast_finish: true
   include:
     - php: 7.2
+      env: SYMFONY_REQUIRE="^4.4"
     - php: 7.3
     - php: 7.4
 
@@ -15,6 +16,7 @@ cache:
 
 before_install:
   - composer self-update --preview
+  - composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
 
 install:
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
diff --git a/Form/Extension/DateTypeExtension.php b/Form/Extension/DateTypeExtension.php
@@ -72,7 +72,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             DateType::class,
diff --git a/Form/Extension/DatetimeTypeExtension.php b/Form/Extension/DatetimeTypeExtension.php
@@ -53,7 +53,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             DateTimeType::class,
diff --git a/Form/Extension/EmbedFormExtension.php b/Form/Extension/EmbedFormExtension.php
@@ -45,7 +45,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             FormType::class,
diff --git a/Form/Extension/ErrorTypeFormTypeExtension.php b/Form/Extension/ErrorTypeFormTypeExtension.php
@@ -60,7 +60,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             FormType::class,
diff --git a/Form/Extension/HelpFormTypeExtension.php b/Form/Extension/HelpFormTypeExtension.php
@@ -179,7 +179,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             FormType::class,
diff --git a/Form/Extension/IconButtonExtension.php b/Form/Extension/IconButtonExtension.php
@@ -47,7 +47,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             ButtonType::class,
diff --git a/Form/Extension/LayoutFormTypeExtension.php b/Form/Extension/LayoutFormTypeExtension.php
@@ -98,7 +98,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             FormType::class,
diff --git a/Form/Extension/LegendFormTypeExtension.php b/Form/Extension/LegendFormTypeExtension.php
@@ -77,7 +77,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             FormType::class,
diff --git a/Form/Extension/OffsetButtonExtension.php b/Form/Extension/OffsetButtonExtension.php
@@ -45,7 +45,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             ButtonType::class,
diff --git a/Form/Extension/StaticTextExtension.php b/Form/Extension/StaticTextExtension.php
@@ -48,7 +48,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             FormType::class,
diff --git a/Form/Extension/TabbedFormTypeExtension.php b/Form/Extension/TabbedFormTypeExtension.php
@@ -116,7 +116,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             FormType::class,
diff --git a/Form/Extension/TimeTypeExtension.php b/Form/Extension/TimeTypeExtension.php
@@ -53,7 +53,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             TimeType::class,
diff --git a/Form/Extension/WidgetCollectionFormTypeExtension.php b/Form/Extension/WidgetCollectionFormTypeExtension.php
@@ -91,7 +91,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             FormType::class,
diff --git a/Form/Extension/WidgetFormTypeExtension.php b/Form/Extension/WidgetFormTypeExtension.php
@@ -93,7 +93,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [
             FormType::class,
diff --git a/composer.json b/composer.json
@@ -23,16 +23,16 @@
     "require": {
         "php": "^7.2",
         "mopa/composer-bridge": "^1.3",
-        "symfony/console": "^4.4",
-        "symfony/form": "^4.4",
-        "symfony/framework-bundle": "^4.4",
-        "symfony/twig-bundle": "^4.4",
+        "symfony/console": "^4.4 || ^5.1",
+        "symfony/form": "^4.4 || ^5.1",
+        "symfony/framework-bundle": "^4.4 || ^5.1",
+        "symfony/twig-bundle": "^4.4 || ^5.1",
         "twig/twig": "^1.40 || ^2.9"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5 || ^9.4",
-        "symfony/security-bundle": "^4.4",
-        "symfony/translation": "^4.4"
+        "symfony/security-bundle": "^4.4 || ^5.1",
+        "symfony/translation": "^4.4 || ^5.1"
     },
     "suggest": {
         "craue/formflow-bundle": "~2.0",

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function configureOptions(OptionsResolver $resolver)`
`72`	`72`	`/**`
`73`	`73`	`* {@inheritdoc}`
`74`	`74`	`*/`
`75`		`- public static function getExtendedTypes()`
	`75`	`+ public static function getExtendedTypes(): iterable`
`76`	`76`	`{`
`77`	`77`	`return [`
`78`	`78`	`DateType::class,`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function configureOptions(OptionsResolver $resolver)`
`53`	`53`	`/**`
`54`	`54`	`* {@inheritdoc}`
`55`	`55`	`*/`
`56`		`- public static function getExtendedTypes()`
	`56`	`+ public static function getExtendedTypes(): iterable`
`57`	`57`	`{`
`58`	`58`	`return [`
`59`	`59`	`DateTimeType::class,`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)`
`45`	`45`	`/**`
`46`	`46`	`* {@inheritdoc}`
`47`	`47`	`*/`
`48`		`- public static function getExtendedTypes()`
	`48`	`+ public static function getExtendedTypes(): iterable`
`49`	`49`	`{`
`50`	`50`	`return [`
`51`	`51`	`FormType::class,`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function configureOptions(OptionsResolver $resolver)`
`60`	`60`	`/**`
`61`	`61`	`* {@inheritdoc}`
`62`	`62`	`*/`
`63`		`- public static function getExtendedTypes()`
	`63`	`+ public static function getExtendedTypes(): iterable`
`64`	`64`	`{`
`65`	`65`	`return [`
`66`	`66`	`FormType::class,`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public function configureOptions(OptionsResolver $resolver)`
`179`	`179`	`/**`
`180`	`180`	`* {@inheritdoc}`
`181`	`181`	`*/`
`182`		`- public static function getExtendedTypes()`
	`182`	`+ public static function getExtendedTypes(): iterable`
`183`	`183`	`{`
`184`	`184`	`return [`
`185`	`185`	`FormType::class,`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)`
`47`	`47`	`/**`
`48`	`48`	`* {@inheritdoc}`
`49`	`49`	`*/`
`50`		`- public static function getExtendedTypes()`
	`50`	`+ public static function getExtendedTypes(): iterable`
`51`	`51`	`{`
`52`	`52`	`return [`
`53`	`53`	`ButtonType::class,`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public function configureOptions(OptionsResolver $resolver)`
`98`	`98`	`/**`
`99`	`99`	`* {@inheritdoc}`
`100`	`100`	`*/`
`101`		`- public static function getExtendedTypes()`
	`101`	`+ public static function getExtendedTypes(): iterable`
`102`	`102`	`{`
`103`	`103`	`return [`
`104`	`104`	`FormType::class,`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function configureOptions(OptionsResolver $resolver)`
`77`	`77`	`/**`
`78`	`78`	`* {@inheritdoc}`
`79`	`79`	`*/`
`80`		`- public static function getExtendedTypes()`
	`80`	`+ public static function getExtendedTypes(): iterable`
`81`	`81`	`{`
`82`	`82`	`return [`
`83`	`83`	`FormType::class,`