Merge pull request #330 from tighten/v9.39.0-changes

v9.39.0 changes
tighten · Jan 13, 2023 · c805aad · c805aad
2 parents 47b3c26 + e09248e
commit c805aad
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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<array-key, TCombineValue>|iterable<array-key, TCombineValue>  $values
-     * @return static<TKey, TCombineValue>
+     * @return static<TValue, TCombineValue>
      */
     public function combine($values)
     {

diff --git 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<array-key, TCombineValue>|iterable<array-key, TCombineValue>  $values
-     * @return static<TKey, TCombineValue>
+     * @return static<TValue, TCombineValue>
      */
     public function combine($values);
 

diff --git 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-key, TCombineValue>|array<array-key, TCombineValue>|(callable(): \Generator<array-key, TCombineValue>)  $values
-     * @return static<TKey, TCombineValue>
+     * @return static<TValue, TCombineValue>
      */
     public function combine($values)
     {

diff --git 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