Skip to content

Commit 7a5a523

Browse files
Merge branch '6.x' into 7.x
2 parents 27cd7b0 + 283bb24 commit 7a5a523

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

CHANGELOG-6.x.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22

33
## [Unreleased](https://github.com/laravel/framework/compare/v6.17.1...6.x)
44

5+
### Added
6+
- Added `Arr::hasAny()` method ([#31636](https://github.com/laravel/framework/pull/31636))
7+
58
### TODO
69
- Use correct locale when resolving Faker from the container ([#31615](https://github.com/laravel/framework/pull/31615))
10+
- Expose Notification Id within Message Data ([#31632](https://github.com/laravel/framework/pull/31632))
11+
- Fixed loading deferred providers for binding interfaces and implementations ([#31629](https://github.com/laravel/framework/pull/31629), [1764ff7](https://github.com/laravel/framework/commit/1764ff762966083a12dd2c9b522cec5f1bbda967))
712

813

914
## [v6.17.1 (2020-02-26)](https://github.com/laravel/framework/compare/v6.17.0...v6.17.1)

src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithPivotTable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ public function newPivotStatementForId($id)
529529
*
530530
* @return \Illuminate\Database\Query\Builder
531531
*/
532-
protected function newPivotQuery()
532+
public function newPivotQuery()
533533
{
534534
$query = $this->newPivotStatement();
535535

src/Illuminate/Database/Eloquent/Relations/MorphToMany.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
120120
*
121121
* @return \Illuminate\Database\Query\Builder
122122
*/
123-
protected function newPivotQuery()
123+
public function newPivotQuery()
124124
{
125125
return parent::newPivotQuery()->where($this->morphType, $this->morphClass);
126126
}

0 commit comments

Comments
 (0)