diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 4769dc8..2680a49 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -3,6 +3,7 @@ name: run-tests on: - push - pull_request + - workflow_dispatch jobs: test: @@ -13,7 +14,7 @@ jobs: matrix: os: [ubuntu-latest] php: [8.0, 8.1, 8.2] - laravel: ['8.*', '9.*', '10.*', '11.*'] + laravel: ['8.*', '9.*', '10.*', '11.*', '12.*'] stability: [prefer-stable] exclude: - php: 8.0 @@ -24,6 +25,10 @@ jobs: php: 8.0 - laravel: 11.* php: 8.1 + - laravel: 12.* + php: 8.0 + - laravel: 12.* + php: 8.1 include: - laravel: 10.* testbench: 8.* @@ -33,6 +38,8 @@ jobs: testbench: 6.23 - laravel: 11.* testbench: 9.* + - laravel: 12.* + testbench: 10.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} @@ -50,7 +57,7 @@ jobs: - name: Install dependencies run: | composer install - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --dev --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: Execute tests diff --git a/README.md b/README.md index cf9098f..e50c4c4 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,16 @@ composer require beyondcode/laravel-mailbox Take a look at the [official documentation](https://docs.beyondco.de/laravel-mailbox). +## Catch, test and debug application mails with Laravel Herd + +Laravel Herd provides an integrated local email service, streamlining the process of testing and debugging application emails. +The email service organizes emails into distinct inboxes for each application, ensuring they are easily accessible and simple to locate. + +[herd.laravel.com](https://herd.laravel.com) + +![image](https://github.com/user-attachments/assets/6417907c-119d-43ac-9cf6-5638bafae24f) + + ### Testing ``` bash diff --git a/composer.json b/composer.json index 54c8a4d..44a1f50 100644 --- a/composer.json +++ b/composer.json @@ -17,19 +17,19 @@ ], "require": { "php": "^8.0", - "illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "illuminate/log": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/log": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "willdurand/email-reply-parser": "^2.8", - "zbateson/mail-mime-parser": "^1.1|^2.4" + "zbateson/mail-mime-parser": "^1.1|^2.4|^3.0" }, "require-dev": { "laminas/laminas-mail": "^2.13", "mockery/mockery": "^1.2", - "orchestra/testbench": "^4.0|^5.0|^7.0|^8.0|^9.0", - "phpunit/phpunit": "^7.0|^8.0|^9.3|^10.5" + "orchestra/testbench": "^4.0|^5.0|^7.0|^8.0|^9.0|^10.0", + "phpunit/phpunit": "^7.0|^8.0|^9.3|^10.5|^11.5.3" }, "autoload": { "psr-4": { diff --git a/src/InboundEmail.php b/src/InboundEmail.php index 884445f..6e24fff 100644 --- a/src/InboundEmail.php +++ b/src/InboundEmail.php @@ -170,7 +170,8 @@ public function forward($recipients) return Mail::send([], [], function ($message) use ($recipients) { $message->to($recipients) ->subject($this->subject()) - ->setBody($this->body(), $this->message()->getContentType()); + ->text($this->text()) + ->html($this->html()); }); } diff --git a/src/Routing/Router.php b/src/Routing/Router.php index 390d839..216ac71 100644 --- a/src/Routing/Router.php +++ b/src/Routing/Router.php @@ -24,7 +24,7 @@ class Router /** @var Container */ protected $container; - public function __construct(Container $container = null) + public function __construct(?Container $container = null) { $this->container = $container ?: new Container;