Laravel 10 support (#24)

* update deps * adjust test matrix * update composer, use fork for imagecache * re-adjust dependencies * add GITHUB_TOKEN * update test matrix
reliqarts · Feb 22, 2023 · eca020f · eca020f
1 parent c84a216
commit eca020f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 deletions.
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -8,20 +8,30 @@ jobs:
     strategy:
       max-parallel: 10
       matrix:
-        laravel-version: ['^6.0', '^7.0', '^8.0', '^9.0']
+        laravel-version: ['^6.0', '^7.0', '^8.0', '^9.0', '^10.0']
         preference: ['stable']
-        php-version: ['7.4', '8.0', '8.1']
+        php-version: ['7.4', '8.0', '8.1', '8.2']
         exclude:
           - laravel-version: ^6.0
             php-version: 8.0
           - laravel-version: ^6.0
             php-version: 8.1
+          - laravel-version: ^6.0
+            php-version: 8.2
           - laravel-version: ^7.0
             php-version: 8.0
           - laravel-version: ^7.0
             php-version: 8.1
+          - laravel-version: ^7.0
+            php-version: 8.2
           - laravel-version: ^9.0
             php-version: 7.4
+          - laravel-version: ^9.0
+            php-version: 8.2
+          - laravel-version: ^10.0
+            php-version: 7.4
+          - laravel-version: ^10.0
+            php-version: 8.0
     name: Laravel ${{ matrix.laravel-version }} (${{ matrix.preference }}) on PHP ${{ matrix.php-version }}
     steps:
       - name: Checkout
@@ -32,6 +42,8 @@ jobs:
           php-version: ${{ matrix.php-version }}
           extensions: mbstring, xdebug
           coverage: xdebug
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Install dependencies
         run: |
           composer require --no-update --no-interaction "illuminate/support:${{ matrix.laravel-version }}"

diff --git a/composer.json b/composer.json
@@ -23,20 +23,27 @@
   ],
   "require": {
     "php": "^7.4 || ^8.0",
-    "illuminate/support": "6 - 9",
+    "illuminate/support": "6 - 10",
     "intervention/image": "^2.4",
-    "intervention/imagecache": "^2.3",
+    "intervention/imagecache": "dev-temp-support-laravel-10",
     "reliqarts/laravel-common": ">=5.4",
     "ext-json": "*",
-    "ext-fileinfo": "*"
+    "ext-fileinfo": "*",
+    "anhskohbo/no-captcha": "@dev"
   },
   "require-dev": {
-    "orchestra/testbench": "4 - 7",
+    "orchestra/testbench": "4 - 8",
     "phpro/grumphp": "^1.0",
     "phpspec/prophecy-phpunit": "^2.0",
     "phpunit/phpunit": "^9.3",
     "symplify/easy-coding-standard": ">=8.2"
   },
+  "repositories": [
+    {
+      "type": "vcs",
+      "url": "https://github.com/reliq/intervention-imagecache"
+    }
+  ],
   "autoload": {
     "psr-4": {
       "ReliqArts\\GuidedImage\\": "src/",
@@ -49,7 +56,10 @@
     "test:unit": "phpunit --testsuite=Unit --verbose --coverage-clover=coverage.xml"
   },
   "config": {
-    "sort-packages": true
+    "sort-packages": true,
+    "allow-plugins": {
+      "phpro/grumphp": true
+    }
   },
   "extra": {
     "laravel": {