Merge f82c3ce into 23f0f5d

nucleos · Dec 9, 2019 · 05f4e48 · 05f4e48
2 parents 23f0f5d + f82c3ce
commit 05f4e48
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 54 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -50,6 +50,9 @@ matrix:
     - stage: test
       php: 7.4
       env: SYMFONY_VERSION=4.4.*
+    - stage: test
+      php: 7.3
+      env: SYMFONY_VERSION=5.0.*
   allow_failures:
     - php: 7.4
       env: TARGET=checkdeps

diff --git a/composer.json b/composer.json
@@ -22,12 +22,12 @@
         "ext-pcre": "*",
         "pugx/autocompleter-bundle": "^1.4",
         "sonata-project/doctrine-extensions": "^1.1",
-        "symfony/form": "^4.2.12",
-        "symfony/http-foundation": "^4.2.12",
-        "symfony/options-resolver": "^4.2.12",
-        "symfony/property-access": "^4.2.12",
-        "symfony/translation": "^4.2.12",
-        "symfony/validator": "^4.2.12"
+        "symfony/form": "^4.2.12 || ^5.0",
+        "symfony/http-foundation": "^4.2.12 || ^5.0",
+        "symfony/options-resolver": "^4.2.12 || ^5.0",
+        "symfony/property-access": "^4.2.12 || ^5.0",
+        "symfony/translation": "^4.2.12 || ^5.0",
+        "symfony/validator": "^4.2.12 || ^5.0"
     },
     "conflict": {
         "doctrine/orm": "<2.5",
@@ -37,12 +37,12 @@
         "bamarni/composer-bin-plugin": "^1.2",
         "doctrine/orm": "^2.5",
         "sllh/composer-lint": "^1.0",
-        "symfony/config": "^4.2.12",
-        "symfony/dependency-injection": "^4.2.12",
-        "symfony/expression-language": "^4.2.12",
-        "symfony/framework-bundle": "^4.2.12",
-        "symfony/http-kernel": "^4.2.12",
-        "symfony/twig-bridge": "^4.2.12"
+        "symfony/config": "^4.2.12 || ^5.0",
+        "symfony/dependency-injection": "^4.2.12 || ^5.0",
+        "symfony/expression-language": "^4.2.12 || ^5.0",
+        "symfony/framework-bundle": "^4.2.12 || ^5.0",
+        "symfony/http-kernel": "^4.2.12 || ^5.0",
+        "symfony/twig-bridge": "^4.2.12 || ^5.0"
     },
     "suggest": {
         "symfony/framework-bundle": "If you want to use symfony"

diff --git a/src/Extension/DownloadTypeExtension.php b/src/Extension/DownloadTypeExtension.php
@@ -60,13 +60,6 @@ public function buildView(FormView $view, FormInterface $form, array $options):
         $view->vars['download_text'] = $options['download_text'];
     }
 
-    public function getExtendedType()
-    {
-        foreach (static::getExtendedTypes() as $extendedType) {
-            return $extendedType;
-        }
-    }
-
     public static function getExtendedTypes(): iterable
     {
         return [

diff --git a/src/Extension/HelpTypeExtension.php b/src/Extension/HelpTypeExtension.php
@@ -58,13 +58,6 @@ public function configureOptions(OptionsResolver $resolver): void
         $resolver->setAllowedTypes('help_translation_domain', ['null', 'bool', 'string']);
     }
 
-    public function getExtendedType()
-    {
-        foreach (static::getExtendedTypes() as $extendedType) {
-            return $extendedType;
-        }
-    }
-
     public static function getExtendedTypes(): iterable
     {
         return [

diff --git a/src/Extension/ImageTypeExtension.php b/src/Extension/ImageTypeExtension.php
@@ -56,13 +56,6 @@ public function buildView(FormView $view, FormInterface $form, array $options):
         }
     }
 
-    public function getExtendedType()
-    {
-        foreach (static::getExtendedTypes() as $extendedType) {
-            return $extendedType;
-        }
-    }
-
     public static function getExtendedTypes(): iterable
     {
         return [

diff --git a/tests/Extension/DownloadTypeExtensionTest.php b/tests/Extension/DownloadTypeExtensionTest.php
@@ -99,11 +99,4 @@ public function testExtendedTypes(): void
     {
         static::assertSame([FileType::class], DownloadTypeExtension::getExtendedTypes());
     }
-
-    public function testExtendedType(): void
-    {
-        $extension = new DownloadTypeExtension();
-
-        static::assertSame(FileType::class, $extension->getExtendedType());
-    }
 }
diff --git a/tests/Extension/HelpTypeExtensionTest.php b/tests/Extension/HelpTypeExtensionTest.php
@@ -97,11 +97,4 @@ public function testExtendedTypes(): void
     {
         static::assertSame([FormType::class], HelpTypeExtension::getExtendedTypes());
     }
-
-    public function testExtendedType(): void
-    {
-        $extension = new HelpTypeExtension();
-
-        static::assertSame(FormType::class, $extension->getExtendedType());
-    }
 }
diff --git a/tests/Extension/ImageTypeExtensionTest.php b/tests/Extension/ImageTypeExtensionTest.php
@@ -94,11 +94,4 @@ public function testExtendedTypes(): void
     {
         static::assertSame([FileType::class], ImageTypeExtension::getExtendedTypes());
     }
-
-    public function testExtendedType(): void
-    {
-        $extension = new ImageTypeExtension();
-
-        static::assertSame(FileType::class, $extension->getExtendedType());
-    }
 }