Get repo up to date with changes in laravel/laravel (issue #95)

Squashed commit of the following: commit 850a0dfe70412f0851d1f40fe96c7afdc8348aab Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sun Jan 27 13:42:09 2019 +0000 Persist data cache commit fc80710c96b33bf387e346f97a58ed3965520427 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sun Jan 27 13:15:10 2019 +0000 Added another laravel dependency commit 1a9ed1bc71e3a11624e4924ae75c4284e6071f6d Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sun Jan 27 13:14:50 2019 +0000 Fix trailing comma commit 81f31ae7116146b073c8f886cb74e32d806eba60 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 19:07:55 2019 +0000 Add Laravel’s illustration SVGs commit d1f99e4ec2b39d0159689f586f37465cbf867c2b Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 19:07:34 2019 +0000 Add the dump-server commit 28a09927a32d20510f6bc236d14daf948c5dd547 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:58:27 2019 +0000 Add mailgin endpoint commit e80e3a9d53852d5f137918d79969f5a3a93fad81 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:55:11 2019 +0000 Update cache config commit 3db2f952d420be7e49041d495db6ee59ee310841 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:50:02 2019 +0000 Update session config commit 0b431150616cb15f17b571e9340e6805723344d6 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:46:05 2019 +0000 Add faker locale setting commit 048e8ee0c7969ed9b2251f270aea8fee25b3bf98 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:44:09 2019 +0000 Add new Stripe webhook config values commit 18ce7bee19fca7f920fdcca72049108fd5a7a9b6 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:42:57 2019 +0000 Add Authenticate to middleware commit 05007f1f038cac4453e4b5d82cb04d6f0820606c Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:34:28 2019 +0000 Update phpunit config commit 5c033735fbe148b3f3e3950ae97a21977895eeb7 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:32:18 2019 +0000 Update queue config commit fe92a6f2896a52ab1486288878055cd81abe28e7 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:27:22 2019 +0000 Update database config commit 19036d7cb1ffc583a571451a7ea00fb421beef8f Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:22:41 2019 +0000 Add asset_url config option commit ce4b1e3195a6c43fdc4f6fabb2a41b68344220fc Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:20:40 2019 +0000 Allow custom compiled views path commit b503bca8c6a27fef44d34b826c75a2ee68e0a178 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:20:18 2019 +0000 Add mail logging setting commit 2988ba197bbd1b0ac78a17ad796f31cc0bb803df Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:17:41 2019 +0000 normalize composer.json commit a1ff37d716c68f1dedec9644e9fe6f3a7a5ad04f Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:11:58 2019 +0000 Allow env for defining app base commit e662de24e3a2b7f170c6fb0860c6c16f192aa642 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:10:17 2019 +0000 Get kernel/middleware upto date commit 2f8c9de52bec8a54fa6745a42c9a8974de0a1467 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:04:44 2019 +0000 Update validation lang file commit 8f6bf24eec602b21d28b0b6bae6e274c175ff643 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 18:02:28 2019 +0000 Update .gitignore commit e219cc454f3e77b822fe761c672bf24824c06d0c Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 17:59:32 2019 +0000 Update logging.php config file commit 5a13e1b89f9311918f3f9756d9607424f42e72c5 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 17:56:36 2019 +0000 Remove extra whitespace commit 68edee0a9dca0d11d18964329d7f0ec49d32c6e8 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 17:53:30 2019 +0000 Recompile assets from new resources folder structure commit 7ec8441a802cb1385fb40cdd22b2398180287512 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 17:44:56 2019 +0000 Change reference to assets files in various scripts commit c2f6dfccf2843b25038475d2a5f492decc9e8124 Author: Jonny Barnes <jonny@jonnybarnes.uk> Date: Sat Jan 26 17:42:25 2019 +0000 Flatten assets directory
2019-01-27 13:50:04 +00:00 · 2019-01-27 13:50:04 +00:00 · 76d474b335
commit 76d474b335
parent acbb04f5a9
66 changed files with 383 additions and 150 deletions
--- a/config/app.php
+++ b/config/app.php
@ -54,6 +54,8 @@ return [

    'url' => env('APP_URL', 'http://localhost'),

+    'asset_url' => env('ASSET_URL', null),
+
    /*
    |--------------------------------------------------------------------------
    | Application Long URL
@ -126,6 +128,19 @@ return [

    'fallback_locale' => 'en',

+    /*
+    |--------------------------------------------------------------------------
+    | Faker Locale
+    |--------------------------------------------------------------------------
+    |
+    | This locale will be used by the Faker PHP library when generating fake
+    | data for your database seeds. For example, this will be used to get
+    | localized telephone numbers, street address information and more.
+    |
+    */
+
+    'faker_locale' => 'en_US',
+
    /*
    |--------------------------------------------------------------------------
    | Encryption Key
--- a/config/cache.php
+++ b/config/cache.php
@ -1,5 +1,7 @@
 <?php

+use Illuminate\Support\Str;
+
 return [

    /*
@ -57,7 +59,7 @@ return [
                env('MEMCACHED_PASSWORD'),
            ],
            'options' => [
-                // Memcached::OPT_CONNECT_TIMEOUT  => 2000,
+                // Memcached::OPT_CONNECT_TIMEOUT => 2000,
            ],
            'servers' => [
                [
@ -86,6 +88,6 @@ return [
    |
    */

-    'prefix' => 'laravel',
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),

 ];
--- a/config/database.php
+++ b/config/database.php
@ -37,6 +37,7 @@ return [
            'driver' => 'sqlite',
            'database' => env('DB_DATABASE', database_path('database.sqlite')),
            'prefix' => '',
+            'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
        ],

        'mysql' => [
@ -50,6 +51,7 @@ return [
            'charset' => 'utf8mb4',
            'collation' => 'utf8mb4_unicode_ci',
            'prefix' => '',
+            'prefix_indexes' => true,
            'strict' => true,
            'engine' => null,
        ],
@ -63,6 +65,7 @@ return [
            'password' => env('DB_PASSWORD', ''),
            'charset' => 'utf8',
            'prefix' => '',
+            'prefix_indexes' => true,
            'schema' => 'public',
            'sslmode' => 'prefer',
        ],
@ -76,6 +79,7 @@ return [
            'password' => env('DB_PASSWORD', ''),
            'charset' => 'utf8',
            'prefix' => '',
+            'prefix_indexes' => true,
        ],

        'travis' => [
@ -110,7 +114,7 @@ return [
    |--------------------------------------------------------------------------
    |
    | Redis is an open source, fast, and advanced key-value store that also
-    | provides a richer set of commands than a typical key-value systems
+    | provides a richer body of commands than a typical key-value system
    | such as APC or Memcached. Laravel makes it easy to dig right in.
    |
    */
@ -120,10 +124,17 @@ return [
        'client' => 'predis',

        'default' => [
-            'host' => env('REDIS_HOST', 'localhost'),
+            'host' => env('REDIS_HOST', '127.0.0.1'),
            'password' => env('REDIS_PASSWORD', null),
            'port' => env('REDIS_PORT', 6379),
-            'database' => 0,
+            'database' => env('REDIS_DB', 0),
+        ],
+
+        'cache' => [
+            'host' => env('REDIS_HOST', '127.0.0.1'),
+            'password' => env('REDIS_PASSWORD', null),
+            'port' => env('REDIS_PORT', 6379),
+            'database' => env('REDIS_CACHE_DB', 1),
        ],

    ],
--- a/config/logging.php
+++ b/config/logging.php
@ -1,5 +1,8 @@
 <?php

+use Monolog\Handler\StreamHandler;
+use Monolog\Handler\SyslogUdpHandler;
+
 return [

    /*
@ -25,7 +28,8 @@ return [
    | you a variety of powerful log handlers / formatters to utilize.
    |
    | Available Drivers: "single", "daily", "slack", "syslog",
-    |                    "errorlog", "custom", "stack"
+    |                    "errorlog", "monolog",
+    |                    "custom", "stack"
    |
    */

@ -45,7 +49,7 @@ return [
            'driver' => 'daily',
            'path' => storage_path('logs/laravel.log'),
            'level' => 'debug',
-            'days' => 7,
+            'days' => 14,
        ],

        'slack' => [
@ -56,6 +60,25 @@ return [
            'level' => 'critical',
        ],

+        'papertrail' => [
+            'driver' => 'monolog',
+            'level' => 'debug',
+            'handler' => SyslogUdpHandler::class,
+            'handler_with' => [
+                'host' => env('PAPERTRAIL_URL'),
+                'port' => env('PAPERTRAIL_PORT'),
+            ],
+        ],
+
+        'stderr' => [
+            'driver' => 'monolog',
+            'handler' => StreamHandler::class,
+            'formatter' => env('LOG_STDERR_FORMATTER'),
+            'with' => [
+                'stream' => 'php://stderr',
+            ],
+        ],
+
        'syslog' => [
            'driver' => 'syslog',
            'level' => 'debug',
--- a/config/mail.php
+++ b/config/mail.php
@ -119,4 +119,17 @@ return [
        ],
    ],

+    /*
+    |--------------------------------------------------------------------------
+    | Log Channel
+    |--------------------------------------------------------------------------
+    |
+    | If you are using the "log" driver, you may specify the logging channel
+    | if you prefer to keep mail messages separate from other log entries
+    | for simpler reading. Otherwise, the default channel will be used.
+    |
+    */
+
+    'log_channel' => env('MAIL_LOG_CHANNEL'),
+
 ];
--- a/config/queue.php
+++ b/config/queue.php
@ -4,18 +4,16 @@ return [

    /*
    |--------------------------------------------------------------------------
-    | Default Queue Driver
+    | Default Queue Connection Name
    |--------------------------------------------------------------------------
    |
    | Laravel's queue API supports an assortment of back-ends via a single
    | API, giving you convenient access to each back-end using the same
-    | syntax for each one. Here you may set the default queue driver.
-    |
-    | Supported: "sync", "database", "beanstalkd", "sqs", "redis", "null"
+    | syntax for every one. Here you may define a default connection.
    |
    */

-    'default' => env('QUEUE_DRIVER', 'sync'),
+    'default' => env('QUEUE_CONNECTION', 'sync'),

    /*
    |--------------------------------------------------------------------------
@ -26,6 +24,8 @@ return [
    | is used by your application. A default configuration has been added
    | for each back-end shipped with Laravel. You are free to add more.
    |
+    | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
+    |
    */

    'connections' => [
@ -50,18 +50,19 @@ return [

        'sqs' => [
            'driver' => 'sqs',
-            'key' => 'your-public-key',
-            'secret' => 'your-secret-key',
-            'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id',
-            'queue' => 'your-queue-name',
-            'region' => 'us-east-1',
+            'key' => env('SQS_KEY', 'your-public-key'),
+            'secret' => env('SQS_SECRET', 'your-secret-key'),
+            'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
+            'queue' => env('SQS_QUEUE', 'your-queue-name'),
+            'region' => env('SQS_REGION', 'us-east-1'),
        ],

        'redis' => [
            'driver' => 'redis',
            'connection' => 'default',
-            'queue' => 'default',
+            'queue' => env('REDIS_QUEUE', 'default'),
            'retry_after' => 90,
+            'block_for' => null,
        ],

    ],
--- a/config/services.php
+++ b/config/services.php
@ -17,6 +17,7 @@ return [
    'mailgun' => [
        'domain' => env('MAILGUN_DOMAIN'),
        'secret' => env('MAILGUN_SECRET'),
+        'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
    ],

    'ses' => [
@ -33,6 +34,10 @@ return [
        'model' => App\User::class,
        'key' => env('STRIPE_KEY'),
        'secret' => env('STRIPE_SECRET'),
+        'webhook' => [
+            'secret' => env('STRIPE_WEBHOOK_SECRET'),
+            'tolerance' => env('STRIPE_WEBHOOK_TOLERANCE', 300),
+        ],
    ],

 ];
--- a/config/session.php
+++ b/config/session.php
@ -1,5 +1,7 @@
 <?php

+use Illuminate\Support\Str;
+
 return [

    /*
@ -70,7 +72,7 @@ return [
    |
    */

-    'connection' => null,
+    'connection' => env('SESSION_CONNECTION', null),

    /*
    |--------------------------------------------------------------------------
@ -96,7 +98,7 @@ return [
    |
    */

-    'store' => null,
+    'store' => env('SESSION_STORE', null),

    /*
    |--------------------------------------------------------------------------
@ -124,7 +126,7 @@ return [

    'cookie' => env(
        'SESSION_COOKIE',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_session'
+        Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
    ),

    /*
--- a/config/view.php
+++ b/config/view.php
@ -28,6 +28,9 @@ return [
    |
    */

-    'compiled' => realpath(storage_path('framework/views')),
+    'compiled' => env(
+        'VIEW_COMPILED_PATH',
+        realpath(storage_path('framework/views'))
+    ),

 ];