Merge pull request #37 from samehdoush/1.x

[1.x] Support Laravel 12
binafy · Feb 25, 2025 · 49114f7 · 49114f7
2 parents 868ef62 + af68dc9
commit 49114f7
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 36 deletions.
diff --git a/.github/workflows/pint.yml b/.github/workflows/pint.yml
@@ -1,34 +1,31 @@
 name: Fix Code Style
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
-    lint:
-        runs-on: ubuntu-latest
-        strategy:
-            fail-fast: true
-            matrix:
-                php: [8.3]
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: json, dom, curl, libxml, mbstring
-                  coverage: none
-
-            - name: Install Pint
-              run: composer global require laravel/pint
-
-            - name: Run Pint
-              run: pint
-
-            - name: Commit linted files
-              uses: stefanzweifel/git-auto-commit-action@v5
-              with:
-                  commit_message: "Fixes coding style"
-
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.0]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: json, dom, curl, libxml, mbstring
+          coverage: none
+
+      - name: Install Pint
+        run: composer global require laravel/pint
+
+      - name: Run Pint
+        run: pint
+
+      - name: Commit linted files
+        uses: stefanzweifel/git-auto-commit-action@v5
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,10 +8,14 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [8.0, 8.1, 8.2, 8.3]
-                laravel: [9.*, 10.*, 11.*]
+                php: [8.0, 8.1, 8.2, 8.3, 8.4]
+                laravel: [9.*, 10.*, 11.*, 12.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
+                    - laravel: 12.*
+                      testbench: 10.*
+                      pest-plugin-laravel: 3.1.0
+
                     - laravel: 11.*
                       testbench: 9.*
                       pest-plugin-laravel: 2.3.0
@@ -25,6 +29,12 @@ jobs:
                       pest-plugin-laravel: 1.4.0
 
                 exclude:
+                    - laravel: 12.*
+                      php: 8.1
+
+                    - laravel: 12.*
+                      php: 8.0
+
                     - laravel: 11.*
                       php: 8.1
 

diff --git a/composer.json b/composer.json
@@ -14,7 +14,10 @@
         "laravel-cart-shop",
         "laravel-shop",
         "laravel e-commerce",
-        "laravel basket"
+        "laravel basket",
+        "laravel shopping",
+        "laravel shopping cart",
+        "laravelshoppingcart"
     ],
     "type": "library",
     "license": "MIT",
@@ -45,11 +48,11 @@
     },
     "require": {
         "php": "^8.0",
-        "laravel/framework": "^9.0|^10.0|^11.0"
+        "laravel/framework": ">=9.0"
     },
     "require-dev": {
-        "pestphp/pest-plugin-laravel": "^1.4.0|^2.0.0",
-        "orchestra/testbench": "^7.0|^8.0|^9.0",
+        "pestphp/pest-plugin-laravel": "^1.4.0|^2.0.0|^3.1.0",
+        "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0",
         "laravel/pint": "^1.5"
     },
     "config": {