Skip to content

Commit 1b0f44d

Browse files
taylorotwelltaylorotwell
committed
fix conflicts
2 parents 6fefa15 + 17777a9 commit 1b0f44d

File tree

18 files changed

+264
-25
lines changed

18 files changed

+264
-25
lines changed

‎CHANGELOG-6.x.md‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
# Release Notes for 6.x
22

3-
## [Unreleased](https://github.com/laravel/framework/compare/v6.18.35...6.x)
3+
## [Unreleased](https://github.com/laravel/framework/compare/v6.18.37...6.x)
4+
5+
6+
## [v6.18.37 (2020-08-27)](https://github.com/laravel/framework/compare/v6.18.36...v6.18.37)
7+
8+
### Fixed
9+
- Fixed offset error on invalid remember token ([#34020](https://github.com/laravel/framework/pull/34020))
10+
- Only prepend scheme to PhpRedis host when necessary ([#34017](https://github.com/laravel/framework/pull/34017))
11+
- Fixed `whereKey` and `whereKeyNot` in `Illuminate\Database\Eloquent\Builder` ([#34031](https://github.com/laravel/framework/pull/34031))
12+
13+
14+
## [v6.18.36 (2020-08-25)](https://github.com/laravel/framework/compare/v6.18.35...v6.18.36)
15+
16+
### Fixed
17+
- Fix dimension ratio calculation in `Illuminate\Validation\Concerns\ValidatesAttributes::failsRatioCheck()` ([#34003](https://github.com/laravel/framework/pull/34003))
18+
19+
### Changed
20+
- Normalize scheme in Redis connections ([#33892](https://github.com/laravel/framework/pull/33892))
21+
- Check no-interaction flag exists and is true for Artisan commands ([#33950](https://github.com/laravel/framework/pull/33950))
422

523

624
## [v6.18.35 (2020-08-07)](https://github.com/laravel/framework/compare/v6.18.34...v6.18.35)

‎CHANGELOG-7.x.md‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,45 @@
11
# Release Notes for 7.x
22

3-
## [Unreleased](https://github.com/laravel/framework/compare/v7.25.0...7.x)
3+
## [Unreleased](https://github.com/laravel/framework/compare/v7.26.1...7.x)
4+
5+
6+
## [v7.26.1 (2020-08-27)](https://github.com/laravel/framework/compare/v7.26.0...v7.26.1)
7+
8+
### Fixed
9+
- Fixed offset error on invalid remember token ([#34020](https://github.com/laravel/framework/pull/34020))
10+
- Only prepend scheme to PhpRedis host when necessary ([#34017](https://github.com/laravel/framework/pull/34017))
11+
- Fixed `whereKey` and `whereKeyNot` in `Illuminate\Database\Eloquent\Builder` ([#34031](https://github.com/laravel/framework/pull/34031))
12+
13+
14+
## [v7.26.0 (2020-08-25)](https://github.com/laravel/framework/compare/v7.25.0...v7.26.0)
15+
16+
### Added
17+
- Added `whenHas` and `whenFilled` methods to `Illuminate\Http\Concerns\InteractsWithInput` class ([#33829](https://github.com/laravel/framework/pull/33829))
18+
- Added email validating with custom class ([#33835](https://github.com/laravel/framework/pull/33835))
19+
- Added `Illuminate\View\ComponentAttributeBag::whereDoesntStartWith()` ([#33851](https://github.com/laravel/framework/pull/33851))
20+
- Allow setting synchronous_commit for Postgres ([#33897](https://github.com/laravel/framework/pull/33897))
21+
- Allow nested errors in `Illuminate\Testing\TestResponse::assertJsonValidationErrors()` ([#33989](https://github.com/laravel/framework/pull/33989))
22+
- Added support for stream reads to `FilesystemManager` ([#34001](https://github.com/laravel/framework/pull/34001))
23+
24+
### Fixed
25+
- Fix defaultTimezone not respected in scheduled Events ([#33834](https://github.com/laravel/framework/pull/33834))
26+
- Fixed usage of Support `Collection#countBy($key)` ([#33852](https://github.com/laravel/framework/pull/33852))
27+
- Fixed route registerar bug ([42ba0ef](https://github.com/laravel/framework/commit/42ba0ef3e379cb1e0fa38c3d3297109ff1234a1d))
28+
- Fixed key composition for attribute with dot at validation error messages ([#33932](https://github.com/laravel/framework/pull/33932))
29+
- Fixed the `dump` method for `LazyCollection` ([#33944](https://github.com/laravel/framework/pull/33944))
30+
- Fixed dimension ratio calculation in `Illuminate\Validation\Concerns\ValidatesAttributes::failsRatioCheck()` ([#34003](https://github.com/laravel/framework/pull/34003))
31+
32+
### Changed
33+
- Implement LockProvider on DatabaseStore ([#33844](https://github.com/laravel/framework/pull/33844))
34+
- Publish resources.stub in stub:publish command ([#33862](https://github.com/laravel/framework/pull/33862))
35+
- Handle argon failures robustly ([#33856](https://github.com/laravel/framework/pull/33856))
36+
- Normalize scheme in Redis connections ([#33892](https://github.com/laravel/framework/pull/33892))
37+
- Cast primary key to string when $keyType is string ([#33930](https://github.com/laravel/framework/pull/33930))
38+
- Load anonymous components from packages ([#33954](https://github.com/laravel/framework/pull/33954))
39+
- Check no-interaction flag exists and is true for Artisan commands ([#33950](https://github.com/laravel/framework/pull/33950))
40+
41+
### Deprecated
42+
- Deprecate `Illuminate\Database\Eloquent\Model::removeTableFromKey()` ([#33859](https://github.com/laravel/framework/pull/33859))
443

544

645
## [v7.25.0 (2020-08-11)](https://github.com/laravel/framework/compare/v7.24.0...v7.25.0)

‎src/Illuminate/Console/GeneratorCommand.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,19 @@ protected function isReservedName($name)
389389
return in_array($name, $this->reservedNames);
390390
}
391391

392+
/**
393+
* Get the first view directory path from the application configuration.
394+
*
395+
* @param string $path
396+
* @return string
397+
*/
398+
protected function viewPath($path = '')
399+
{
400+
$views = $this->laravel['config']['view.paths'][0] ?? resource_path('views');
401+
402+
return $views.($path ? DIRECTORY_SEPARATOR.$path : $path);
403+
}
404+
392405
/**
393406
* Get the console command arguments.
394407
*

‎src/Illuminate/Contracts/Pagination/Paginator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function currentPage();
8686
public function hasPages();
8787

8888
/**
89-
* Determine if there is more items in the data store.
89+
* Determine if there are more items in the data store.
9090
*
9191
* @return bool
9292
*/

‎src/Illuminate/Database/Eloquent/Builder.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public function whereKey($id)
193193
return $this;
194194
}
195195

196-
if ($this->model->getKeyType() === 'string') {
196+
if ($id !== null && $this->model->getKeyType() === 'string') {
197197
$id = (string) $id;
198198
}
199199

@@ -214,7 +214,7 @@ public function whereKeyNot($id)
214214
return $this;
215215
}
216216

217-
if ($this->model->getKeyType() === 'string') {
217+
if ($id !== null && $this->model->getKeyType() === 'string') {
218218
$id = (string) $id;
219219
}
220220

‎src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,10 @@ public function hasMorph($relation, $types, $operator = '>=', $count = 1, $boole
205205

206206
if ($types === ['*']) {
207207
$types = $this->model->newModelQuery()->distinct()->pluck($relation->getMorphType())->filter()->all();
208+
}
208209

209-
foreach ($types as &$type) {
210-
$type = Relation::getMorphedModel($type) ?? $type;
211-
}
210+
foreach ($types as &$type) {
211+
$type = Relation::getMorphedModel($type) ?? $type;
212212
}
213213

214214
return $this->where(function ($query) use ($relation, $callback, $operator, $count, $types) {

‎src/Illuminate/Foundation/Console/ComponentMakeCommand.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ public function handle()
5353
*/
5454
protected function writeView()
5555
{
56-
$view = $this->getView();
57-
58-
$path = resource_path('views').'/'.str_replace('.', '/', 'components.'.$view);
56+
$path = $this->viewPath(
57+
str_replace('.', '/', 'components.'.$this->getView())
58+
);
5959

6060
if (! $this->files->isDirectory(dirname($path))) {
6161
$this->files->makeDirectory(dirname($path), 0777, true, true);

‎src/Illuminate/Foundation/Console/MailMakeCommand.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ public function handle()
5151
*/
5252
protected function writeMarkdownTemplate()
5353
{
54-
$path = resource_path('views/'.str_replace('.', '/', $this->option('markdown'))).'.blade.php';
54+
$path = $this->viewPath(
55+
str_replace('.', '/', $this->option('markdown')).'.blade.php'
56+
);
5557

5658
if (! $this->files->isDirectory(dirname($path))) {
5759
$this->files->makeDirectory(dirname($path), 0755, true);

‎src/Illuminate/Foundation/Console/NotificationMakeCommand.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ public function handle()
5151
*/
5252
protected function writeMarkdownTemplate()
5353
{
54-
$path = resource_path('views/'.str_replace('.', '/', $this->option('markdown'))).'.blade.php';
54+
$path = $this->viewPath(
55+
str_replace('.', '/', $this->option('markdown')).'.blade.php'
56+
);
5557

5658
if (! $this->files->isDirectory(dirname($path))) {
5759
$this->files->makeDirectory(dirname($path), 0755, true);

‎src/Illuminate/Foundation/Testing/RefreshDatabase.php‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,23 @@ protected function usingInMemoryDatabase()
3737
*/
3838
protected function refreshInMemoryDatabase()
3939
{
40-
$this->artisan('migrate', [
41-
'--seed' => $this->shouldSeed(),
42-
]);
40+
$this->artisan('migrate', $this->migrateUsing());
4341

4442
$this->app[Kernel::class]->setArtisan(null);
4543
}
4644

45+
/**
46+
* The parameters that should be used when running "migrate".
47+
*
48+
* @return array
49+
*/
50+
protected function migrateUsing()
51+
{
52+
return [
53+
'--seed' => $this->shouldSeed(),
54+
];
55+
}
56+
4757
/**
4858
* Refresh a conventional test database.
4959
*
@@ -52,11 +62,7 @@ protected function refreshInMemoryDatabase()
5262
protected function refreshTestDatabase()
5363
{
5464
if (! RefreshDatabaseState::$migrated) {
55-
$this->artisan('migrate:fresh', [
56-
'--drop-views' => $this->shouldDropViews(),
57-
'--drop-types' => $this->shouldDropTypes(),
58-
'--seed' => $this->shouldSeed(),
59-
]);
65+
$this->artisan('migrate:fresh', $this->migrateFreshUsing());
6066

6167
$this->app[Kernel::class]->setArtisan(null);
6268

@@ -66,6 +72,20 @@ protected function refreshTestDatabase()
6672
$this->beginDatabaseTransaction();
6773
}
6874

75+
/**
76+
* The parameters that should be used when running "migrate:fresh".
77+
*
78+
* @return array
79+
*/
80+
protected function migrateFreshUsing()
81+
{
82+
return [
83+
'--drop-views' => $this->shouldDropViews(),
84+
'--drop-types' => $this->shouldDropTypes(),
85+
'--seed' => $this->shouldSeed(),
86+
];
87+
}
88+
6989
/**
7090
* Begin a database transaction on the testing database.
7191
*

0 commit comments

Comments
 (0)