From 2ac11fe196a6578fa51faf31be3a9b64d31cbb81 Mon Sep 17 00:00:00 2001 From: Eric Richer Date: Tue, 8 Jun 2021 20:25:28 -0400 Subject: [PATCH 1/6] Update phpunit to v9. Support for PHP8. --- .travis.yml | 4 ++-- composer.json | 4 ++-- phpunit.xml.dist | 35 +++++++++++++---------------------- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index f09180c5..b573f0e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,14 +15,14 @@ matrix: - php: 7.3 env: - DEPENDENCIES="" - - EXECUTE_CS_CHECK=true - - TEST_COVERAGE=true - php: 7.3 env: - DEPENDENCIES="--prefer-lowest --prefer-stable" - php: 7.4 env: - DEPENDENCIES="" + - EXECUTE_CS_CHECK=true + - TEST_COVERAGE=true - php: 7.4 env: - DEPENDENCIES="--prefer-lowest --prefer-stable" diff --git a/composer.json b/composer.json index dc11c5eb..7f8f927d 100644 --- a/composer.json +++ b/composer.json @@ -35,14 +35,14 @@ } ], "require": { - "php": "^7.2", + "php": "^7.3 || ^8.0", "laminas/laminas-servicemanager": "^3.3", "laminas/laminas-stdlib": "^3.1", "doctrine/persistence": "^2.0" }, "require-dev": { "malukenho/docheader": "^0.1.7", - "phpunit/phpunit": "^8.5.2", + "phpunit/phpunit": "^9.5.0", "phpspec/prophecy": "^1.10", "friendsofphp/php-cs-fixer": "^2.9.3", "doctrine/doctrine-orm-module": "^3.1", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 48790a3f..4752ff3a 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,24 +1,15 @@ - - - ./test - - - - ./src - - - - - + + + + ./src + + + + + + + ./test + + From be5c6481d58e5391b09c2eb75ac5fa66b2e59fd0 Mon Sep 17 00:00:00 2001 From: Eric Richer Date: Tue, 8 Jun 2021 20:31:29 -0400 Subject: [PATCH 2/6] Added PHP8 to travis-ci --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index b573f0e6..8dcfe5b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,12 @@ matrix: - php: 7.4 env: - DEPENDENCIES="--prefer-lowest --prefer-stable" + - php: 8.0 + env: + - DEPENDENCIES="" + - php: 8.0 + env: + - DEPENDENCIES="--prefer-lowest --prefer-stable" before_install: - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0; fi From e722043aacd02c7671997bab745c2927bfdd4225 Mon Sep 17 00:00:00 2001 From: Eric Richer Date: Tue, 8 Jun 2021 21:25:54 -0400 Subject: [PATCH 3/6] Moved to php-coveralls/php-coveralls --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7f8f927d..1a0fabd0 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ } ], "require": { - "php": "^7.3 || ^8.0", + "php": "^7.3", "laminas/laminas-servicemanager": "^3.3", "laminas/laminas-stdlib": "^3.1", "doctrine/persistence": "^2.0" @@ -46,7 +46,7 @@ "phpspec/prophecy": "^1.10", "friendsofphp/php-cs-fixer": "^2.9.3", "doctrine/doctrine-orm-module": "^3.1", - "satooshi/php-coveralls": "^2.0" + "php-coveralls/php-coveralls": "^2.0" }, "autoload": { "psr-4": { From 939bf9efe213921b2008113115a35998c7b3d577 Mon Sep 17 00:00:00 2001 From: Eric Richer Date: Tue, 8 Jun 2021 21:25:54 -0400 Subject: [PATCH 4/6] Moved to php-coveralls/php-coveralls --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7f8f927d..1a0fabd0 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ } ], "require": { - "php": "^7.3 || ^8.0", + "php": "^7.3", "laminas/laminas-servicemanager": "^3.3", "laminas/laminas-stdlib": "^3.1", "doctrine/persistence": "^2.0" @@ -46,7 +46,7 @@ "phpspec/prophecy": "^1.10", "friendsofphp/php-cs-fixer": "^2.9.3", "doctrine/doctrine-orm-module": "^3.1", - "satooshi/php-coveralls": "^2.0" + "php-coveralls/php-coveralls": "^2.0" }, "autoload": { "psr-4": { From 6162412cdd9a9a31edb6b57a78ad7c506d5a6414 Mon Sep 17 00:00:00 2001 From: Eric Richer Date: Tue, 8 Jun 2021 21:29:02 -0400 Subject: [PATCH 5/6] Remove PHP8 in tavis-ci --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8dcfe5b1..b573f0e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,12 +26,6 @@ matrix: - php: 7.4 env: - DEPENDENCIES="--prefer-lowest --prefer-stable" - - php: 8.0 - env: - - DEPENDENCIES="" - - php: 8.0 - env: - - DEPENDENCIES="--prefer-lowest --prefer-stable" before_install: - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0; fi From 1c418da6437d6ce3d8ceb7d1136a29204f582f31 Mon Sep 17 00:00:00 2001 From: Eric Richer Date: Tue, 22 Jun 2021 20:54:25 -0400 Subject: [PATCH 6/6] Support for PHP 8 --- .travis.yml | 7 ++++++- composer.json | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b573f0e6..2162ad6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,12 @@ matrix: - php: 7.4 env: - DEPENDENCIES="--prefer-lowest --prefer-stable" - + - php: 8.0 + env: + - DEPENDENCIES="--prefer-lowest --prefer-stable" + - php: 8.0 + env: + - DEPENDENCIES="" before_install: - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0; fi diff --git a/composer.json b/composer.json index 1a0fabd0..1d0e5d5d 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ } ], "require": { - "php": "^7.3", + "php": "^7.3 || ^8.0", "laminas/laminas-servicemanager": "^3.3", "laminas/laminas-stdlib": "^3.1", "doctrine/persistence": "^2.0" @@ -45,7 +45,7 @@ "phpunit/phpunit": "^9.5.0", "phpspec/prophecy": "^1.10", "friendsofphp/php-cs-fixer": "^2.9.3", - "doctrine/doctrine-orm-module": "^3.1", + "php-coveralls/php-coveralls": "^2.0" }, "autoload": {