From 9ab6d0d9e84d44767671012b9e319b2c0512d5c0 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 26 Nov 2018 16:33:38 +0100 Subject: [PATCH 1/3] Updating to 7.2 --- .travis.yml | 6 ++---- tests/ReadabilityTest.php | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 857299e..eb44392 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ php: - 7.0 - 7.1 - 7.2 + - 7.3 - nightly - hhvm @@ -24,13 +25,10 @@ matrix: env: CS_FIXER=run fast_finish: true allow_failures: - - php: 7.2 + - php: 7.3 - php: nightly - php: hhvm -# faster builds on new travis setup not using sudo -sudo: false - # cache vendor dirs cache: directories: diff --git a/tests/ReadabilityTest.php b/tests/ReadabilityTest.php index 4629aa6..c9a3c80 100644 --- a/tests/ReadabilityTest.php +++ b/tests/ReadabilityTest.php @@ -6,7 +6,7 @@ use Monolog\Handler\TestHandler; use Monolog\Logger; use Readability\Readability; -class ReadabilityTest extends \PHPUnit_Framework_TestCase +class ReadabilityTest extends \PHPUnit\Framework\TestCase { public $logHandler; public $logger; From 70b393a2a3ae07061006dc6a6c8926923a1bc066 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 26 Nov 2018 16:41:42 +0100 Subject: [PATCH 2/3] Remove custom stuff for 7.2 --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb44392..c412795 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,14 +41,12 @@ before_install: # see: https://blog.travis-ci.com/upcoming_ubuntu_11_10_migration/ - if [[ $TRAVIS_PHP_VERSION = 5.3.3 ]]; then composer config -g -- disable-tls true; fi; - if [[ $TRAVIS_PHP_VERSION = 5.3.3 ]]; then composer config -g -- secure-http false; fi; - # no version compatible with PHP > 7.1 - - if [[ $TRAVIS_PHP_VERSION = 7.2.* ]]; then composer remove friendsofphp/php-cs-fixer; fi; install: - composer self-update before_script: - - composer install --prefer-dist --no-interaction + - composer install -o --prefer-dist --no-interaction script: - mkdir -p build/logs From 30a577c6171163537eb81d769a257a6eb83f1922 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 26 Nov 2018 16:42:28 +0100 Subject: [PATCH 3/3] Dumping HHVM --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c412795..659c549 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ php: - 7.2 - 7.3 - nightly - - hhvm matrix: include: @@ -27,7 +26,6 @@ matrix: allow_failures: - php: 7.3 - php: nightly - - php: hhvm # cache vendor dirs cache: