From 4dfb8d4b531d46ece7fea523a7a8f154819329ee Mon Sep 17 00:00:00 2001 From: Alies Lapatsin <5278175+alies-dev@users.noreply.github.com> Date: Tue, 27 Feb 2024 22:04:25 +0400 Subject: [PATCH 1/6] Support Laravel 9 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index a767e59..1c11956 100644 --- a/composer.json +++ b/composer.json @@ -10,12 +10,12 @@ ], "require": { "php": "^7.1.3|^8.0", - "illuminate/console": "^5.8|^6.0|^7.0", - "illuminate/support": "^5.8|^6.0|^7.0" + "illuminate/console": "^5.8|^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "^5.8|^6.0|^7.0|^8.0|^9.0", }, "require-dev": { - "orchestra/testbench": "^3.8|^4.0|^5.0", - "phpunit/phpunit": "^7.5|^8.5|^9.2" + "orchestra/testbench": "^3.8|^4.0|^5.0|^6.0|^7.0", + "phpunit/phpunit": "^8.5|^9.6" }, "autoload": { "psr-4": { From 568da6617bf918a3aa9619ad5aaf147c20d0d5c7 Mon Sep 17 00:00:00 2001 From: Alies Lapatsin Date: Tue, 27 Feb 2024 23:37:43 +0530 Subject: [PATCH 2/6] Normalize composer.json --- composer.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 1c11956..b8bda5b 100644 --- a/composer.json +++ b/composer.json @@ -1,22 +1,24 @@ { "name": "diglabby/laravel-find-missing-translations", "description": "A console command to find missing translations for Laravel projects", - "type": "library", "license": "MIT", + "type": "library", "keywords": [ "diglabby", "laravel", "translation" ], "require": { - "php": "^7.1.3|^8.0", - "illuminate/console": "^5.8|^6.0|^7.0|^8.0|^9.0", - "illuminate/support": "^5.8|^6.0|^7.0|^8.0|^9.0", + "php": "^7.1.3 || ^8.0", + "illuminate/console": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0", + "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "require-dev": { - "orchestra/testbench": "^3.8|^4.0|^5.0|^6.0|^7.0", - "phpunit/phpunit": "^8.5|^9.6" + "orchestra/testbench": "^3.8 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "phpunit/phpunit": "^8.5 || ^9.6" }, + "minimum-stability": "dev", + "prefer-stable": true, "autoload": { "psr-4": { "Diglabby\\FindMissingTranslations\\": "src" @@ -27,9 +29,6 @@ "Diglabby\\FindMissingTranslations\\Tests\\": "tests" } }, - "scripts": { - "test": "vendor/bin/phpunit" - }, "config": { "sort-packages": true }, @@ -40,6 +39,7 @@ ] } }, - "minimum-stability": "dev", - "prefer-stable": true + "scripts": { + "test": "vendor/bin/phpunit" + } } From 5b1373eb8a86b0ed6747120987b308919895901f Mon Sep 17 00:00:00 2001 From: Alies Lapatsin Date: Tue, 27 Feb 2024 23:42:21 +0530 Subject: [PATCH 3/6] Update tests on CI --- .github/workflows/test.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index eb5ab2d..c2ae8f7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,18 +3,22 @@ name: run-tests on: push: schedule: - - cron: '0 0 * * *' + - cron: '0 0 */5 * *' jobs: test: runs-on: ${{ matrix.os }} strategy: matrix: - php: [7.4, 7.3, 7.2] - laravel: [7.*, 6.*, 5.8.*] + php: [8.3, 8.0, 7.4] + laravel: [9.*, 8.*, 7.*, 6.*, 5.8.*] dependency-version: [prefer-lowest] os: [ubuntu-latest] include: + - laravel: 9.* + testbench: 7.* + - laravel: 8.* + testbench: 6.* - laravel: 7.* testbench: 5.* - laravel: 6.* @@ -26,16 +30,16 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Cache dependencies - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.composer/cache/files key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - name: Setup PHP - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} coverage: none From d4de3fb6baf321201595b8ef2ed70ae74f81a6e8 Mon Sep 17 00:00:00 2001 From: Alies Lapatsin Date: Tue, 27 Feb 2024 23:44:31 +0530 Subject: [PATCH 4/6] Exclude Laravel 9 and PHP 7 combo --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c2ae8f7..e77ec44 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,6 +25,9 @@ jobs: testbench: 4.* - laravel: 5.8.* testbench: 3.8.* + exclude: + - php: 7.4 + laravel: 9.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.os }} From 838b9ed92db9bfa35c7a39c98f3bf51f37c286d1 Mon Sep 17 00:00:00 2001 From: Alies Lapatsin Date: Tue, 27 Feb 2024 23:46:39 +0530 Subject: [PATCH 5/6] Do not try run L5 tests on PHP8 --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e77ec44..db26acc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,6 +28,10 @@ jobs: exclude: - php: 7.4 laravel: 9.* + - php: 8.0 + laravel: 5.8.* + - php: 8.3 + laravel: 5.8.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.os }} From 7a4a3f9d78e7107016af40ba6ba1bf4c60ba5d6d Mon Sep 17 00:00:00 2001 From: Alies Lapatsin Date: Tue, 27 Feb 2024 23:48:14 +0530 Subject: [PATCH 6/6] Fix running tests on PHP 7.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b8bda5b..1c00217 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ }, "require-dev": { "orchestra/testbench": "^3.8 || ^4.0 || ^5.0 || ^6.0 || ^7.0", - "phpunit/phpunit": "^8.5 || ^9.6" + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6" }, "minimum-stability": "dev", "prefer-stable": true,