Merge branch 'master' into fl/psr-15

framework/core/.travis.yml

@@ -1,9 +1,12 @@
 language: php
+sudo: false
 
 env:
-  - DB_USERNAME=travis
+  global:
-services:
+    - DB=mariadb
-  - mysql
+
+addons:
+  mariadb: '10.2'
 
 php:
   - 7.1
@@ -11,8 +14,20 @@ php:
 
 matrix:
   fast_finish: true
+  include:
+    - php: 7.1
+      addons: # to prevent mariadb
+      services: mysql
+      env:
+        - DB=mysql
+    - php: 7.2
+      addons: # to prevent mariadb
+      services: mysql
+      env:
+        - DB=mysql
+
 before_install:
-  - mysql -e 'CREATE DATABASE flarum;'
+  - if [[ "$DB" == "mysql" || "$DB" == "mariadb" ]]; then mysql -e 'CREATE DATABASE flarum;'; fi
 before_script:
   - composer self-update
   - composer install
@@ -26,5 +41,3 @@ notifications:
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
-
-sudo: false

framework/core/phpunit.xml

@@ -19,4 +19,9 @@
             <exclude>./tests/Install</exclude>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src/</directory>
+        </whitelist>
+    </filter>
 </phpunit>

framework/core/tests/Test/Concerns/CreatesForum.php

@@ -75,9 +75,10 @@ trait CreatesForum
         $data->setSetting('mail_driver', 'log');
 
         $database = $data->getDatabaseConfiguration();
-        $database['database'] = env('DB_DATABASE', 'flarum');
+        $database['host'] = env('DB_HOST', $database['host']);
-        $database['username'] = env('DB_USERNAME', 'root');
+        $database['database'] = env('DB_DATABASE', $database['database']);
-        $database['password'] = env('DB_PASSWORD', '');
+        $database['username'] = env('DB_USERNAME', $database['username']);
+        $database['password'] = env('DB_PASSWORD', $database['password']);
         $data->setDatabaseConfiguration($database);
 
         $this->configuration = $data;