From 352dd0d5248b3e06174e89e2fe5652efe5d486af Mon Sep 17 00:00:00 2001 From: Junior Grossi Date: Wed, 29 Sep 2021 14:33:48 +0100 Subject: [PATCH 1/3] upgrade to phpunit8 + php72 --- composer.json | 14 +++++++------- tests/CustomRulesTest.php | 2 +- tests/DatabaseRulesTest.php | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 4639e2a..acb83f6 100644 --- a/composer.json +++ b/composer.json @@ -11,16 +11,16 @@ } ], "require": { - "php": ">=7.0", - "illuminate/database": "^5.4 || ^6.0", - "illuminate/support": "^5.4 || ^6.0", - "illuminate/validation": "^5.4 || ^6.0", + "php": ">=7.2.5", + "illuminate/database": "^6.0 || ^7.0 || ^8.0", + "illuminate/support": "^6.0 || ^7.0 || ^8.0", + "illuminate/validation": "^6.0 || ^7.0 || ^8.0", "saritasa/php-common": "^1.0", - "propaganistas/laravel-phone": "^3.0 || ^4.0 || ^5.0" + "propaganistas/laravel-phone": "^4.0 || ^5.0" }, "require-dev": { - "mockery/mockery": "^0.9", - "phpunit/phpunit": "^6.0", + "mockery/mockery": "^1.3", + "phpunit/phpunit": "^8.5", "squizlabs/php_codesniffer": "^3.0" }, "autoload": { diff --git a/tests/CustomRulesTest.php b/tests/CustomRulesTest.php index 722f672..e412688 100644 --- a/tests/CustomRulesTest.php +++ b/tests/CustomRulesTest.php @@ -12,7 +12,7 @@ class CustomRulesTest extends TestCase /** * Reset mocked configuration after each test */ - protected function tearDown() + protected function tearDown(): void { Config::clearResolvedInstances(); } diff --git a/tests/DatabaseRulesTest.php b/tests/DatabaseRulesTest.php index fb19ebe..9d84958 100644 --- a/tests/DatabaseRulesTest.php +++ b/tests/DatabaseRulesTest.php @@ -17,7 +17,7 @@ class DatabaseRulesTest extends TestCase /** * Reset mocked configuration after each test */ - protected function tearDown() + protected function tearDown(): void { Config::clearResolvedInstances(); } From 643393be62741dede560c47f95545bc951da8243 Mon Sep 17 00:00:00 2001 From: Junior Grossi Date: Wed, 29 Sep 2021 14:39:30 +0100 Subject: [PATCH 2/3] fix phpunit xml file --- phpunit.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/phpunit.xml b/phpunit.xml index 33629dc..27c60b8 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,7 +7,6 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="false" bootstrap="vendor/autoload.php" > From baf848298567fcbf11416a35c86781aa5d4126fe Mon Sep 17 00:00:00 2001 From: Junior Grossi Date: Wed, 29 Sep 2021 15:25:45 +0100 Subject: [PATCH 3/3] remove php71 from gh actions --- .github/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index a9563b2..fa99573 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [ '7.1', '7.2', '7.3', '7.4' ] + php-versions: [ '7.2', '7.3', '7.4' ] name: PHP ${{ matrix.php-versions }} - PHPUnit steps: - name: Checkout