Extract child instructions (#44915)

maoleng · web-flow · commit 571e02a39d06 · 2022-11-14T09:56:27.000+01:00
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php
@@ -1143,9 +1143,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);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -1143,9 +1143,9 @@ public static function substrCount($haystack, $needle, $offset = 0, $length = nu`
`1143`	`1143`	`{`
`1144`	`1144`	`if (! is_null($length)) {`
`1145`	`1145`	`return substr_count($haystack, $needle, $offset, $length);`
`1146`		`- } else {`
`1147`		`- return substr_count($haystack, $needle, $offset);`
`1148`	`1146`	`}`
	`1147`	`+`
	`1148`	`+ return substr_count($haystack, $needle, $offset);`
`1149`	`1149`	`}`
`1150`	`1150`
`1151`	`1151`	`/**`