From 8071c8714dcd16fc0c65c4861f4db5b9248eb9c9 Mon Sep 17 00:00:00 2001 From: Pascal Baljet Date: Fri, 4 Feb 2022 10:55:52 +0100 Subject: [PATCH] Support for Laravel 9 (#6) --- .github/workflows/run-tests.yml | 81 +++++++++++++++++---------------- .scrutinizer.yml | 25 ---------- CHANGELOG.md | 4 ++ README.md | 2 +- composer.json | 8 ++-- 5 files changed, 52 insertions(+), 68 deletions(-) delete mode 100644 .scrutinizer.yml diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 77f59c0..c0de69e 100644 --- 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 deleted file mode 100644 index 5ce12ac..0000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,25 +0,0 @@ -build: - nodes: - analysis: - tests: - override: - - php-scrutinizer-run - -filter: - excluded_paths: [tests/*] - -checks: - php: - remove_extra_empty_lines: true - remove_php_closing_tag: true - remove_trailing_whitespace: true - fix_use_statements: - remove_unused: true - preserve_multiple: false - preserve_blanklines: true - order_alphabetically: true - fix_php_opening_tag: true - fix_linefeed: true - fix_line_ending: true - fix_identation_4spaces: true - fix_doc_comments: true diff --git a/CHANGELOG.md b/CHANGELOG.md index d7f5039..4432633 100644 --- 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 index 89b8d48..3f21e7d 100644 --- 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 index c3f93cf..aebf259 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": "^7.4 || ^8.0 || ^8.1", - "illuminate/support": "^8.67" + "illuminate/support": "^8.67 || ^9.0" }, "require-dev": { "html2text/html2text": "^4.3", @@ -25,10 +25,10 @@ "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",