From 2e8285b88b249ec90b246e661fbf3e7ba554e1e8 Mon Sep 17 00:00:00 2001 From: Andrew Donald Johnson Date: Sun, 27 Dec 2020 09:26:38 -0500 Subject: [PATCH 1/2] PHP 8 Support --- .travis.yml | 1 + composer.json | 6 +++--- tests/ExampleTest.php | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index af76124..5eb3a62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ php: - 5.5 - 5.6 - 7.0 + - 8.0 - hhvm # This triggers builds to run on the new TravisCI infrastructure. diff --git a/composer.json b/composer.json index 001c101..eb33e8c 100644 --- a/composer.json +++ b/composer.json @@ -19,10 +19,10 @@ } ], "require": { - "php" : "~5.6|~7.0" + "php" : "~5.6 || ~7.0 || ~8.0" }, "require-dev": { - "phpunit/phpunit" : "~4.0||~5.0", + "phpunit/phpunit" : "~4.0 || ~5.0 || ~6.0 || ~7.0 || ~8.0 || ~9.0", "scrutinizer/ocular": "~1.1", "squizlabs/php_codesniffer": "~2.3" }, @@ -33,7 +33,7 @@ }, "autoload-dev": { "psr-4": { - "Unicodeveloper\\DumbPassword\\Test": "tests" + "Unicodeveloper\\DumbPassword\\Test\\": "tests" } }, "scripts": { diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php index a3b4876..974c886 100644 --- a/tests/ExampleTest.php +++ b/tests/ExampleTest.php @@ -1,8 +1,9 @@ Date: Sun, 27 Dec 2020 15:56:29 -0500 Subject: [PATCH 2/2] Remove unsupported versions of php and phpunit --- .travis.yml | 5 +---- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5eb3a62..ad6b5f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,8 @@ language: php php: - - 5.5 - - 5.6 - 7.0 - 8.0 - - hhvm # This triggers builds to run on the new TravisCI infrastructure. # See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/ @@ -18,7 +15,7 @@ cache: matrix: include: - - php: 5.5 + - php: 7.0 env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"' before_script: diff --git a/composer.json b/composer.json index eb33e8c..971ce2a 100644 --- a/composer.json +++ b/composer.json @@ -19,10 +19,10 @@ } ], "require": { - "php" : "~5.6 || ~7.0 || ~8.0" + "php" : "~7.0 || ~8.0" }, "require-dev": { - "phpunit/phpunit" : "~4.0 || ~5.0 || ~6.0 || ~7.0 || ~8.0 || ~9.0", + "phpunit/phpunit" : "~8.0 || ~9.0", "scrutinizer/ocular": "~1.1", "squizlabs/php_codesniffer": "~2.3" },