diff --git a/.travis.yml b/.travis.yml index bf7568d..28c01b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,10 @@ language: php php: - - 7.0 - 7.1 - 7.2 + - 7.3 + - 7.4snapshot sudo: false @@ -12,23 +13,24 @@ cache: - .phpunit - $HOME/.composer/cache -branches: - only: - - master - - dev - - /^\d+\.\d+$/ - matrix: fast_finish: true include: - - php: 7.0 + - php: 7.1 env: COMPOSER_FLAGS="--prefer-lowest" - php: 7.2 - env: COMPOSER_FLAGS="--prefer-lowest" + env: SYMFONY_VERSION=^3.4 + - php: 7.3 + env: SYMFONY_VERSION=^4.0 + - php: 7.3 + env: SYMFONY_VERSION=^5.0 + allow_failures: + - php: 7.4snapshot before_install: - - phpenv config-rm xdebug.ini + - phpenv config-rm xdebug.ini || true + - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --dev --no-update; fi; -install: composer update $COMPOSER_FLAGS +install: composer update --no-interaction $COMPOSER_FLAGS script: ./phpunit diff --git a/Form/Extension/DocumentationExtension.php b/Form/Extension/DocumentationExtension.php index a27d83d..0bebeef 100644 --- a/Form/Extension/DocumentationExtension.php +++ b/Form/Extension/DocumentationExtension.php @@ -37,7 +37,7 @@ class DocumentationExtension extends AbstractTypeExtension return self::getExtendedTypes()[0]; } - public static function getExtendedTypes() + public static function getExtendedTypes(): iterable { return [FormType::class]; } diff --git a/Tests/Functional/TestKernel.php b/Tests/Functional/TestKernel.php index 745ce8c..862dd83 100644 --- a/Tests/Functional/TestKernel.php +++ b/Tests/Functional/TestKernel.php @@ -105,6 +105,7 @@ class TestKernel extends Kernel protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader) { $framework = [ + 'assets' => true, 'secret' => 'MySecretKey', 'test' => null, 'validation' => null, diff --git a/composer.json b/composer.json index 526237d..16565cb 100644 --- a/composer.json +++ b/composer.json @@ -15,37 +15,37 @@ } ], "require": { - "php": "^7.0", - "symfony/framework-bundle": "^3.4|^4.0", - "symfony/options-resolver": "^3.4.4|^4.0", - "symfony/property-info": "^3.4|^4.0", + "php": "^7.1", + "symfony/framework-bundle": "^3.4|^4.0|^5.0", + "symfony/options-resolver": "^3.4.4|^4.0|^5.0", + "symfony/property-info": "^3.4|^4.0|^5.0", "exsyst/swagger": "^0.4.1", "zircote/swagger-php": "^2.0.9", "phpdocumentor/reflection-docblock": "^3.1|^4.0" }, "require-dev": { - "symfony/templating": "^3.4|^4.0", - "symfony/twig-bundle": "^3.4|^4.0", - "symfony/asset": "^3.4|^4.0", - "symfony/console": "^3.4|^4.0", - "symfony/config": "^3.4|^4.0", - "symfony/validator": "^3.4|^4.0", - "symfony/property-access": "^3.4|^4.0", - "symfony/form": "^3.4|^4.0", - "symfony/dom-crawler": "^3.4|^4.0", - "symfony/browser-kit": "^3.4|^4.0", - "symfony/cache": "^3.4|^4.0", - "symfony/phpunit-bridge": "^3.4.24|^4.0", - "symfony/stopwatch": "^3.4|^4.0", - "symfony/routing": "^3.4|^4.0", + "symfony/templating": "^3.4|^4.0|^5.0", + "symfony/twig-bundle": "^3.4|^4.0|^5.0", + "symfony/asset": "^3.4|^4.0|^5.0", + "symfony/console": "^3.4|^4.0|^5.0", + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/validator": "^3.4|^4.0|^5.0", + "symfony/property-access": "^3.4|^4.0|^5.0", + "symfony/form": "^3.4|^4.0|^5.0", + "symfony/dom-crawler": "^3.4|^4.0|^5.0", + "symfony/browser-kit": "^3.4|^4.0|^5.0", + "symfony/cache": "^3.4|^4.0|^5.0", + "symfony/phpunit-bridge": "^3.4.24|^4.0|^5.0", + "symfony/stopwatch": "^3.4|^4.0|^5.0", + "symfony/routing": "^3.4|^4.0|^5.0", "sensio/framework-extra-bundle": "^3.0.13|^4.0|^5.0", "doctrine/annotations": "^1.2", "doctrine/common": "^2.4", - "api-platform/core": "^2.1.0", + "api-platform/core": "^2.1.2", "friendsofsymfony/rest-bundle": "^2.0", "willdurand/hateoas-bundle": "^1.0|^2.0", - "jms/serializer-bundle": "^2.0|^3.0", + "jms/serializer-bundle": "^2.3|^3.0", "jms/serializer": "^1.14|^3.0" }, "suggest": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 58e4a52..6012f71 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -10,7 +10,7 @@ - +