From 316171c9862391a034420572e295e68484d340dc Mon Sep 17 00:00:00 2001 From: Johannes Wachter Date: Thu, 20 Sep 2018 08:15:49 +0200 Subject: [PATCH] allow symfony 4 as dependency --- .travis.yml | 5 +++++ composer.json | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf610a9..e2fdf39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ php: - 5.5 - 5.6 - 7.0 + - 7.1 - hhvm sudo: false @@ -29,6 +30,10 @@ matrix: env: SYMFONY_VERSION=^3.0 - php: 7.0 env: SYMFONY_VERSION=^3.0@dev + - php: 7.1 + env: SYMFONY_VERSION=^4.0 + - php: 7.1 + env: SYMFONY_VERSION=^4.0@dev - php: 5.3 env: COMPOSER_FLAGS="--prefer-lowest" diff --git a/composer.json b/composer.json index 5b4672b..f33c1d0 100644 --- a/composer.json +++ b/composer.json @@ -13,12 +13,12 @@ "require": { "php": "^5.3.9 || ^7.0", "php-ffmpeg/php-ffmpeg": "^0.5 || ^0.6", - "symfony/dependency-injection": "^2.3 || ^3.0", - "symfony/framework-bundle": "^2.3 || ^3.0" + "symfony/dependency-injection": "^2.3 || ^3.0 || ^4.0", + "symfony/framework-bundle": "^2.3 || ^3.0 || ^4.0" }, "require-dev": { "matthiasnoback/symfony-dependency-injection-test": "~0.7", - "phpunit/phpunit": "^4.8" + "phpunit/phpunit": "^4.8 || ^5.7" }, "autoload": { "psr-4": { "Dubture\\FFmpegBundle\\": "" }