From 3249b7e2e08d3542a24c3f9fc4f1673fbb44f4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Forg=C3=A1=C4=8D?= Date: Wed, 3 Jun 2020 08:13:30 +0200 Subject: [PATCH] support of PHP 7.3+ --- .travis.yml | 7 ++----- composer.json | 6 +++--- tests/AmpTest.php | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 178389f2..726b0bfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,8 @@ language: php dist: trusty php: - - 5.5 - - 5.6 - - 7.0 - - 7.1 - - 7.2 + - 7.3 + - 7.4 - hhvm - nightly diff --git a/composer.json b/composer.json index 51906ce5..209f9f21 100644 --- a/composer.json +++ b/composer.json @@ -11,9 +11,9 @@ "keywords": ["Drupal", "AMP", "mobile"], "homepage": "https://github.com/Lullabot/amp-library", "require" : { - "php" : ">=5.5.0", + "php" : ">=7.3", "querypath/QueryPath": ">=3.0.4", - "sebastian/diff": "^1.2 || ^2 || ^3", + "sebastian/diff": "^4", "marc1706/fast-image-size": "1.*", "masterminds/html5": "~2.3.0", "sabberworm/php-css-parser": "^8.0.0", @@ -25,7 +25,7 @@ }, "require-dev": { "php" : ">=5.5.0", - "phpunit/phpunit": "4.8.* || ^6", + "phpunit/phpunit": "^9", "symfony/console": "^2.7.0" } } diff --git a/tests/AmpTest.php b/tests/AmpTest.php index 3dfeb720..1af67548 100644 --- a/tests/AmpTest.php +++ b/tests/AmpTest.php @@ -28,7 +28,7 @@ class AmpTest extends TestCase protected $amp = null; protected $skip_internet = false; - public function setup() + public function setup(): void { $this->amp = new AMP(); $this->skip_internet = getenv('AMP_TEST_SKIP_INTERNET');