Merge branch '2.x'

# Conflicts:
#	composer.json

.gitignore

@@ -1,2 +1,3 @@
 /vendor
-composer.lock
+composer.lock
+.phpunit.result.cache

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Tom Irons
+Copyright (c) 2017 Tom Irons
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "tomirons/tuxedo",
-    "description": "Simple transactional email classes/templates for Laravel mailables",
+    "description": "Simple transactional email classes/templates for Laravel 5.4 mailables",
     "license": "MIT",
     "authors": [
         {
@@ -9,14 +9,14 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
-        "illuminate/database": "5.5.*",
-        "illuminate/mail": "5.5.*",
-        "illuminate/support": "5.5.*"
+        "php": "^7.3",
+        "illuminate/database": "^6.0|^7.0|^8.0",
+        "illuminate/mail": "^6.0|^7.0|^8.0",
+        "illuminate/support": "^6.0|^7.0|^8.0"
     },
     "require-dev": {
-        "mockery/mockery": "~0.9.4",
-        "phpunit/phpunit": "~5.7"
+        "mockery/mockery": "^1.4",
+        "phpunit/phpunit": "^9.2"
     },
     "autoload": {
         "psr-4": {
@@ -25,7 +25,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev"
+            "dev-master": "2.x-dev"
         },
         "laravel": {
             "providers": [

phpunit.xml.dist

@@ -7,19 +7,16 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnError="false"
          stopOnFailure="false"
-         syntaxCheck="true"
-         verbose="true"
 >
+    <coverage>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+    </coverage>
     <testsuites>
-        <testsuite name="Tuxedo Test Suite">
-            <directory suffix="Test.php">./tests</directory>
+        <testsuite name="Unit">
+            <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
 </phpunit>

resources/views/html/alert/box.blade.php

@@ -3,9 +3,7 @@
         <td class="alert-content alert-{{ $type }}">
             <table width="100%" cellpadding="0" cellspacing="0">
                 <tr>
-                    <td class="alert-item">
-                        {{ Illuminate\Mail\Markdown::parse($slot) }}
-                    </td>
+                    <td class="alert-item">{{ Illuminate\Mail\Markdown::parse($slot) }}</td>
                 </tr>
             </table>
         </td>

resources/views/html/invoice/table.blade.php

@@ -3,7 +3,8 @@
         <td>
             <h3>{{ $data['id'] }}</h3></td>
         <td>
-            <h3 class="align-right">{{ $data['date'] }}</h3></td>
+            <h3 class="align-right">{{ $data['date'] }}</h3>
+        </td>
     </tr>
     <tr>
         <td colspan="2">
@@ -53,4 +54,4 @@
             </table>
         </td>
     </tr>
-</table>
+</table>

resources/views/text/alert/box.blade.php

@@ -0,0 +1 @@
+foo

src/Mailables/ActionMailable.php

@@ -2,15 +2,14 @@
 
 namespace TomIrons\Tuxedo\Mailables;
 
-use TomIrons\Tuxedo\Message;
 use TomIrons\Tuxedo\Traits\HasAction;
 use TomIrons\Tuxedo\Traits\HasLine;
 use TomIrons\Tuxedo\TuxedoMessage;
 
 class ActionMailable extends TuxedoMessage
 {
-    use HasAction,
-        HasLine;
+    use HasAction;
+    use HasLine;
 
     /**
      * The Markdown template for the message (if applicable).

src/Mailables/AlertMailable.php

@@ -2,7 +2,6 @@
 
 namespace TomIrons\Tuxedo\Mailables;
 
-use TomIrons\Tuxedo\Message;
 use TomIrons\Tuxedo\Traits\HasLine;
 use TomIrons\Tuxedo\TuxedoMessage;
 

src/Mailables/InvoiceMailable.php

@@ -9,8 +9,8 @@
 
 class InvoiceMailable extends TuxedoMessage
 {
-    use HasAction,
-        HasLine;
+    use HasAction;
+    use HasLine;
 
     /**
      * The Markdown template for the message (if applicable).

src/TuxedoMessage.php

@@ -6,6 +6,13 @@
 
 class TuxedoMessage extends Mailable
 {
+    /**
+     * The theme for the mailable.
+     *
+     * @var string
+     */
+    public $theme = 'tuxedo';
+
     /**
      * The message's greeting.
      *

src/TuxedoServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace TomIrons\Tuxedo;
 
-use Illuminate\Mail\Markdown;
 use Illuminate\Support\ServiceProvider;
 
 class TuxedoServiceProvider extends ServiceProvider
@@ -16,13 +15,21 @@ public function boot()
     {
         $this->loadViewsFrom(__DIR__.'/../resources/views', 'tuxedo');
 
+        $this->alterConfiguration();
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
         if ($this->app->runningInConsole()) {
             $this->publishes([
-                __DIR__.'/../resources/views' => resource_path('views/vendor/tuxedo'),
-            ], 'tuxedo');
+                __DIR__.'/../resources/views' => $this->app->resourcePath('views/vendor/tuxedo'),
+            ], 'tuxedo-mail');
         }
-
-        $this->alterConfiguration();
     }
 
     /**
@@ -32,7 +39,6 @@ public function boot()
      */
     public function alterConfiguration()
     {
-        config()->set('mail.markdown.theme', 'tuxedo');
         config()->set('mail.markdown.paths', array_merge([__DIR__.'/../resources/views'], config('mail.markdown.paths')));
     }
 }

tests/ActionMailableTest.php → tests/Unit/ActionMailableTest.php

@@ -1,14 +1,15 @@
 <?php
 
-namespace Tests;
+namespace Tests\Unit;
 
+use PHPUnit\Framework\TestCase;
 use TomIrons\Tuxedo\Mailables\ActionMailable;
 
-class ActionMailableTest extends \PHPUnit_Framework_TestCase
+class ActionMailableTest extends TestCase
 {
     protected $mailable;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/AlertMailableTest.php → tests/Unit/AlertMailableTest.php

@@ -1,14 +1,15 @@
 <?php
 
-namespace Tests;
+namespace Tests\Unit;
 
+use PHPUnit\Framework\TestCase;
 use TomIrons\Tuxedo\Mailables\AlertMailable;
 
-class AlertMailableTest extends \PHPUnit_Framework_TestCase
+class AlertMailableTest extends TestCase
 {
     protected $mailable;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/InvoiceMailableTest.php → tests/Unit/InvoiceMailableTest.php

@@ -1,14 +1,15 @@
 <?php
 
-namespace Tests;
+namespace Tests\Unit;
 
+use PHPUnit\Framework\TestCase;
 use TomIrons\Tuxedo\Mailables\InvoiceMailable;
 
-class InvoiceMailableTest extends \PHPUnit_Framework_TestCase
+class InvoiceMailableTest extends TestCase
 {
     protected $mailable;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();