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

) * Add test to prevent a potential regression * Restore support for non-string needle * Code unification
laravel · Sep 12, 2016 · c7de016 · c7de016
1 parent e831a9a
commit c7de016
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/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;
             }
         }

diff --git a/tests/Support/SupportStrTest.php b/tests/Support/SupportStrTest.php
@@ -44,6 +44,7 @@ public function testStartsWith()
         $this->assertFalse(Str::startsWith('jason', 'day'));
         $this->assertFalse(Str::startsWith('jason', ['day']));
         $this->assertFalse(Str::startsWith('jason', ''));
+        $this->assertFalse(Str::startsWith('7', ' 7'));
     }
 
     public function testEndsWith()