Support for Laravel 9 (#6)

protonemedia · Feb 4, 2022 · 8071c87 · 8071c87
1 parent 07aeff2
commit 8071c87
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 68 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -3,41 +3,46 @@ name: run-tests
 on: [push, pull_request]
 
 jobs:
-    test:
-        runs-on: ubuntu-latest
-        strategy:
-            fail-fast: true
-            matrix:
-                php: [8.1, 8.0, 7.4]
-                laravel: [8.*]
-                dependency-version: [prefer-lowest, prefer-stable]
-                include:
-                    - laravel: 8.*
-                      testbench: 6.*
-
-        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
-
-        steps:
-            - name: Checkout code
-              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, mysql, mysqli, pdo_mysql
-                  coverage: none
-
-            - name: Install Ghostscript
-              run: |
-                  sudo apt-get update
-                  sudo apt-get install -y ghostscript
-                  which ghostscript
-
-            - 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
-
-            - name: Execute tests
-              run: vendor/bin/phpunit
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.1, 8.0, 7.4]
+        laravel: [9.*, 8.*]
+        dependency-version: [prefer-lowest, prefer-stable]
+        exclude:
+          - laravel: 9.*
+            php: 7.4
+        include:
+          - laravel: 9.*
+            testbench: 7.*
+          - laravel: 8.*
+            testbench: 6.*
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+
+    steps:
+      - name: Checkout code
+        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, mysql, mysqli, pdo_mysql
+          coverage: none
+
+      - name: Install Ghostscript
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ghostscript
+          which ghostscript
+
+      - 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
+
+      - name: Execute tests
+        run: vendor/bin/phpunit
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-mixins` will be documented in this file.
 
+## 3.2.0 - 2022-02-04
+
+- Added supprt for Laravel 9
+
 ## 3.1.0 - 2021-12-19
 
 - Added supprt for PHP 8.1

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ We proudly support the community by developing Laravel packages and giving them
 
 ## Installation
 
-Only the master branch and version 3.0 of this package are compatible with Laravel 8.0. If you're still using an older version of Laravel (or PHP < 7.4), please use the 2.x branch. Mind that older versions are no longer supported.
+Only the master branch and version 3.0 of this package are compatible with Laravel 8.0 ad 9.0. If you're still using an older version of Laravel (or PHP < 7.4), please use the 2.x branch. Mind that older versions are no longer supported.
 
 You can install the package via composer:
 

diff --git a/composer.json b/composer.json
@@ -17,18 +17,18 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0 || ^8.1",
-        "illuminate/support": "^8.67"
+        "illuminate/support": "^8.67 || ^9.0"
     },
     "require-dev": {
         "html2text/html2text": "^4.3",
         "jeremykendall/php-domain-parser": "^6.0",
         "laravel/ui": "^2.0 || ^3.0",
         "mockery/mockery": "^1.3.3",
         "moneyphp/money": "^3.3",
-        "orchestra/testbench": "^6.23",
+        "orchestra/testbench": "^6.23 || ^7.0",
         "phpunit/phpunit": "^9.4",
-        "spatie/laravel-sitemap": "^5.7",
-        "symfony/process": "^5.1"
+        "spatie/laravel-sitemap": "^5.7 || ^6.0",
+        "symfony/process": "^5.1 || ^6.0"
     },
     "suggest": {
         "html2text/html2text": "To convert HTML to formatted plain text",