[5.3] Restore support for non-string needle in Str::startsWith() (#15…

…397) * Add test to prevent a potential regression * Restore support for non-string needle * Code unification
illuminate · Sep 12, 2016 · 026dcaa · 026dcaa
1 parent 95d9dd5
commit 026dcaa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Str.php b/Str.php
@@ -87,7 +87,7 @@ public static function contains($haystack, $needles)
     public static function endsWith($haystack, $needles)
     {
         foreach ((array) $needles as $needle) {
-            if ((string) $needle === substr($haystack, -strlen($needle))) {
+            if (substr($haystack, -strlen($needle)) === (string) $needle) {
                 return true;
             }
         }
@@ -403,7 +403,7 @@ public static function snake($value, $delimiter = '_')
     public static function startsWith($haystack, $needles)
     {
         foreach ((array) $needles as $needle) {
-            if ($needle != '' && substr($haystack, 0, strlen($needle)) === $needle) {
+            if ($needle != '' && substr($haystack, 0, strlen($needle)) === (string) $needle) {
                 return true;
             }
         }