From e09248e5666ec1b9efafca5763ebb2b095fe5f47 Mon Sep 17 00:00:00 2001 From: Jamison Valenta Date: Fri, 13 Jan 2023 11:24:36 -0700 Subject: [PATCH] v9.39.0 changes --- src/Collect/Support/Collection.php | 2 +- src/Collect/Support/Enumerable.php | 2 +- src/Collect/Support/LazyCollection.php | 2 +- upgrade.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Collect/Support/Collection.php b/src/Collect/Support/Collection.php index dc464a0..7bfa722 100644 --- a/src/Collect/Support/Collection.php +++ b/src/Collect/Support/Collection.php @@ -807,7 +807,7 @@ public function mergeRecursive($items) * @template TCombineValue * * @param \Tightenco\Collect\Contracts\Support\Arrayable|iterable $values - * @return static + * @return static */ public function combine($values) { diff --git a/src/Collect/Support/Enumerable.php b/src/Collect/Support/Enumerable.php index f2e164d..6548d8c 100644 --- a/src/Collect/Support/Enumerable.php +++ b/src/Collect/Support/Enumerable.php @@ -719,7 +719,7 @@ public function mergeRecursive($items); * @template TCombineValue * * @param \Tightenco\Collect\Contracts\Support\Arrayable|iterable $values - * @return static + * @return static */ public function combine($values); diff --git a/src/Collect/Support/LazyCollection.php b/src/Collect/Support/LazyCollection.php index 1142492..4c4de24 100644 --- a/src/Collect/Support/LazyCollection.php +++ b/src/Collect/Support/LazyCollection.php @@ -798,7 +798,7 @@ public function mergeRecursive($items) * @template TCombineValue * * @param \IteratorAggregate|array|(callable(): \Generator) $values - * @return static + * @return static */ public function combine($values) { diff --git a/upgrade.sh b/upgrade.sh index 85da889..b45726b 100755 --- a/upgrade.sh +++ b/upgrade.sh @@ -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