Merge branch 'master' into Upgrading-To-6.0-From-5.8

.env.example

@@ -13,12 +13,6 @@ DB_DATABASE=urlhub
 DB_USERNAME=root
 DB_PASSWORD=
 
-DB_TEST_HOST=127.0.0.1
-DB_TEST_PORT=3306
-DB_TEST_DATABASE=urlhub_test
-DB_TEST_USERNAME=root
-DB_TEST_PASSWORD=
-
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 SESSION_DRIVER=file

.env.testing

@@ -0,0 +1,44 @@
+APP_NAME=URLHub
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=urlhub_test
+DB_USERNAME=root
+DB_PASSWORD=
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+QUEUE_DRIVER=sync
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.travis.yml

@@ -19,8 +19,7 @@ install:
 
 before_script:
   - mysql -e 'create database urlhub_test;'
-  - cp .env.example .env
-  - php artisan key:generate
+  - php artisan key:generate --env=testing
 
 script:
   - mkdir -p build/logs

composer.json

@@ -31,7 +31,8 @@
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^3.0",
         "php-coveralls/php-coveralls": "^2.1",
-        "phpunit/phpunit": "^8"
+        "phpunit/phpunit": "^8",
+        "wnx/laravel-stats": "^2.0"
     },
     "config": {
         "optimize-autoloader": true,