Merge branch 'release/5.3.6'

.env.example

@@ -31,8 +31,8 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_DRIVER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
+MAIL_HOST=localhost
+MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null

.gitignore

@@ -1,7 +1,7 @@
 /node_modules
 /public/hot
 /public/storage
-public/images
+/public/images
 /storage/*.key
 /vendor
 /.idea
@@ -12,7 +12,7 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 .env
-.env.dusk.*
+.env.backup
 .DS_Store
 Thumbs.db
 *.sublime-project

app/Http/Middleware/TrustProxies.php

@@ -13,7 +13,7 @@ class TrustProxies extends Middleware
     /**
      * The trusted proxies for this application.
      *
-     * @var array
+     * @var array|string
      */
     protected $proxies;
 

config/cache.php

@@ -80,6 +80,7 @@
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
             'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
+            'endpoint' => env('DYNAMODB_ENDPOINT'),
         ],
     ],
 

config/database.php

@@ -3,6 +3,7 @@
 use Illuminate\Support\Str;
 
 return [
+
     /*
     |--------------------------------------------------------------------------
     | Default Database Connection Name
@@ -33,8 +34,10 @@
     */
 
     'connections' => [
+
         'sqlite' => [
             'driver' => 'sqlite',
+            'url' => env('DATABASE_URL'),
             'database' => env('DB_DATABASE', database_path('database.sqlite')),
             'prefix' => '',
             'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
@@ -48,6 +51,7 @@
 
         'mysql' => [
             'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '3306'),
             'database' => env('DB_DATABASE', 'forge'),
@@ -67,6 +71,7 @@
 
         'pgsql' => [
             'driver' => 'pgsql',
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '5432'),
             'database' => env('DB_DATABASE', 'forge'),
@@ -81,6 +86,7 @@
 
         'sqlsrv' => [
             'driver' => 'sqlsrv',
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', 'localhost'),
             'port' => env('DB_PORT', '1433'),
             'database' => env('DB_DATABASE', 'forge'),
@@ -90,6 +96,7 @@
             'prefix' => '',
             'prefix_indexes' => true,
         ],
+
     ],
 
     /*
@@ -117,6 +124,7 @@
     */
 
     'redis' => [
+
         'client' => env('REDIS_CLIENT', 'predis'),
 
         'options' => [
@@ -125,17 +133,21 @@
         ],
 
         'default' => [
+            'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port' => env('REDIS_PORT', 6379),
             'database' => env('REDIS_DB', 0),
         ],
 
         'cache' => [
+            'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port' => env('REDIS_PORT', 6379),
             'database' => env('REDIS_CACHE_DB', 1),
         ],
+
     ],
+
 ];

package.json

@@ -15,26 +15,26 @@
         "tdd": "cross-var $npm_execpath run test -- --watch --notify"
     },
     "devDependencies": {
-        "@coreui/coreui": "^2.1.9",
-        "@fortawesome/fontawesome-free": "^5.8.1",
+        "@coreui/coreui": "^2.1.12",
+        "@fortawesome/fontawesome-free": "^5.9.0",
         "@vue/test-utils": "^1.0.0-beta.29",
-        "axios": "^0.18.0",
+        "axios": "^0.19",
         "babel-core": "^7.0.0-bridge.0",
-        "babel-jest": "^24.5.0",
+        "babel-jest": "^24.8.0",
         "bootstrap": "^4.3.1",
         "cross-env": "^5.2.0",
         "cross-var": "^1.1.0",
-        "jest": "^24.5.0",
+        "jest": "^24.8.0",
         "jquery": "^3.4.1",
-        "laravel-mix": "^4.0.15",
+        "laravel-mix": "^4.0.16",
         "lodash": "^4.17.11",
         "pace": "github:HubSpot/pace#v1.0.2",
         "perfect-scrollbar": "^1.4.0",
-        "popper.js": "^1.14.7",
+        "popper.js": "^1.15.0",
         "resolve-url-loader": "^2.3.2",
-        "sass": "^1.17.3",
+        "sass": "^1.21.0",
         "sass-loader": "^7.1.0",
-        "sweetalert2": "^8.7.0",
+        "sweetalert2": "^8.13.0",
         "vue": "^2.6.10",
         "vue-jest": "^3.0.4",
         "vue-template-compiler": "^2.6.10"