Make Str::endsWith return false if both haystack and needle are empty strings (#33434)

Author: vlakoff

src/Illuminate/Support/Str.php

@@ -210,7 +210,7 @@ public static function containsAll($haystack, array $needles)
     public static function endsWith($haystack, $needles)
     {
         foreach ((array) $needles as $needle) {
-            if (substr($haystack, -strlen($needle)) === (string) $needle) {
+            if ($needle !== '' && substr($haystack, -strlen($needle)) === (string) $needle) {
                 return true;
             }
         }

tests/Support/SupportStrTest.php

@@ -60,6 +60,7 @@ public function testStartsWith()
         $this->assertTrue(Str::startsWith('0123', 0));
         $this->assertFalse(Str::startsWith('jason', 'J'));
         $this->assertFalse(Str::startsWith('jason', ''));
+        $this->assertFalse(Str::startsWith('', ''));
         $this->assertFalse(Str::startsWith('7', ' 7'));
         $this->assertTrue(Str::startsWith('7a', '7'));
         $this->assertTrue(Str::startsWith('7a', 7));
@@ -87,6 +88,7 @@ public function testEndsWith()
         $this->assertFalse(Str::endsWith('jason', 'no'));
         $this->assertFalse(Str::endsWith('jason', ['no']));
         $this->assertFalse(Str::endsWith('jason', ''));
+        $this->assertFalse(Str::endsWith('', ''));
         $this->assertFalse(Str::endsWith('jason', [null]));
         $this->assertFalse(Str::endsWith('jason', null));
         $this->assertFalse(Str::endsWith('jason', 'N'));
@@ -183,6 +185,7 @@ public function testStrContains()
         $this->assertFalse(Str::contains('taylor', 'xxx'));
         $this->assertFalse(Str::contains('taylor', ['xxx']));
         $this->assertFalse(Str::contains('taylor', ''));
+        $this->assertFalse(Str::contains('', ''));
     }
 
     public function testStrContainsAll()