Skip to content

Commit 504ceac

Browse files
committed
Merge branch '9.x'
# Conflicts: # CHANGELOG.md # composer.json # src/Illuminate/Foundation/Application.php
2 parents cf41c2f + 18a996f commit 504ceac

File tree

70 files changed

+1291
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1291
-156
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: "Update Changelog"
2+
3+
on:
4+
release:
5+
types: [released]
6+
7+
jobs:
8+
update:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- name: Checkout code
13+
uses: actions/checkout@v2
14+
with:
15+
ref: ${{ github.ref_name }}
16+
17+
- name: Update Changelog
18+
uses: stefanzweifel/changelog-updater-action@v1
19+
with:
20+
latest-version: ${{ github.event.release.tag_name }}
21+
release-notes: ${{ github.event.release.body }}
22+
compare-url-target-revision: ${{ github.event.release.target_commitish }}
23+
24+
- name: Commit updated CHANGELOG
25+
uses: stefanzweifel/git-auto-commit-action@v4
26+
with:
27+
branch: ${{ github.event.release.target_commitish }}
28+
commit_message: Update CHANGELOG.md
29+
file_pattern: CHANGELOG.md

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
## [Unreleased](https://github.com/laravel/framework/compare/v10.0.0..master)
44

55

6-
## [v10.0.0 (2022-??-??)](https://github.com/laravel/framework/compare/v9.0.2...master)
6+
## [v10.0.0 (2022-??-??)](https://github.com/laravel/framework/compare/v9.1.0...master)
77

88
Check the upgrade guide in the [Official Laravel Upgrade Documentation](https://laravel.com/docs/10.x/upgrade). Also you can see some release notes in the [Official Laravel Release Documentation](https://laravel.com/docs/10.x/releases).

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
"phpstan/phpstan": "^1.0",
9393
"predis/predis": "^1.1.9",
9494
"phpunit/phpunit": "^9.5.8",
95-
"symfony/amazon-mailer": "^6.1",
9695
"symfony/cache": "^6.1"
9796
},
9897
"provide": {

src/Illuminate/Auth/EloquentUserProvider.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,7 @@ public function retrieveByCredentials(array $credentials)
141141
*/
142142
protected function firstCredentialKey(array $credentials)
143143
{
144-
foreach ($credentials as $key => $value) {
145-
return $key;
146-
}
144+
return array_key_first($credentials);
147145
}
148146

149147
/**

src/Illuminate/Cache/CacheManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ protected function getPrefix(array $config)
328328
* Get the cache connection configuration.
329329
*
330330
* @param string $name
331-
* @return array
331+
* @return array|null
332332
*/
333333
protected function getConfig($name)
334334
{

src/Illuminate/Collections/Arr.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,18 @@ public static function isList($array)
423423
return ! self::isAssoc($array);
424424
}
425425

426+
/**
427+
* Key an associative array by a field or using a callback.
428+
*
429+
* @param array $array
430+
* @param callable|array|string
431+
* @return array
432+
*/
433+
public static function keyBy($array, $keyBy)
434+
{
435+
return Collection::make($array)->keyBy($keyBy)->all();
436+
}
437+
426438
/**
427439
* Get a subset of the items from the given array.
428440
*

src/Illuminate/Collections/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ public function chunkWhile(callable $callback)
12831283
/**
12841284
* Sort through each item with a callback.
12851285
*
1286-
* @param (callable(TValue, TValue): bool)|null|int $callback
1286+
* @param (callable(TValue, TValue): int)|null|int $callback
12871287
* @return static
12881288
*/
12891289
public function sort($callback = null)

src/Illuminate/Collections/Enumerable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ public function splitIn($numberOfGroups);
964964
/**
965965
* Sort through each item with a callback.
966966
*
967-
* @param (callable(TValue, TValue): bool)|null|int $callback
967+
* @param (callable(TValue, TValue): int)|null|int $callback
968968
* @return static
969969
*/
970970
public function sort($callback = null);

src/Illuminate/Collections/LazyCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@ public function chunkWhile(callable $callback)
12741274
/**
12751275
* Sort through each item with a callback.
12761276
*
1277-
* @param (callable(TValue, TValue): bool)|null|int $callback
1277+
* @param (callable(TValue, TValue): int)|null|int $callback
12781278
* @return static
12791279
*/
12801280
public function sort($callback = null)

src/Illuminate/Collections/Traits/EnumeratesValues.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
* @property-read HigherOrderCollectionProxy $average
2424
* @property-read HigherOrderCollectionProxy $avg
2525
* @property-read HigherOrderCollectionProxy $contains
26+
* @property-read HigherOrderCollectionProxy $doesntContain
2627
* @property-read HigherOrderCollectionProxy $each
2728
* @property-read HigherOrderCollectionProxy $every
2829
* @property-read HigherOrderCollectionProxy $filter
@@ -68,6 +69,7 @@ trait EnumeratesValues
6869
'average',
6970
'avg',
7071
'contains',
72+
'doesntContain',
7173
'each',
7274
'every',
7375
'filter',

0 commit comments

Comments
 (0)