Skip to content

Commit 4070dc9

Browse files
taylorotwelltaylorotwell
committed
fix conflicts
2 parents b1763fe + 70532dd commit 4070dc9

30 files changed

+337
-148
lines changed

‎.gitignore

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
/public/storage
44
/storage/*.key
55
/vendor
6-
/.idea
7-
/.vscode
8-
/.vagrant
6+
.env
7+
.phpunit.result.cache
98
Homestead.json
109
Homestead.yaml
1110
npm-debug.log
1211
yarn-error.log
13-
.env
14-
.phpunit.result.cache

‎CHANGELOG.md

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,106 @@
11
# Release Notes
22

3+
## [v5.7.15 (2018-11-22)](https://github.com/laravel/laravel/compare/v5.7.13...v5.7.15)
4+
5+
### Added
6+
- Add asset url configuration option ([63a4039](https://github.com/laravel/laravel/commit/63a403912362654962654e30cec695128d418987))
7+
- Add `log_channel` configuration option ([#4855](https://github.com/laravel/laravel/pull/4855))
8+
- Add env variable for compiled view path ([5ea6fe1](https://github.com/laravel/laravel/commit/5ea6fe18a89c3d0f5c0860d3777bff97510577b5))
9+
- Use env superglobal ([071a05b](https://github.com/laravel/laravel/commit/071a05bd76ee7eca0ea15ea107b49bcbad9af925))
10+
- Add date_equals validation message ([#4863](https://github.com/laravel/laravel/pull/4863))
11+
12+
### Changed
13+
- Remove lodash dependency when auto registering Vue components ([#4853](https://github.com/laravel/laravel/pull/4853))
14+
- Clean up auto register Vue components ([#4854](https://github.com/laravel/laravel/pull/4854))
15+
- Normalize `composer.json` ([#4856](https://github.com/laravel/laravel/pull/4856))
16+
- Update `Kernel.php` ([#4861](https://github.com/laravel/laravel/pull/4861))
17+
- Change variable name ([03ac80b](https://github.com/laravel/laravel/commit/03ac80b779be0f93e6f9d2dae56533d1e5569c35))
18+
19+
20+
## [v5.7.13 (2018-11-07)](https://github.com/laravel/laravel/compare/v5.7.0...v5.7.13)
21+
22+
### Added
23+
- Adding papertrail log channel option ([#4749](https://github.com/laravel/laravel/pull/4749))
24+
- Add missing Mailgun 'endpoint' option ([#4752](https://github.com/laravel/laravel/pull/4752))
25+
- Add new Stripe webhook config values ([#4803](https://github.com/laravel/laravel/pull/4803))
26+
- Add message for UUID validation rule ([#4834](https://github.com/laravel/laravel/pull/4834))
27+
- Introduce sqlite foreign_key_constraints config option ([#4838](https://github.com/laravel/laravel/pull/4838))
28+
- Auto register Vue components ([#4843](https://github.com/laravel/laravel/pull/4843))
29+
30+
### Changed
31+
- Updated `QUEUE_DRIVER` env var to `QUEUE_CONNECTION` in `phpunit.xml` ([#4746](https://github.com/laravel/laravel/pull/4746))
32+
- Update VerificationController ([#4756](https://github.com/laravel/laravel/pull/4756))
33+
- Seeded users should be verified by default ([#4761](https://github.com/laravel/laravel/pull/4761))
34+
- Preserve colors ([#4763](https://github.com/laravel/laravel/pull/4763))
35+
- Set logs to daily by default ([#4767](https://github.com/laravel/laravel/pull/4767))
36+
- Change default days to 14 for daily channel ([cd8dd76](https://github.com/laravel/laravel/commit/cd8dd76b67fb3ae9984b1477df4a9a3f0131ca87))
37+
- Check if register route is enabled ([#4775](https://github.com/laravel/laravel/pull/4775))
38+
- Update lang attribute ([#4781](https://github.com/laravel/laravel/pull/4781))
39+
- Changes the translation for "required_with_all" validation rule ([#4782](https://github.com/laravel/laravel/pull/4782))
40+
- Update database config ([#4783](https://github.com/laravel/laravel/pull/4783))
41+
- Removing double arrow alignments ([#4830](https://github.com/laravel/laravel/pull/4830))
42+
- Update vue version to 2.5.17 ([#4831](https://github.com/laravel/laravel/pull/4831))
43+
- Use env value for redis queue name ([#4837](https://github.com/laravel/laravel/pull/4837))
44+
45+
### Fixed
46+
- Update `HttpKernel` to use `Authenticate` middleware under `App` namespace ([#4757](https://github.com/laravel/laravel/pull/4757))
47+
- Persist the `/storage/framework/cache/data` directory ([#4760](https://github.com/laravel/laravel/pull/4760))
48+
- Make app path stream safe ([#4777](https://github.com/laravel/laravel/pull/4777))
49+
- Use correct facade ([#4780](https://github.com/laravel/laravel/pull/4780))
50+
- Revert [#4744](https://github.com/laravel/laravel/pull/4780) ([#4791](https://github.com/laravel/laravel/pull/4791))
51+
- Don't redirect for api calls ([#4805](https://github.com/laravel/laravel/pull/4805))
52+
- Fix bad font size render on link ([#4822](https://github.com/laravel/laravel/pull/4822))
53+
- Changed syntax for validation ([#4820](https://github.com/laravel/laravel/pull/4820))
54+
- Fix running mix tasks error ([#4832](https://github.com/laravel/laravel/pull/4832))
55+
56+
### Removed
57+
- Remove X-UA-Compatible meta tag ([#4748](https://github.com/laravel/laravel/pull/4748))
58+
59+
60+
## [v5.7.0 (2018-09-04)](https://github.com/laravel/laravel/compare/v5.6.33...v5.7.0)
61+
62+
### Added
63+
- Added email verification functionality ([#4689](https://github.com/laravel/laravel/pull/4689))
64+
- Added customizable redirect on auth failure ([a14e623](https://github.com/laravel/laravel/commit/a14e62325cbe82a615ccd2e80925c75cb0bf1eaf))
65+
- Added possibility to make httpOnly CSRF cookie optional ([#4692](https://github.com/laravel/laravel/pull/4692))
66+
- Added `beyondcode/laravel-dump-server` : `^1.0` to `composer.json` ([ff99e2f](https://github.com/laravel/laravel/commit/ff99e2fd5c6f868b9be53420057551c790f10785), [#4736](https://github.com/laravel/laravel/pull/4736))
67+
- Added `argon2id` support in `hashing.php` ([28908d8](https://github.com/laravel/laravel/commit/28908d83d9f3b078ae01ed21a42b87edf1fd393d))
68+
- Added `SESSION_CONNECTION` and `SESSION_STORE` env. variable ([#4735](https://github.com/laravel/laravel/pull/4735))
69+
70+
### Changed
71+
- Changed `QUEUE_DRIVER` env variable name to `QUEUE_CONNECTION` ([c30adc8](https://github.com/laravel/laravel/commit/c30adc88c1cf3f30618145c8b698734cbe03b19c))
72+
- Use separate cache database for Redis ([#4665](https://github.com/laravel/laravel/pull/4665))
73+
- Upgrade Lodash to `^4.17.5` ([#4730](https://github.com/laravel/laravel/pull/4730))
74+
- Changed font to `Nunito` from `Raleway` ([#4727](https://github.com/laravel/laravel/pull/4727))
75+
- Defined `mix` as `const` in `webpack.mix.js` ([#4741](https://github.com/laravel/laravel/pull/4741))
76+
- Make Asset Directory Flattened ([ff38d4e](https://github.com/laravel/laravel/commit/ff38d4e1a007c1a7709b5a614da1036adb464b32))
77+
78+
### Fixed
79+
- Fixed pagination translation ([#4744](https://github.com/laravel/laravel/pull/4744))
80+
81+
82+
## [v5.6.33 (2018-08-13)](https://github.com/laravel/laravel/compare/v5.6.21...v5.6.33)
83+
84+
### Added
85+
- Added `Http/Middleware/CheckForMaintenanceMode.php` ([#4703](https://github.com/laravel/laravel/pull/4703))
86+
87+
### Changed
88+
- Update font and colors in `scss` ([6646ad7](https://github.com/laravel/laravel/commit/6646ad7c527e2b3320661fa1d76a54dd6e896e57))
89+
- Changed message for `alpha_dash` validation rule ([#4661](https://github.com/laravel/laravel/pull/4661))
90+
91+
92+
## [v5.6.21 (2018-05-21)](https://github.com/laravel/laravel/compare/v5.6.12...v5.6.21)
93+
94+
### Added
95+
- Added hashing configuration ([#4613](https://github.com/laravel/laravel/pull/4613))
96+
- Added stderr example into `config/logging.php` ([66f5757](https://github.com/laravel/laravel/commit/66f5757d58cb3f6d1152ec2d5f12e247eb2242e2))
97+
- Added `SES_REGION` to local environment file ([#4629](https://github.com/laravel/laravel/pull/4629))
98+
- Added messages for `gt`/`lt`/`gte`/`lte` validation rules ([#4654](https://github.com/laravel/laravel/pull/4654))
99+
100+
### Changed
101+
- Set `bcrypt rounds` using the `hashing` config ([#4643](https://github.com/laravel/laravel/pull/4643))
102+
103+
3104
## v5.6.12 (2018-03-14)
4105

5106
### Added

‎app/Http/Controllers/Auth/RegisterController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public function __construct()
4949
protected function validator(array $data)
5050
{
5151
return Validator::make($data, [
52-
'name' => 'required|string|max:255',
53-
'email' => 'required|string|email|max:255|unique:users',
54-
'password' => 'required|string|min:8|confirmed',
52+
'name' => ['required', 'string', 'max:255'],
53+
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
54+
'password' => ['required', 'string', 'min:8', 'confirmed'],
5555
]);
5656
}
5757

‎app/Http/Controllers/Auth/VerificationController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Http\Controllers\Auth;
44

5-
use Illuminate\Routing\Controller;
5+
use App\Http\Controllers\Controller;
66
use Illuminate\Foundation\Auth\VerifiesEmails;
77

88
class VerificationController extends Controller
@@ -14,7 +14,7 @@ class VerificationController extends Controller
1414
|
1515
| This controller is responsible for handling email verification for any
1616
| user that recently registered with the application. Emails may also
17-
| be resent if the user did not receive the original email message.
17+
| be re-sent if the user didn't receive the original email message.
1818
|
1919
*/
2020

‎app/Http/Kernel.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,20 @@ class Kernel extends HttpKernel
6161
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
6262
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
6363
];
64+
65+
/**
66+
* The priority-sorted list of middleware.
67+
*
68+
* This forces non-global middleware to always be in the given order.
69+
*
70+
* @var array
71+
*/
72+
protected $middlewarePriority = [
73+
\Illuminate\Session\Middleware\StartSession::class,
74+
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
75+
\App\Http\Middleware\Authenticate::class,
76+
\Illuminate\Session\Middleware\AuthenticateSession::class,
77+
\Illuminate\Routing\Middleware\SubstituteBindings::class,
78+
\Illuminate\Auth\Middleware\Authorize::class,
79+
];
6480
}

‎app/Http/Middleware/Authenticate.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ class Authenticate extends Middleware
1414
*/
1515
protected function redirectTo($request)
1616
{
17-
return route('login');
17+
if (! $request->expectsJson()) {
18+
return route('login');
19+
}
1820
}
1921
}

‎bootstrap/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313

1414
$app = new Illuminate\Foundation\Application(
15-
realpath(__DIR__.'/../')
15+
$_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
1616
);
1717

1818
/*

‎composer.json

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
{
22
"name": "laravel/laravel",
3+
"type": "project",
34
"description": "The Laravel Framework.",
4-
"keywords": ["framework", "laravel"],
5+
"keywords": [
6+
"framework",
7+
"laravel"
8+
],
59
"license": "MIT",
6-
"type": "project",
710
"require": {
811
"php": "^7.1.3",
912
"fideloper/proxy": "^4.0",
@@ -18,43 +21,42 @@
1821
"nunomaduro/collision": "^2.0",
1922
"phpunit/phpunit": "^7.0"
2023
},
24+
"config": {
25+
"optimize-autoloader": true,
26+
"preferred-install": "dist",
27+
"sort-packages": true
28+
},
29+
"extra": {
30+
"laravel": {
31+
"dont-discover": []
32+
}
33+
},
2134
"autoload": {
35+
"psr-4": {
36+
"App\\": "app/"
37+
},
2238
"classmap": [
2339
"database/seeds",
2440
"database/factories"
25-
],
26-
"psr-4": {
27-
"App\\": "app/"
28-
}
41+
]
2942
},
3043
"autoload-dev": {
3144
"psr-4": {
3245
"Tests\\": "tests/"
3346
}
3447
},
35-
"extra": {
36-
"laravel": {
37-
"dont-discover": [
38-
]
39-
}
40-
},
48+
"minimum-stability": "dev",
49+
"prefer-stable": true,
4150
"scripts": {
51+
"post-autoload-dump": [
52+
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
53+
"@php artisan package:discover --ansi"
54+
],
4255
"post-root-package-install": [
4356
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
4457
],
4558
"post-create-project-cmd": [
46-
"@php artisan key:generate"
47-
],
48-
"post-autoload-dump": [
49-
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
50-
"@php artisan package:discover"
59+
"@php artisan key:generate --ansi"
5160
]
52-
},
53-
"config": {
54-
"preferred-install": "dist",
55-
"sort-packages": true,
56-
"optimize-autoloader": true
57-
},
58-
"minimum-stability": "dev",
59-
"prefer-stable": true
61+
}
6062
}

‎config/app.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454

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

57+
'asset_url' => env('ASSET_URL', null),
58+
5759
/*
5860
|--------------------------------------------------------------------------
5961
| Application Timezone
@@ -93,6 +95,19 @@
9395

9496
'fallback_locale' => 'en',
9597

98+
/*
99+
|--------------------------------------------------------------------------
100+
| Faker Locale
101+
|--------------------------------------------------------------------------
102+
|
103+
| This locale will be used by the Faker PHP library when generating fake
104+
| data for your database seeds. For example, this will be used to get
105+
| localized telephone numbers, street address information and more.
106+
|
107+
*/
108+
109+
'faker_locale' => 'en_US',
110+
96111
/*
97112
|--------------------------------------------------------------------------
98113
| Encryption Key

‎config/cache.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
use Illuminate\Support\Str;
4+
35
return [
46

57
/*
@@ -86,9 +88,6 @@
8688
|
8789
*/
8890

89-
'prefix' => env(
90-
'CACHE_PREFIX',
91-
str_slug(env('APP_NAME', 'laravel'), '_').'_cache'
92-
),
91+
'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
9392

9493
];

0 commit comments

Comments
 (0)