Add L5.8 support

.gitignore

@@ -3,4 +3,5 @@ composer.lock
 docs
 vendor
 coverage
-.idea/
+.idea/
+.phpunit.result.cache

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-database-mail-templates` will be documented in this file
 
+# 3.0.1 - 2019-02-27
+
+- Add support for Laravel 5.8
+
 # 3.0.0 - 2019-02-04
 
 - Add support for text mails (#10)

composer.json

@@ -17,14 +17,14 @@
     ],
     "require": {
         "php": "^7.1",
-        "laravel/framework": "~5.7",
+        "laravel/framework": "~5.7|~5.8",
         "mustache/mustache": "^2.12"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
-        "mockery/mockery": "^1.0.0",
-        "orchestra/testbench": "~3.7",
-        "phpunit/phpunit": "^7.0"
+        "mockery/mockery": "^1.0",
+        "orchestra/testbench": "~3.7|~5.8",
+        "phpunit/phpunit": "^7.0|^8.0"
     },
     "autoload": {
         "psr-4": {

src/TemplateMailableRenderer.php

@@ -2,6 +2,7 @@
 
 namespace Spatie\MailTemplates;
 
+use Illuminate\Support\Str;
 use Mustache_Engine;
 use Spatie\MailTemplates\Exceptions\CannotRenderTemplateMailable;
 
@@ -74,7 +75,7 @@ protected function renderInLayout(string $body, int $layoutType, array $data = [
 
     protected function guardAgainstInvalidLayout(string $layout): void
     {
-        if (! str_contains($layout, [
+        if (! Str::contains($layout, [
             '{{{body}}}',
             '{{{ body }}}',
             '{{body}}',

tests/TestCase.php

@@ -10,7 +10,7 @@
 
 class TestCase extends OrchestraTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();