From e5db3a720c9cae20c5746e44a1674c1a730b7b3c Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Thu, 9 Nov 2017 16:22:23 +0800
Subject: [PATCH] Update configuration of Travis CI

---
 .env.testing                          |  6 +--
 .travis.yml                           | 63 +++++++++++----------------
 app/Providers/BootServiceProvider.php |  9 ++++
 3 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/.env.testing b/.env.testing
index a64b7da4..d5baf671 100644
--- a/.env.testing
+++ b/.env.testing
@@ -12,12 +12,12 @@ DB_HOST         = 127.0.0.1
 DB_PORT         = 3306
 DB_DATABASE     = test
 DB_USERNAME     = root
-DB_PASSWORD     = root
+DB_PASSWORD     = null
 DB_PREFIX       = null
 PWD_METHOD      = PHP_PASSWORD_HASH
 
-SALT = 2c5ca184f017a9a1ffbd198ef69b0c0e
-APP_KEY = base64:gkb/zouNF6UOSfnr/o+izVMS57WQS3+62YqZBuDyBhU=
+SALT            = c67709dd8b7b733aca0d570681fe96cf
+APP_KEY         = base64:eVX/xzF5NhpGB2luswliFx9XSBsbbAP21wOi68X/P34=
 
 MAIL_DRIVER     = smtp
 MAIL_HOST       = null
diff --git a/.travis.yml b/.travis.yml
index b3f98e1a..c7e9603f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,50 +5,39 @@ git:
 
 cache:
   directories:
-    - vendor
-    - node_modules
+  - vendor
+  - node_modules
 
 env:
-  global: APP_ENV=testing DB_HOST=localhost DB_USERNAME=root DB_PASSWORD= DB_DATABASE=blessing_test
+  global: APP_ENV=testing
 
-before_install:
-  - if [[ $TEST_TYPE == 'php' ]]; then mysql -e 'CREATE DATABASE blessing_test;' ; fi
+services: mysql
 
-install:
-  - composer install
+install: composer install
 
 before_script:
-  - if [[ $TEST_TYPE == 'php' ]]; then php artisan key:generate ; fi
+- mysql -e 'CREATE DATABASE IF NOT EXISTS test;'
+- php artisan key:random
+- php artisan salt:random
 
-script:
-  - ./vendor/bin/phpunit
+script: ./vendor/bin/phpunit
 
 matrix:
   include:
-    - php: 5.6
-      env: TEST_TYPE=php
-      services:
-        - mysql
-    - php: 7.0
-      env: TEST_TYPE=php
-      services:
-        - mysql
-      script:
-        - ./vendor/bin/phpunit --coverage-clover=coverage.xml
-      after_success:
-        - bash <(curl -s https://codecov.io/bash) -cF php
-    - php: 7.1
-      env: TEST_TYPE=php
-      services:
-        - mysql
-    - node_js: 8
-      language: node_js
-      node_js: 8
-      env: TEST_TYPE=js
-      install:
-        - yarn
-      script:
-        - yarn run lint
-        - yarn test:coverage
-      after_success:
-        - yarn run codecov
+  - php: 5.6
+  - php: 7.0
+    script:
+    - ./vendor/bin/phpunit --coverage-clover=coverage.xml
+    after_success:
+    - bash <(curl -s https://codecov.io/bash) -cF php
+  - php: 7.1
+  - node_js: 8
+    language: node_js
+    install: yarn
+    before_script:
+    - echo "Testing JavaScript Code" > /dev/null
+    script:
+    - yarn run lint
+    - yarn test:coverage
+    after_success:
+    - yarn run codecov
diff --git a/app/Providers/BootServiceProvider.php b/app/Providers/BootServiceProvider.php
index c1ff4e56..eef3078b 100644
--- a/app/Providers/BootServiceProvider.php
+++ b/app/Providers/BootServiceProvider.php
@@ -55,6 +55,15 @@ class BootServiceProvider extends ServiceProvider
             // check database config
             Database::prepareConnection();
         } catch (\Exception $e) {
+            if (PHP_SAPI == "cli") {
+                // dump some useful information for debugging
+                dump([
+                    'APP_ENV' => app()->environment(),
+                    'DOTENV_FILE' => app()->environmentFile(),
+                    'DB_CONNECTION' => config('database.connections.mysql')
+                ]);
+            }
+
             throw new PrettyPageException(
                 trans('setup.database.connection-error', ['msg' => $e->getMessage()]),
                 $e->getCode()