From ab438895d2145792cec3ac8e6ae584da0cb2b272 Mon Sep 17 00:00:00 2001
From: Jamison Valenta <jamison@tigten.co>
Date: Fri, 13 Jan 2023 11:32:40 -0700
Subject: [PATCH 1/2] v9.40.1 changes

---
 tests/files/Support/Str.php | 6 ++++--
 upgrade.sh                  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/files/Support/Str.php b/tests/files/Support/Str.php
index 73144ec..04abd9d 100644
--- a/tests/files/Support/Str.php
+++ b/tests/files/Support/Str.php
@@ -341,6 +341,7 @@ public static function finish($value, $cap)
     /**
      * Wrap the string with the given strings.
      *
+     * @param  string  $value
      * @param  string  $before
      * @param  string|null  $after
      * @return string
@@ -1012,6 +1013,7 @@ public static function singular($value)
      * @param  string  $title
      * @param  string  $separator
      * @param  string|null  $language
+     * @param  array<string, string>  $dictionary
      * @return string
      */
     public static function slug($title, $separator = '-', $language = 'en', $dictionary = ['@' => 'at'])
@@ -1143,9 +1145,9 @@ public static function substrCount($haystack, $needle, $offset = 0, $length = nu
     {
         if (! is_null($length)) {
             return substr_count($haystack, $needle, $offset, $length);
-        } else {
-            return substr_count($haystack, $needle, $offset);
         }
+
+        return substr_count($haystack, $needle, $offset);
     }
 
     /**
diff --git a/upgrade.sh b/upgrade.sh
index b45726b..10b9f5f 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.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)
+        collectionVersion=$(git ls-remote $repository --tags  v9.40\* | 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

From b4a94c70a829b0d30eb329cad2e7a4470db7a92b Mon Sep 17 00:00:00 2001
From: Jamison Valenta <jamison@tigten.co>
Date: Fri, 13 Jan 2023 11:41:48 -0700
Subject: [PATCH 2/2] add php8.2 to test suite

---
 .github/workflows/run-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 9314b94..406c400 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [Ubuntu, macOS]
-        php: [8.0, 8.1]
+        php: [8.0, 8.1, 8.2]
 
         include:
           - os: Ubuntu