Merge pull request #10 from Lukasss93/laravel11-support

Support for Laravel 11
Lukasss93 · Mar 15, 2024 · 47fcdab · 47fcdab
2 parents a33f72d + 119237f
commit 47fcdab
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 43 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -17,17 +17,7 @@ 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-${{ hashFiles('**/composer.json') }}
-          restore-keys: |
-            ${{ runner.os }}-php-
-
       - name: Install dependencies
-        if: steps.composer-cache.outputs.cache-hit != 'true'
         run: composer install --no-progress --no-ansi
 
       - name: Run Psalm
@@ -38,18 +28,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.0, 8.1, 8.2 ]
-        laravel: [ 8.*, 9.*, 10.* ]
+        php: [ 8.0, 8.1, 8.2, 8.3 ]
+        laravel: [ 8.*, 9.*, 10.*, 11.* ]
         include:
           - laravel: 8.*
             testbench: 6.*
           - laravel: 9.*
             testbench: 7.*
           - laravel: 10.*
             testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
         exclude:
           - php: 8.0
             laravel: 10.*
+          - php: 8.0
+            laravel: 11.*
+          - php: 8.1
+            laravel: 11.*
 
     name: Laravel ${{ matrix.laravel }} with PHP ${{ matrix.php }}
 
@@ -72,8 +68,9 @@ jobs:
 
       - name: Install dependencies
         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 }}" --no-interaction --no-update
+          composer require "orchestra/testbench:${{ matrix.testbench }}" --dev --no-interaction --no-update
+          composer update --prefer-dist --no-interaction
 
       - name: Execute tests
         run: composer test-coverage
@@ -90,27 +87,17 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           coverage: xdebug
 
       - 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-8.2-${{ hashFiles('**/composer.json') }}
-          restore-keys: |
-            ${{ runner.os }}-php-8.2-
-
       - name: Install dependencies
-        if: steps.composer-cache.outputs.cache-hit != 'true'
-        run: composer install --prefer-dist --no-interaction --no-suggest
+        run: composer install --prefer-dist --no-interaction
 
       - name: Run test suite
-        uses: paambaati/codeclimate-action@v3.2.0
+        uses: paambaati/codeclimate-action@v5.0.0
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_REPORTER_ID }}
         with:

diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ composer.lock
 /vendor/
 coverage.xml
 phpunit.xml
+composer.phar
diff --git a/README.md b/README.md
@@ -102,15 +102,15 @@ composer test
 
 ## 🔰 Version Support
 
-| Larex Crowdin | L7.x | L8.x | L9.x | L10.x |
-|:-------------:|:----:|:----:|:----:|:-----:|
-|     ^1.0      |  ✅   |  ✅   |  ❌   |   ❌   |
-|     ^2.0      |  ❌   |  ✅   |  ✅   |   ✅   |
-
-| Larex Crowdin | PHP7.4 | PHP8.0 | PHP8.1 | PHP8.2 |
-|:-------------:|:------:|:------:|:------:|:------:|
-|     ^1.0      |   ✅    |   ✅    |   ✅    |   ❌    |
-|     ^2.0      |   ❌    |   ✅    |   ✅    |   ✅    |
+| Larex Crowdin | L7.x | L8.x | L9.x | L10.x | L11.x |
+|:-------------:|:----:|:----:|:----:|:-----:|:-----:|
+|     ^1.0      |  ✅   |  ✅   |  ❌   |   ❌   |   ❌   |
+|     ^2.0      |  ❌   |  ✅   |  ✅   |   ✅   |   ✅   |
+
+| Larex Crowdin | PHP7.4 | PHP8.0 | PHP8.1 | PHP8.2 | PHP8.3 |
+|:-------------:|:------:|:------:|:------:|:------:|:------:|
+|     ^1.0      |   ✅    |   ✅    |   ✅    |   ✅    |   ✅    |
+|     ^2.0      |   ❌    |   ✅    |   ✅    |   ✅    |   ✅    |
 
 ## 📃 Changelog
 

diff --git a/composer.json b/composer.json
@@ -17,14 +17,14 @@
         "ext-json": "*",
         "ext-simplexml": "*",
         "crowdin/crowdin-api-client": "^1.7",
-        "illuminate/support": "^8.0|^9.0|^10.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
         "loilo/fuse": "^6.4",
-        "lukasss93/laravel-larex": "^4.4"
+        "lukasss93/laravel-larex": "^4.5"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.0|^7.0|^8.0",
-        "pestphp/pest": "^1.21",
-        "vimeo/psalm": "^4.24"
+        "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0",
+        "pestphp/pest": "^1.0|^2.0",
+        "vimeo/psalm": "^5.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/psalm.xml b/psalm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="6"
+    errorLevel="7"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

diff --git a/tests/Pest.php b/tests/Pest.php
@@ -41,7 +41,7 @@
 |
 */
 
-expect()->extend('fileContent', fn () => $this->and(File::get($this->value)));
+expect()->extend('fileContent', fn () => $this->and($this->value = File::get($this->value)));
 expect()->extend('toEqualStub', fn ($name) => $this->toEqual(getStub($name)));
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ @@
     |
     */
-    expect()->extend('fileContent', fn () => $this->and(File::get($this->value)));
+    expect()->extend('fileContent', fn () => $this->and($this->value = File::get($this->value)));
     expect()->extend('toEqualStub', fn ($name) => $this->toEqual(getStub($name)));
     /*
@@ Expand Down @@