Merge pull request #21 from nutgram/laravel11-support

Fix dependencies for Laravel 11 support
nutgram · Mar 13, 2024 · 6bdf15c · 6bdf15c
2 parents fc25894 + ed4df63
commit 6bdf15c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -9,13 +9,21 @@ 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.*
+                        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:
@@ -30,20 +38,11 @@ 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 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 }}" "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
                 run: composer run-script test

diff --git a/composer.json b/composer.json
@@ -29,16 +29,16 @@
   "prefer-stable": true,
   "require": {
     "php": "^8.2",
-    "nunomaduro/termwind": "^1.15",
-    "nutgram/nutgram": "^4.11.0"
+    "nunomaduro/termwind": "^1.0|^2.0",
+    "nutgram/nutgram": "^4.17.0"
   },
   "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": "^4.30"
+    "vimeo/psalm": "^5.0"
   },
   "autoload": {
     "psr-4": {

diff --git 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)));
 
 /*
 |--------------------------------------------------------------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -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)));
     /*
     |--------------------------------------------------------------------------
@@ Expand Down @@