Merge 3b33ce1 into 0363ae1

realodix · Sep 4, 2019 · 7880919 · 7880919
2 parents 0363ae1 + 3b33ce1
commit 7880919
Show file tree

Hide file tree

Showing 17 changed files with 333 additions and 307 deletions.
diff --git a/.env.example b/.env.example
@@ -13,6 +13,12 @@ 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

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

diff --git a/composer.json b/composer.json
@@ -13,20 +13,19 @@
         "php": "^7.2",
         "codeitnowin/barcode": "^3.0",
         "creativeorange/gravatar": "~1.0",
-        "davejamesmiller/laravel-breadcrumbs": "^5.1",
+        "davejamesmiller/laravel-breadcrumbs": "^5.3",
         "fideloper/proxy": "^4.0",
         "geoip2/geoip2": "~2.0",
         "hidehalo/nanoid-php": "^1.1",
         "jenssegers/agent": "^2.6",
         "laravel/framework": "5.8.*",
         "laravel/tinker": "^1.0",
-        "laravolt/avatar": "^2.0",
-        "spatie/laravel-permission": "^2.17",
+        "laravolt/avatar": "^2.2",
+        "spatie/laravel-permission": "^3.0",
         "vinkla/hashids": "^6.0",
         "yajra/laravel-datatables-oracle": "~9.0"
     },
     "require-dev": {
-        "beyondcode/laravel-dump-server": "^1.0",
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",