From 46f0df08e45881e5a13df673b06ecc6975e8356a Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Tue, 27 Feb 2024 23:20:19 +0100 Subject: [PATCH 01/13] Update workflow --- .github/workflows/php.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index fb1615b..b86694f 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -9,9 +9,11 @@ jobs: strategy: fail-fast: false matrix: - php: [ 8.2 ] - laravel: [9.*, 10.*] + php: [ 8.2, 8.3 ] + laravel: [9.*, 10.*, 11.*] include: + - laravel: 11.* + testbench: 9.* - laravel: 10.* testbench: 8.* - laravel: 9.* From cafb16c9d84313144ca81eaf4df47a03edfc7d1e Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Sun, 10 Mar 2024 15:30:20 +0100 Subject: [PATCH 02/13] Update workflow --- .github/workflows/php.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index b86694f..76cf425 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -11,6 +11,7 @@ jobs: matrix: php: [ 8.2, 8.3 ] laravel: [9.*, 10.*, 11.*] + dependency-version: [prefer-lowest, prefer-stable] include: - laravel: 11.* testbench: 9.* @@ -19,7 +20,7 @@ jobs: - laravel: 9.* testbench: 7.* - name: PHP ${{ matrix.php }} + Laravel ${{ matrix.laravel }} + name: PHP ${{ matrix.php }} + Laravel ${{ matrix.laravel }} | ${{ matrix.dependency-version }} steps: - uses: actions/checkout@v2 @@ -44,8 +45,8 @@ jobs: - name: Install dependencies if: steps.composer-cache.outputs.cache-hit != 'true' run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --prefer-dist --no-interaction --no-suggest + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-update --no-progress + composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress - name: Run test suite run: composer run-script test From 2827b5564dadc7a06403df847099676e8153fb88 Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Sun, 10 Mar 2024 15:45:12 +0100 Subject: [PATCH 03/13] Revert "Update workflow" This reverts commit cafb16c9d84313144ca81eaf4df47a03edfc7d1e. --- .github/workflows/php.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 76cf425..b86694f 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -11,7 +11,6 @@ jobs: matrix: php: [ 8.2, 8.3 ] laravel: [9.*, 10.*, 11.*] - dependency-version: [prefer-lowest, prefer-stable] include: - laravel: 11.* testbench: 9.* @@ -20,7 +19,7 @@ jobs: - laravel: 9.* testbench: 7.* - name: PHP ${{ matrix.php }} + Laravel ${{ matrix.laravel }} | ${{ matrix.dependency-version }} + name: PHP ${{ matrix.php }} + Laravel ${{ matrix.laravel }} steps: - uses: actions/checkout@v2 @@ -45,8 +44,8 @@ jobs: - name: Install dependencies if: steps.composer-cache.outputs.cache-hit != 'true' run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-update --no-progress - composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer update --prefer-dist --no-interaction --no-suggest - name: Run test suite run: composer run-script test From df41e4c63f692dce41282ad9925b8e51af8403a3 Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Sun, 10 Mar 2024 15:50:57 +0100 Subject: [PATCH 04/13] Ah! --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bfbee37..9837de8 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "prefer-stable": true, "require": { "php": "^8.2", - "nunomaduro/termwind": "^1.15", + "nunomaduro/termwind": "^2.0", "nutgram/nutgram": "^4.11.0" }, "require-dev": { From f1bc1e53287bc93e6e7f328b863c30075b043a8e Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Sun, 10 Mar 2024 15:55:24 +0100 Subject: [PATCH 05/13] Ah! x2 --- .github/workflows/php.yml | 16 +++++----------- composer.json | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index b86694f..de679ac 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -11,13 +11,17 @@ jobs: matrix: php: [ 8.2, 8.3 ] laravel: [9.*, 10.*, 11.*] + termwind: [1.*, 2.*] include: - laravel: 11.* testbench: 9.* + termwind: 2.* - laravel: 10.* testbench: 8.* + termwind: 1.* - laravel: 9.* testbench: 7.* + termwind: 1.* name: PHP ${{ matrix.php }} + Laravel ${{ matrix.laravel }} steps: @@ -32,19 +36,9 @@ jobs: - name: Validate composer.json and composer.lock run: composer validate - - name: Cache Composer packages - id: composer-cache - uses: actions/cache@v2 - with: - path: vendor - key: ${{ runner.os }}-php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} - restore-keys: | - ${{ runner.os }}-php-${{ matrix.php }}-laravel-${{ matrix.laravel }}- - - name: Install dependencies - if: steps.composer-cache.outputs.cache-hit != 'true' run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nunomaduro/termwind:${{ matrix.termwind }}" --no-interaction --no-update composer update --prefer-dist --no-interaction --no-suggest - name: Run test suite diff --git a/composer.json b/composer.json index 9837de8..968fd63 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "prefer-stable": true, "require": { "php": "^8.2", - "nunomaduro/termwind": "^2.0", + "nunomaduro/termwind": "^1.0|^2.0", "nutgram/nutgram": "^4.11.0" }, "require-dev": { From 0780e60f88311797dbde5112243ee5b4f82c10df Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Sun, 10 Mar 2024 16:04:07 +0100 Subject: [PATCH 06/13] Ah! x3 --- .github/workflows/php.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index de679ac..e4d4477 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -11,7 +11,6 @@ jobs: matrix: php: [ 8.2, 8.3 ] laravel: [9.*, 10.*, 11.*] - termwind: [1.*, 2.*] include: - laravel: 11.* testbench: 9.* From cfdd22a9bbbfaffd06b27a8989fc78c4e9c5fe1e Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Sun, 10 Mar 2024 16:06:07 +0100 Subject: [PATCH 07/13] Ah! x4 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 968fd63..9db3453 100644 --- a/composer.json +++ b/composer.json @@ -35,8 +35,8 @@ "require-dev": { "illuminate/testing": "^9.0|^10.0|^11.0", "orchestra/testbench": "^7.0|^8.0|^9.0", - "pestphp/pest": "^1.1", - "pestphp/pest-plugin-mock": "^1.0", + "pestphp/pest": "^2.0", + "pestphp/pest-plugin-mock": "^2.0", "roave/security-advisories": "dev-latest", "vimeo/psalm": "^4.30" }, From 562bcda2907d5e8ec5566b537db4536b9b7d55f9 Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Sun, 10 Mar 2024 16:11:13 +0100 Subject: [PATCH 08/13] Ah! x5 --- .github/workflows/php.yml | 5 +++-- composer.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index e4d4477..46643b4 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -37,8 +37,9 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nunomaduro/termwind:${{ matrix.termwind }}" --no-interaction --no-update - composer update --prefer-dist --no-interaction --no-suggest + composer require "laravel/framework:${{ matrix.laravel }}" "nunomaduro/termwind:${{ matrix.termwind }}" --no-interaction --no-update + composer require "orchestra/testbench:${{ matrix.testbench }}" --dev --no-interaction --no-update + composer update --prefer-dist --no-interaction - name: Run test suite run: composer run-script test diff --git a/composer.json b/composer.json index 9db3453..7b4d202 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "pestphp/pest": "^2.0", "pestphp/pest-plugin-mock": "^2.0", "roave/security-advisories": "dev-latest", - "vimeo/psalm": "^4.30" + "vimeo/psalm": "^5.0" }, "autoload": { "psr-4": { From 9bc0c01221c4b951dd53625e56c1a11937c69b29 Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Sun, 10 Mar 2024 16:40:38 +0100 Subject: [PATCH 09/13] Ah! x6 --- phpunit.xml.dist | 52 ++++++++++++++++++++++++++---------------------- tests/Pest.php | 2 +- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6c80e46..283a411 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,29 +1,33 @@ - - - ./tests - - - - - ./src - - - ./tests - ./src/Facades - ./src/Log - ./src/NutgramServiceProvider.php - ./src/Console/RunCommand.php - ./src/Console/BaseMakeCommand.php - ./src/Mixins/MixinUtils.php - - - - - + cacheDirectory=".phpunit.cache"> + + + + ./tests + + + + + + + + + + ./src + + + ./tests + ./src/Facades + ./src/Log + ./src/NutgramServiceProvider.php + ./src/Console/RunCommand.php + ./src/Console/BaseMakeCommand.php + ./src/Mixins/MixinUtils.php + + + diff --git a/tests/Pest.php b/tests/Pest.php index 4046521..3921ed5 100644 --- a/tests/Pest.php +++ b/tests/Pest.php @@ -27,7 +27,7 @@ | */ -expect()->extend('getFileContent', fn () => $this->and(File::get($this->value))); +expect()->extend('getFileContent', fn () => $this->and($this->value = File::get($this->value))); /* |-------------------------------------------------------------------------- From 4d922a7d00c786e14706efd61fc10ceffdaebf6b Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Sun, 10 Mar 2024 16:55:28 +0100 Subject: [PATCH 10/13] Ah! x7 --- composer.json | 4 ++-- phpunit.xml.dist | 52 ++++++++++++++++++++++-------------------------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/composer.json b/composer.json index 7b4d202..64a4be0 100644 --- a/composer.json +++ b/composer.json @@ -35,8 +35,8 @@ "require-dev": { "illuminate/testing": "^9.0|^10.0|^11.0", "orchestra/testbench": "^7.0|^8.0|^9.0", - "pestphp/pest": "^2.0", - "pestphp/pest-plugin-mock": "^2.0", + "pestphp/pest": "^1.1", + "pestphp/pest-plugin-mock": "^1.0", "roave/security-advisories": "dev-latest", "vimeo/psalm": "^5.0" }, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 283a411..6c80e46 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,33 +1,29 @@ - - - - ./tests - - - - - - - - - - ./src - - - ./tests - ./src/Facades - ./src/Log - ./src/NutgramServiceProvider.php - ./src/Console/RunCommand.php - ./src/Console/BaseMakeCommand.php - ./src/Mixins/MixinUtils.php - - - +> + + + ./tests + + + + + ./src + + + ./tests + ./src/Facades + ./src/Log + ./src/NutgramServiceProvider.php + ./src/Console/RunCommand.php + ./src/Console/BaseMakeCommand.php + ./src/Mixins/MixinUtils.php + + + + + From 24fa4722290552c27ea52f8f8d7dccf43e33e874 Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Sun, 10 Mar 2024 17:03:10 +0100 Subject: [PATCH 11/13] Ah! x8 --- .github/workflows/php.yml | 5 ++++- composer.json | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 46643b4..4935af1 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -15,12 +15,15 @@ jobs: - laravel: 11.* testbench: 9.* termwind: 2.* + pest: 2.* - laravel: 10.* testbench: 8.* termwind: 1.* + pest: 1.* - laravel: 9.* testbench: 7.* termwind: 1.* + pest: 1.* name: PHP ${{ matrix.php }} + Laravel ${{ matrix.laravel }} steps: @@ -38,7 +41,7 @@ jobs: - name: Install dependencies run: | composer require "laravel/framework:${{ matrix.laravel }}" "nunomaduro/termwind:${{ matrix.termwind }}" --no-interaction --no-update - composer require "orchestra/testbench:${{ matrix.testbench }}" --dev --no-interaction --no-update + composer require "orchestra/testbench:${{ matrix.testbench }}" "pestphp/pest:${{ matrix.pest }}" "pestphp/pest-plugin-mock":${{ matrix.pest }}" --dev --no-interaction --no-update composer update --prefer-dist --no-interaction - name: Run test suite diff --git a/composer.json b/composer.json index 64a4be0..5ab2495 100644 --- a/composer.json +++ b/composer.json @@ -35,8 +35,8 @@ "require-dev": { "illuminate/testing": "^9.0|^10.0|^11.0", "orchestra/testbench": "^7.0|^8.0|^9.0", - "pestphp/pest": "^1.1", - "pestphp/pest-plugin-mock": "^1.0", + "pestphp/pest": "^1.1|^2.0", + "pestphp/pest-plugin-mock": "^1.0|^2.0", "roave/security-advisories": "dev-latest", "vimeo/psalm": "^5.0" }, From 75e6b21f2582ebbb2659ce267b42272a15aba6b7 Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Sun, 10 Mar 2024 17:04:21 +0100 Subject: [PATCH 12/13] Ah! x9 --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 4935af1..b2b41a7 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -41,7 +41,7 @@ jobs: - name: Install dependencies run: | composer require "laravel/framework:${{ matrix.laravel }}" "nunomaduro/termwind:${{ matrix.termwind }}" --no-interaction --no-update - composer require "orchestra/testbench:${{ matrix.testbench }}" "pestphp/pest:${{ matrix.pest }}" "pestphp/pest-plugin-mock":${{ matrix.pest }}" --dev --no-interaction --no-update + composer require "orchestra/testbench:${{ matrix.testbench }}" "pestphp/pest:${{ matrix.pest }}" "pestphp/pest-plugin-mock:${{ matrix.pest }}" --dev --no-interaction --no-update composer update --prefer-dist --no-interaction - name: Run test suite From ed4df63485e33af8d410a72a8872e23a16bf3116 Mon Sep 17 00:00:00 2001 From: Luca Patera Date: Wed, 13 Mar 2024 18:37:54 +0100 Subject: [PATCH 13/13] Bump nutgram version to 4.17.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5ab2495..8b74985 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "require": { "php": "^8.2", "nunomaduro/termwind": "^1.0|^2.0", - "nutgram/nutgram": "^4.11.0" + "nutgram/nutgram": "^4.17.0" }, "require-dev": { "illuminate/testing": "^9.0|^10.0|^11.0",