Merge branch 'master' into develop

2020-03-06 11:48:48 +00:00
parent 5c4f9980ec 36373983ad
commit 404b43b502
4 changed files with 10 additions and 2 deletions
--- a/config/app.php
+++ b/config/app.php
@@ -39,7 +39,7 @@ return [
    |
    */

-    'debug' => env('APP_DEBUG', false),
+    'debug' => (bool) env('APP_DEBUG', false),

    /*
    |--------------------------------------------------------------------------
--- a/config/cache.php
+++ b/config/cache.php
@@ -39,6 +39,7 @@ return [

        'array' => [
            'driver' => 'array',
+            'serialize' => false,
        ],

        'database' => [
--- a/config/mail.php
+++ b/config/mail.php
@@ -47,6 +47,14 @@ return [
            'transport' => 'ses',
        ],

+        'mailgun' => [
+            'transport' => 'mailgun',
+        ],
+
+        'postmark' => [
+            'transport' => 'postmark',
+        ],
+
        'sendmail' => [
            'transport' => 'sendmail',
            'path' => '/usr/sbin/sendmail -bs',
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -7,7 +7,6 @@
        <testsuite name="Unit">
            <directory suffix="Test.php">./tests/Unit</directory>
        </testsuite>
-
        <testsuite name="Feature">
            <directory suffix="Test.php">./tests/Feature</directory>
        </testsuite>