Unverified Commit 7aa63c2d authored by Nicolas Widart's avatar Nicolas Widart Committed by GitHub

Merge pull request #656 from mikemand/update-upstream-laravel

Update from upstream Laravel
parents df3906d6 bb1d915f
...@@ -4,6 +4,7 @@ APP_KEY= ...@@ -4,6 +4,7 @@ APP_KEY=
APP_DEBUG=true APP_DEBUG=true
APP_CACHE=false APP_CACHE=false
INSTALLED=false INSTALLED=false
APP_LOG_LEVEL=debug
APP_URL=http://localhost APP_URL=http://localhost
LOG_CHANNEL=stack LOG_CHANNEL=stack
......
...@@ -49,9 +49,9 @@ class RegisterController extends Controller ...@@ -49,9 +49,9 @@ class RegisterController extends Controller
protected function validator(array $data) protected function validator(array $data)
{ {
return Validator::make($data, [ return Validator::make($data, [
'name' => 'required|string|max:255', 'name' => ['required', 'string', 'max:255'],
'email' => 'required|string|email|max:255|unique:users', 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => 'required|string|min:6|confirmed', 'password' => ['required', 'string', 'min:6', 'confirmed'],
]); ]);
} }
......
...@@ -65,7 +65,7 @@ class Kernel extends HttpKernel ...@@ -65,7 +65,7 @@ class Kernel extends HttpKernel
/** /**
* The priority-sorted list of middleware. * The priority-sorted list of middleware.
* *
* This forces the listed middleware to always be in the given order. * This forces non-global middleware to always be in the given order.
* *
* @var array * @var array
*/ */
...@@ -75,5 +75,6 @@ class Kernel extends HttpKernel ...@@ -75,5 +75,6 @@ class Kernel extends HttpKernel
\App\Http\Middleware\Authenticate::class, \App\Http\Middleware\Authenticate::class,
\Illuminate\Session\Middleware\AuthenticateSession::class, \Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class, \Illuminate\Routing\Middleware\SubstituteBindings::class,
// \Illuminate\Auth\Middleware\Authorize::class,
]; ];
} }
...@@ -14,6 +14,8 @@ class Authenticate extends Middleware ...@@ -14,6 +14,8 @@ class Authenticate extends Middleware
*/ */
protected function redirectTo($request) protected function redirectTo($request)
{ {
return route('login'); if (! $request->expectsJson()) {
return route('login');
}
} }
} }
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
*/ */
$app = new Illuminate\Foundation\Application( $app = new Illuminate\Foundation\Application(
dirname(__DIR__) $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
); );
/* /*
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
}, },
"scripts": { "scripts": {
"post-install-cmd": [ "post-install-cmd": [
"php artisan clear-compiled" "@php artisan clear-compiled"
], ],
"pre-update-cmd": [], "pre-update-cmd": [],
"post-autoload-dump": [ "post-autoload-dump": [
......
...@@ -92,6 +92,6 @@ return [ ...@@ -92,6 +92,6 @@ return [
| |
*/ */
'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache'), 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
]; ];
...@@ -37,6 +37,7 @@ return [ ...@@ -37,6 +37,7 @@ return [
'driver' => 'sqlite', 'driver' => 'sqlite',
'database' => env('DB_DATABASE', database_path('database.sqlite')), 'database' => env('DB_DATABASE', database_path('database.sqlite')),
'prefix' => '', 'prefix' => '',
'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
], ],
'mysql' => [ 'mysql' => [
...@@ -102,7 +103,7 @@ return [ ...@@ -102,7 +103,7 @@ return [
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Redis is an open source, fast, and advanced key-value store that also | 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. | such as APC or Memcached. Laravel makes it easy to dig right in.
| |
*/ */
......
...@@ -63,7 +63,7 @@ return [ ...@@ -63,7 +63,7 @@ return [
'public' => [ 'public' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('app/public'), 'root' => storage_path('app/public'),
'url' => env('APP_URL') . '/storage', 'url' => env('APP_URL').'/storage',
'visibility' => 'public', 'visibility' => 'public',
], ],
......
...@@ -120,4 +120,17 @@ return [ ...@@ -120,4 +120,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'),
]; ];
...@@ -60,7 +60,7 @@ return [ ...@@ -60,7 +60,7 @@ return [
'redis' => [ 'redis' => [
'driver' => 'redis', 'driver' => 'redis',
'connection' => 'default', 'connection' => 'default',
'queue' => 'default', 'queue' => env('REDIS_QUEUE', 'default'),
'retry_after' => 90, 'retry_after' => 90,
'block_for' => null, 'block_for' => null,
], ],
......
...@@ -34,6 +34,10 @@ return [ ...@@ -34,6 +34,10 @@ return [
'model' => App\User::class, 'model' => App\User::class,
'key' => env('STRIPE_KEY'), 'key' => env('STRIPE_KEY'),
'secret' => env('STRIPE_SECRET'), 'secret' => env('STRIPE_SECRET'),
'webhook' => [
'secret' => env('STRIPE_WEBHOOK_SECRET'),
'tolerance' => env('STRIPE_WEBHOOK_TOLERANCE', 300),
],
], ],
]; ];
...@@ -126,7 +126,7 @@ return [ ...@@ -126,7 +126,7 @@ return [
'cookie' => env( 'cookie' => env(
'SESSION_COOKIE', 'SESSION_COOKIE',
Str::slug(env('APP_NAME', 'laravel'), '_') . '_session' Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
), ),
/* /*
......
...@@ -28,6 +28,9 @@ return [ ...@@ -28,6 +28,9 @@ return [
| |
*/ */
'compiled' => realpath(storage_path('framework/views')), 'compiled' => env(
'VIEW_COMPILED_PATH',
realpath(storage_path('framework/views'))
),
]; ];
...@@ -13,7 +13,7 @@ return [ ...@@ -13,7 +13,7 @@ return [
| |
*/ */
'previous' => '« Previous', 'previous' => '« Previous',
'next' => 'Next »', 'next' => 'Next »',
]; ];
...@@ -13,105 +13,108 @@ return [ ...@@ -13,105 +13,108 @@ return [
| |
*/ */
'accepted' => 'The :attribute must be accepted.', 'accepted' => 'The :attribute must be accepted.',
'active_url' => 'The :attribute is not a valid URL.', 'active_url' => 'The :attribute is not a valid URL.',
'after' => 'The :attribute must be a date after :date.', 'after' => 'The :attribute must be a date after :date.',
'after_or_equal' => 'The :attribute must be a date after or equal to :date.', 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
'alpha' => 'The :attribute may only contain letters.', 'alpha' => 'The :attribute may only contain letters.',
'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.', 'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.',
'alpha_num' => 'The :attribute may only contain letters and numbers.', 'alpha_num' => 'The :attribute may only contain letters and numbers.',
'array' => 'The :attribute must be an array.', 'array' => 'The :attribute must be an array.',
'before' => 'The :attribute must be a date before :date.', 'before' => 'The :attribute must be a date before :date.',
'before_or_equal' => 'The :attribute must be a date before or equal to :date.', 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
'between' => [ 'between' => [
'numeric' => 'The :attribute must be between :min and :max.', 'numeric' => 'The :attribute must be between :min and :max.',
'file' => 'The :attribute must be between :min and :max kilobytes.', 'file' => 'The :attribute must be between :min and :max kilobytes.',
'string' => 'The :attribute must be between :min and :max characters.', 'string' => 'The :attribute must be between :min and :max characters.',
'array' => 'The :attribute must have between :min and :max items.', 'array' => 'The :attribute must have between :min and :max items.',
], ],
'boolean' => 'The :attribute field must be true or false.', 'boolean' => 'The :attribute field must be true or false.',
'confirmed' => 'The :attribute confirmation does not match.', 'confirmed' => 'The :attribute confirmation does not match.',
'date' => 'The :attribute is not a valid date.', 'date' => 'The :attribute is not a valid date.',
'date_format' => 'The :attribute does not match the format :format.', 'date_equals' => 'The :attribute must be a date equal to :date.',
'different' => 'The :attribute and :other must be different.', 'date_format' => 'The :attribute does not match the format :format.',
'digits' => 'The :attribute must be :digits digits.', 'different' => 'The :attribute and :other must be different.',
'digits_between' => 'The :attribute must be between :min and :max digits.', 'digits' => 'The :attribute must be :digits digits.',
'dimensions' => 'The :attribute has invalid image dimensions.', 'digits_between' => 'The :attribute must be between :min and :max digits.',
'distinct' => 'The :attribute field has a duplicate value.', 'dimensions' => 'The :attribute has invalid image dimensions.',
'email' => 'The :attribute must be a valid email address.', 'distinct' => 'The :attribute field has a duplicate value.',
'exists' => 'The selected :attribute is invalid.', 'email' => 'The :attribute must be a valid email address.',
'file' => 'The :attribute must be a file.', 'exists' => 'The selected :attribute is invalid.',
'filled' => 'The :attribute field must have a value.', 'file' => 'The :attribute must be a file.',
'gt' => [ 'filled' => 'The :attribute field must have a value.',
'gt' => [
'numeric' => 'The :attribute must be greater than :value.', 'numeric' => 'The :attribute must be greater than :value.',
'file' => 'The :attribute must be greater than :value kilobytes.', 'file' => 'The :attribute must be greater than :value kilobytes.',
'string' => 'The :attribute must be greater than :value characters.', 'string' => 'The :attribute must be greater than :value characters.',
'array' => 'The :attribute must have more than :value items.', 'array' => 'The :attribute must have more than :value items.',
], ],
'gte' => [ 'gte' => [
'numeric' => 'The :attribute must be greater than or equal :value.', 'numeric' => 'The :attribute must be greater than or equal :value.',
'file' => 'The :attribute must be greater than or equal :value kilobytes.', 'file' => 'The :attribute must be greater than or equal :value kilobytes.',
'string' => 'The :attribute must be greater than or equal :value characters.', 'string' => 'The :attribute must be greater than or equal :value characters.',
'array' => 'The :attribute must have :value items or more.', 'array' => 'The :attribute must have :value items or more.',
], ],
'image' => 'The :attribute must be an image.', 'image' => 'The :attribute must be an image.',
'in' => 'The selected :attribute is invalid.', 'in' => 'The selected :attribute is invalid.',
'in_array' => 'The :attribute field does not exist in :other.', 'in_array' => 'The :attribute field does not exist in :other.',
'integer' => 'The :attribute must be an integer.', 'integer' => 'The :attribute must be an integer.',
'ip' => 'The :attribute must be a valid IP address.', 'ip' => 'The :attribute must be a valid IP address.',
'ipv4' => 'The :attribute must be a valid IPv4 address.', 'ipv4' => 'The :attribute must be a valid IPv4 address.',
'ipv6' => 'The :attribute must be a valid IPv6 address.', 'ipv6' => 'The :attribute must be a valid IPv6 address.',
'json' => 'The :attribute must be a valid JSON string.', 'json' => 'The :attribute must be a valid JSON string.',
'lt' => [ 'lt' => [
'numeric' => 'The :attribute must be less than :value.', 'numeric' => 'The :attribute must be less than :value.',
'file' => 'The :attribute must be less than :value kilobytes.', 'file' => 'The :attribute must be less than :value kilobytes.',
'string' => 'The :attribute must be less than :value characters.', 'string' => 'The :attribute must be less than :value characters.',
'array' => 'The :attribute must have less than :value items.', 'array' => 'The :attribute must have less than :value items.',
], ],
'lte' => [ 'lte' => [
'numeric' => 'The :attribute must be less than or equal :value.', 'numeric' => 'The :attribute must be less than or equal :value.',
'file' => 'The :attribute must be less than or equal :value kilobytes.', 'file' => 'The :attribute must be less than or equal :value kilobytes.',
'string' => 'The :attribute must be less than or equal :value characters.', 'string' => 'The :attribute must be less than or equal :value characters.',
'array' => 'The :attribute must not have more than :value items.', 'array' => 'The :attribute must not have more than :value items.',
], ],
'max' => [ 'max' => [
'numeric' => 'The :attribute may not be greater than :max.', 'numeric' => 'The :attribute may not be greater than :max.',
'file' => 'The :attribute may not be greater than :max kilobytes.', 'file' => 'The :attribute may not be greater than :max kilobytes.',
'string' => 'The :attribute may not be greater than :max characters.', 'string' => 'The :attribute may not be greater than :max characters.',
'array' => 'The :attribute may not have more than :max items.', 'array' => 'The :attribute may not have more than :max items.',
], ],
'mimes' => 'The :attribute must be a file of type: :values.', 'mimes' => 'The :attribute must be a file of type: :values.',
'mimetypes' => 'The :attribute must be a file of type: :values.', 'mimetypes' => 'The :attribute must be a file of type: :values.',
'min' => [ 'min' => [
'numeric' => 'The :attribute must be at least :min.', 'numeric' => 'The :attribute must be at least :min.',
'file' => 'The :attribute must be at least :min kilobytes.', 'file' => 'The :attribute must be at least :min kilobytes.',
'string' => 'The :attribute must be at least :min characters.', 'string' => 'The :attribute must be at least :min characters.',
'array' => 'The :attribute must have at least :min items.', 'array' => 'The :attribute must have at least :min items.',
], ],
'not_in' => 'The selected :attribute is invalid.', 'not_in' => 'The selected :attribute is invalid.',
'not_regex' => 'The :attribute format is invalid.', 'not_regex' => 'The :attribute format is invalid.',
'numeric' => 'The :attribute must be a number.', 'numeric' => 'The :attribute must be a number.',
'present' => 'The :attribute field must be present.', 'present' => 'The :attribute field must be present.',
'regex' => 'The :attribute format is invalid.', 'regex' => 'The :attribute format is invalid.',
'required' => 'The :attribute field is required.', 'required' => 'The :attribute field is required.',
'required_if' => 'The :attribute field is required when :other is :value.', 'required_if' => 'The :attribute field is required when :other is :value.',
'required_unless' => 'The :attribute field is required unless :other is in :values.', 'required_unless' => 'The :attribute field is required unless :other is in :values.',
'required_with' => 'The :attribute field is required when :values is present.', 'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values are present.', 'required_with_all' => 'The :attribute field is required when :values are present.',
'required_without' => 'The :attribute field is required when :values is not present.', 'required_without' => 'The :attribute field is required when :values is not present.',
'required_without_all' => 'The :attribute field is required when none of :values are present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.',
'same' => 'The :attribute and :other must match.', 'same' => 'The :attribute and :other must match.',
'size' => [ 'size' => [
'numeric' => 'The :attribute must be :size.', 'numeric' => 'The :attribute must be :size.',
'file' => 'The :attribute must be :size kilobytes.', 'file' => 'The :attribute must be :size kilobytes.',
'string' => 'The :attribute must be :size characters.', 'string' => 'The :attribute must be :size characters.',
'array' => 'The :attribute must contain :size items.', 'array' => 'The :attribute must contain :size items.',
], ],
'string' => 'The :attribute must be a string.', 'starts_with' => 'The :attribute must start with one of the following: :values',
'timezone' => 'The :attribute must be a valid zone.', 'string' => 'The :attribute must be a string.',
'unique' => 'The :attribute has already been taken.', 'timezone' => 'The :attribute must be a valid zone.',
'uploaded' => 'The :attribute failed to upload.', 'unique' => 'The :attribute has already been taken.',
'url' => 'The :attribute format is invalid.', 'uploaded' => 'The :attribute failed to upload.',
'url' => 'The :attribute format is invalid.',
'uuid' => 'The :attribute must be a valid UUID.',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
...@@ -135,9 +138,9 @@ return [ ...@@ -135,9 +138,9 @@ return [
| Custom Validation Attributes | Custom Validation Attributes
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| The following language lines are used to swap attribute place-holders | The following language lines are used to swap our attribute placeholder
| with something more reader friendly such as E-Mail Address instead | with something more reader friendly such as "E-Mail Address" instead
| of "email". This simply helps us make messages a little cleaner. | of "email". This simply helps us make our message more expressive.
| |
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment