Merge pull request #81 from pierres/patch-1

- Support PHP 8.0 - Fix Xdebug coverage
Exercise · Dec 28, 2020 · 32f4709 · 32f4709
2 parents f697c34 + 45fc253
commit 32f4709
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,8 @@ jobs:
           env: SYMFONY_REQUIRE="4.4.*" COMPOSER_FLAGS="--prefer-stable"
         - php: 7.4
           env: SYMFONY_REQUIRE="5.0.*" COMPOSER_FLAGS="--prefer-stable"
+        - php: 8.0
+          env: SYMFONY_REQUIRE="5.0.*" COMPOSER_FLAGS="--prefer-stable" SYMFONY_DEPRECATIONS_HELPER=weak
 
         # Dev
         - php: 7.4
@@ -43,6 +45,7 @@ jobs:
           php: 7.4
           before_script:
             - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
+            - echo "xdebug.mode = coverage" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
             - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi
           script:
             - ./vendor/bin/simple-phpunit -v --coverage-text

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.1.3 || ^8.0.0",
         "ezyang/htmlpurifier": "~4.0",
         "symfony/config": "~3.4 || ~4.0 || ^5.0",
         "symfony/dependency-injection": "~3.4.1 || ^4.0.1 || ^5.0",