diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 063463c..a74f70f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -11,33 +11,22 @@ jobs: strategy: matrix: - php: [8.1, 8.0, 7.4, 7.3, 7.2] - laravel: [9.*, 8.*, 7.*, 6.*] os: [ubuntu-latest] - include: - - laravel: 9.* - testbench: 7.* - - laravel: 8.* - testbench: 6.* - - laravel: 7.* - testbench: 5.* - - laravel: 6.* - testbench: 4.* - exclude: - - laravel: 9.* - php: 7.2 - - laravel: 9.* - php: 7.3 - - laravel: 9.* - php: 7.4 - - laravel: 8.* - php: 7.2 - - laravel: 6.* - php: 8.1 - - laravel: 7.* - php: 8.1 + payload: + - { laravel: '10.*', php: '8.2', 'testbench': '8.*'} + - { laravel: '10.*', php: '8.1', 'testbench': '8.*'} + - { laravel: '9.*', php: '8.2', 'testbench': '7.*'} + - { laravel: '9.*', php: '8.1', 'testbench': '7.*'} + - { laravel: '9.*', php: '8.0', 'testbench': '7.*'} + - { laravel: '8.*', php: '8.1', 'testbench': '6.*'} + - { laravel: '8.*', php: '8.0', 'testbench': '6.*'} + - { laravel: '8.*', php: '7.4', 'testbench': '6.*'} + - { laravel: '7.*', php: '8.0', 'testbench': '5.*' } + - { laravel: '7.*', php: '7.4', 'testbench': '5.*' } + - { laravel: '6.*', php: '8.0', 'testbench': '4.*' } + - { laravel: '6.*', php: '7.4', 'testbench': '4.*' } - name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} + name: PHP ${{ matrix.payload.php }} - Laravel ${{ matrix.payload.laravel }} services: mysql: @@ -54,19 +43,19 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v1 + uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php }} + php-version: ${{ matrix.payload.php }} extensions: mbstring, dom, fileinfo, mysql coverage: none - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --prefer-stable --prefer-dist --no-interaction --no-suggest + composer require "laravel/framework:${{ matrix.payload.laravel }}" "orchestra/testbench:${{ matrix.payload.testbench }}" --no-interaction --no-update + composer update --prefer-stable --prefer-dist --no-interaction - name: Execute tests env: CI_DB_DRIVER: mysql diff --git a/CHANGELOG.md b/CHANGELOG.md index e0b0367..0b0cc84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## 6.1.0 - 2023-02-08 + +**Changed** + +- Added support for Laravel 10 + ## 6.0.0 - 2022-02-10 **Added** diff --git a/README.md b/README.md index 457a323..7d08266 100644 --- a/README.md +++ b/README.md @@ -21,14 +21,7 @@ We feel the package is currently feature complete, but feel free to send a pull This package requires Laravel 6.0 or higher. -Please check the table below for supported Laravel and PHP versions: - -|Laravel Version| PHP Version | -|---|---| -| 6.x | 7.2 or 7.3 or 7.4 or 8.0 -| 7.x | 7.2 or 7.3 or 7.4 or 8.0 -| 8.x | 7.3 or 7.4 or 8.0 or 8.1 -| 9.x | 8.0 or 8.1 +Please check the [Laravel support policy](https://laravel.com/docs/master/releases#support-policy) table for supported Laravel and PHP versions. # Installation diff --git a/composer.json b/composer.json index 583fb0d..48ff446 100644 --- a/composer.json +++ b/composer.json @@ -30,6 +30,30 @@ }, "require-dev": { "mockery/mockery": "^1.2", - "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0" + "orchestra/testbench": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0" + }, + "minimum-stability": "dev", + "prefer-stable": true, + "scripts": { + "l10": [ + "composer require laravel/framework:10.* orchestra/testbench:8.* --no-interaction --no-update", + "composer update --prefer-stable --prefer-dist --no-interaction --no-suggest" + ], + "l9": [ + "composer require laravel/framework:9.* orchestra/testbench:7.* --no-interaction --no-update", + "composer update --prefer-stable --prefer-dist --no-interaction --no-suggest" + ], + "l8": [ + "composer require laravel/framework:8.* orchestra/testbench:6.* --no-interaction --no-update", + "composer update --prefer-stable --prefer-dist --no-interaction --no-suggest" + ], + "l7": [ + "composer require laravel/framework:8.* orchestra/testbench:6.* --no-interaction --no-update", + "composer update --prefer-stable --prefer-dist --no-interaction --no-suggest" + ], + "l6": [ + "composer require laravel/framework:8.* orchestra/testbench:6.* --no-interaction --no-update", + "composer update --prefer-stable --prefer-dist --no-interaction --no-suggest" + ] } } diff --git a/phpunit.xml b/phpunit.xml index 24fb777..eb3301d 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,32 +1,22 @@ - - - - - ./tests/ - - - - - - - - - - - - - - - src/ - - + + + + src/ + + + + + ./tests/ + + + + + + + + + + + diff --git a/src/MailableReader.php b/src/MailableReader.php index f926540..f1307d6 100644 --- a/src/MailableReader.php +++ b/src/MailableReader.php @@ -125,10 +125,6 @@ private function readSubject(EmailComposer $composer): void */ private function readBody(EmailComposer $composer): void { - if (app()->version() < '5.5') { - throw new Exception('Mailables cannot be read by Laravel 5.4 and below. Sorry.'); - } - $composer->setData('view', ''); $mailable = $composer->getData('mailable');