Merge pull request #5 from justbetter/feature/laravel-11

Support Laravel 11
justbetter · Mar 29, 2024 · 87db84c · 87db84c
2 parents 787b942 + 74d921c
commit 87db84c
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 17 deletions.
diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml
@@ -9,18 +9,20 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: [8.2]
-                laravel: [10.*]
+                php: [8.3]
+                laravel: [10.*, 11.*]
                 stability: [prefer-stable]
                 include:
                     - laravel: 10.*
                       testbench: 8.*
+                    - laravel: 11.*
+                      testbench: 9.*
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -9,18 +9,20 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: [8.2]
-                laravel: [10.*]
+                php: [8.3]
+                laravel: [10.*, 11.*]
                 stability: [prefer-stable]
                 include:
                     - laravel: 10.*
                       testbench: 8.*
+                    - laravel: 11.*
+                      testbench: 9.*
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2

diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -11,12 +11,12 @@ jobs:
 
         steps:
             -   name: Checkout code
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.2
+                    php-version: 8.3
                     extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
                     coverage: none
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,19 +8,24 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                os: [ubuntu-20.04, ubuntu-22.04]
-                php: [8.1, 8.2]
-                laravel: [10.*]
+                os: [ubuntu-latest]
+                php: [8.1, 8.2, 8.3]
+                laravel: [10.*, 11.*]
                 stability: [prefer-stable]
                 include:
                     - laravel: 10.*
                       testbench: 8.*
+                    - laravel: 11.*
+                      testbench: 9.*
+                exclude:
+                    - laravel: 11.*
+                      php: 8.1
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2

diff --git a/composer.json b/composer.json
@@ -20,13 +20,13 @@
     "php": "^8.1",
     "justbetter/laravel-akeneo-client": "^1.1",
     "justbetter/laravel-error-logger": "^2.3",
-    "laravel/framework": "^10.0",
+    "laravel/framework": "^10.0|^11.0",
     "spatie/laravel-activitylog": "^4.7"
   },
   "require-dev": {
+    "larastan/larastan": "^2.9",
     "laravel/pint": "^1.10",
-    "nunomaduro/larastan": "^2.6",
-    "orchestra/testbench": "^8.11",
+    "orchestra/testbench": "^8.0|^9.0",
     "phpstan/phpstan-mockery": "^1.1",
     "phpunit/phpunit": "^10.1"
   },

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,5 @@
 includes:
-    - ./vendor/nunomaduro/larastan/extension.neon
+    - ./vendor/larastan/larastan/extension.neon
     - ./vendor/phpstan/phpstan-mockery/extension.neon
 
 parameters:

diff --git a/src/Actions/Akeneo/FormatAttributeValues.php b/src/Actions/Akeneo/FormatAttributeValues.php
@@ -57,7 +57,7 @@ public function format(string $attributeCode, mixed $value): array
         return $values;
     }
 
-    public function value(mixed $data, string $scope = null, string $locale = null): array
+    public function value(mixed $data, ?string $scope = null, ?string $locale = null): array
     {
         return [
             'data' => $data,