Merge branch 'development'

Author: marickvantuil

.travis.yml

@@ -1,11 +1,35 @@
 language: php
 
-php:
-  - 7.0
-  - 7.1
-
 sudo: false
 
+services:
+  - mysql
+
+matrix:
+  fast_finish: true
+  include:
+    # SQLite
+    - php: 7.0
+      env: CI_DB_DRIVER="sqlite" CI_DB_DATABASE=":memory:"
+    - php: 7.1
+      env: CI_DB_DRIVER="sqlite" CI_DB_DATABASE=":memory:"
+    # MySQL 5.7
+    - php: 7.0
+      env: CI_DB_DRIVER="mysql" CI_DB_HOST="127.0.0.1" CI_DB_DATABASE="travis" CI_DB_USERNAME="root"
+    - php: 7.1
+      env: CI_DB_DRIVER="mysql" CI_DB_HOST="127.0.0.1" CI_DB_DATABASE="travis" CI_DB_USERNAME="root"
+    # MariaDB
+    - php: 7.0
+      env: CI_DB_DRIVER="mysql" CI_DB_HOST="127.0.0.1" CI_DB_DATABASE="travis" CI_DB_USERNAME="root"
+      addons:
+        mariadb: 10.0
+    - php: 7.1
+      env: CI_DB_DRIVER="mysql" CI_DB_HOST="127.0.0.1" CI_DB_DATABASE="travis" CI_DB_USERNAME="root"
+      addons:
+        mariadb: 10.0
+
 install: travis_retry composer install --no-interaction --prefer-source
 
-script: vendor/bin/phpunit --verbose
+script:
+  - mysql --version
+  - vendor/bin/phpunit --verbose

database/migrations/2017_12_14_151421_add_attachments_to_emails_table.php

@@ -18,7 +18,7 @@ public function up()
         }
 
         Schema::table('emails', function (Blueprint $table) {
-            $table->binary('attachments')->nullable()->after('body');
+            $table->binary('attachments')->after('body')->nullable();
         });
     }
 

phpunit.xml

@@ -22,13 +22,12 @@
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="MAIL_DRIVER" value="log"/>
-        <env name="DB_CONNECTION" value="sqlite"/>
-        <env name="DB_DATABASE" value=":memory:"/>
+        <env name="DB_CONNECTION" value="testbench"/>
     </php>
 
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="false">
             <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>

tests/TestCase.php

@@ -28,6 +28,8 @@ function () {
         $this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
 
         view()->addNamespace('tests', __DIR__ . '/views');
+
+        Email::truncate();
     }
 
     /**
@@ -77,6 +79,17 @@ protected function getPackageProviders($app)
     protected function getEnvironmentSetUp($app)
     {
         $app['config']->set('laravel-database-emails.retry.attempts', 3);
+
+        $app['config']->set('database.default', 'testbench');
+        $app['config']->set('database.connections.testbench', [
+            'driver'   => getenv('CI_DB_DRIVER'),
+            'host'     => getenv('CI_DB_HOST'),
+            'database' => getenv('CI_DB_DATABASE'),
+            'username' => getenv('CI_DB_USERNAME'),
+            'password' => getenv('CI_DB_PASSWORD'),
+            'prefix'   => '',
+            'strict' => true,
+        ]);
     }
 
     public function createEmail($overwrite = [])