Fix Str::afterLast (#31095)

laravel · Jan 10, 2020 · b9e33b8 · voku · Feb 28, 2020 · driesvints
1 parent 4e33586
commit b9e33b8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php
@@ -61,7 +61,17 @@ public static function after($subject, $search)
      */
     public static function afterLast($subject, $search)
     {
-        return $search === '' ? $subject : array_reverse(explode($search, $subject))[0];
+        if ($search === '') {
+            return $subject;
+        }
+
+        $position = strrpos($subject, (string) $search);
+
+        if ($position === false) {
+            return $subject;
+        }
+
+        return substr($subject, $position + strlen($search));
     }
 
     /**

diff --git a/tests/Support/SupportStrTest.php b/tests/Support/SupportStrTest.php
@@ -142,6 +142,7 @@ public function testStrAfterLast()
         $this->assertSame('te', Str::afterLast('yv0et0te', '0'));
         $this->assertSame('te', Str::afterLast('yv0et0te', 0));
         $this->assertSame('te', Str::afterLast('yv2et2te', 2));
+        $this->assertSame('foo', Str::afterLast('----foo', '---'));
     }
 
     public function testStrContains()