Skip to content
This repository has been archived by the owner on Mar 14, 2024. It is now read-only.

Commit

Permalink
v9.39.0 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamison Valenta committed Jan 13, 2023
1 parent 47b3c26 commit e09248e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/Collect/Support/Collection.php
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ public function mergeRecursive($items)
* @template TCombineValue
*
* @param \Tightenco\Collect\Contracts\Support\Arrayable<array-key, TCombineValue>|iterable<array-key, TCombineValue> $values
* @return static<TKey, TCombineValue>
* @return static<TValue, TCombineValue>
*/
public function combine($values)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Collect/Support/Enumerable.php
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ public function mergeRecursive($items);
* @template TCombineValue
*
* @param \Tightenco\Collect\Contracts\Support\Arrayable<array-key, TCombineValue>|iterable<array-key, TCombineValue> $values
* @return static<TKey, TCombineValue>
* @return static<TValue, TCombineValue>
*/
public function combine($values);

Expand Down
2 changes: 1 addition & 1 deletion src/Collect/Support/LazyCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ public function mergeRecursive($items)
* @template TCombineValue
*
* @param \IteratorAggregate<array-key, TCombineValue>|array<array-key, TCombineValue>|(callable(): \Generator<array-key, TCombineValue>) $values
* @return static<TKey, TCombineValue>
* @return static<TValue, TCombineValue>
*/
public function combine($values)
{
Expand Down
2 changes: 1 addition & 1 deletion upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ function getCurrentVersionFromGitHub()
echo Getting current version from $repository...

if [ -z "$requestedVersion" ]; then
collectionVersion=$(git ls-remote $repository --tags v9.38\* | grep tags/ | grep -v {} | cut -d \/ -f 3 | cut -d v -f 2 | grep -v RC | grep -vi beta | sort -t. -k 1,1n -k 2,2n -k 3,3n| tail -1)
collectionVersion=$(git ls-remote $repository --tags v9.39\* | grep tags/ | grep -v {} | cut -d \/ -f 3 | cut -d v -f 2 | grep -v RC | grep -vi beta | sort -t. -k 1,1n -k 2,2n -k 3,3n| tail -1)
else
collectionVersion=$requestedVersion
fi
Expand Down

0 comments on commit e09248e

Please sign in to comment.