Merge pull request #13 from Iankumu/dev

Dev
Iankumu · Mar 13, 2024 · 130ba6e · 130ba6e
2 parents fdaccf4 + 0eb2339
commit 130ba6e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,45 +12,49 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php: ["8.0", 8.1, 8.2]
-        laravel: [8.*, 9.*, 10.*]
-        dependency-version: [prefer-stable]
+        laravel: [8.*, 9.*, 10.*, 11.*]
+        stability: [prefer-stable]
         include:
-          - laravel: 10.*
-            testbench: 8.*
+          - laravel: 8.*
+            testbench: 6.*
             carbon: ^2.63
           - laravel: 9.*
-            testbench: 7.*
+            testbench: ^7.0
             carbon: ^2.63
-          - laravel: 8.*
-            testbench: 6.*
+          - laravel: 10.*
+            testbench: ^8.0
+            carbon: ^2.63
+          - laravel: 11.*
+            testbench: ^9.0
             carbon: ^2.63
         exclude:
           - laravel: 10.*
             php: 8.0
+          - laravel: 11.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
 
-    name: PHP ${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
+    name: PHP${{ matrix.php }} - LARAVEL${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: ~/.composer/cache/files
-          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+        uses: actions/checkout@v2
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
           coverage: none
 
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
       - name: Install dependencies
         run: |
           composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
-
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
       - name: Execute tests
         run: vendor/bin/pest
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,4 @@ coverage
 build
 .fleet
 .DS_Store
-
+.phpunit.cache
diff --git a/composer.json b/composer.json
@@ -42,14 +42,14 @@
     "test": "vendor/bin/pest"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.0 | ^10.0",
-    "orchestra/testbench": "^6.0 | ^7.0 | ^8.0",
+    "phpunit/phpunit": "^9.0 | ^10.0 | ^11.0",
+    "orchestra/testbench": "^6.0 | ^7.0 | ^8.0 |^9.0",
     "pestphp/pest": "^1.0 |^2.0"
   },
   "require": {
     "php": "^8.0 | ^8.1 | ^8.2",
-    "illuminate/support": "^8.0 | ^9.0 | ^10.0",
-    "illuminate/http":"^8.0 | ^9.0 | ^10.0",
+    "illuminate/support": "^8.0 | ^9.0 | ^10.0 | ^11.0",
+    "illuminate/http":"^8.0 | ^9.0 | ^10.0 | ^11.0",
     "guzzlehttp/guzzle": "^7.5"
   },
   "minimum-stability": "dev",