[7.x] Add substrCount to Stringable and Str

src/Illuminate/Support/Str.php

@@ -644,6 +644,24 @@ public static function substr($string, $start, $length = null)
         return mb_substr($string, $start, $length, 'UTF-8');
     }
 
+    /**
+     * Returns the number of substring occurrences.
+     *
+     * @param  string  $haystack
+     * @param  string  $needle
+     * @param  int  $offset
+     * @param  int|null  $length
+     * @return int
+     */
+    public static function substrCount($haystack, $needle, $offset = 0, $length = null)
+    {
+        if ($length) {
+            return substr_count($haystack, $needle, $offset, $length);
+        } else {
+            return substr_count($haystack, $needle, $offset);
+        }
+    }
+
     /**
      * Make a string's first character uppercase.
      *

src/Illuminate/Support/Stringable.php

@@ -529,6 +529,19 @@ public function substr($start, $length = null)
         return new static(Str::substr($this->value, $start, $length));
     }
 
+    /**
+     * Returns the number of substring occurrences.
+     *
+     * @param  string  $needle
+     * @param  int|null  $offset
+     * @param  int|null  $length
+     * @return int
+     */
+    public function substrCount($needle, $offset = null, $length = null)
+    {
+        return Str::substrCount($this->value, $needle, $offset, $length);
+    }
+
     /**
      * Trim the string of the given characters.
      *

tests/Support/SupportStrTest.php

@@ -424,6 +424,20 @@ public function testSubstr()
         $this->assertEmpty(Str::substr('Б', 2));
     }
 
+    public function testSubstrCount()
+    {
+        $this->assertSame(3, Str::substrCount('laravelPHPFramework', 'a'));
+        $this->assertSame(0, Str::substrCount('laravelPHPFramework', 'z'));
+        $this->assertSame(1, Str::substrCount('laravelPHPFramework', 'l', 2));
+        $this->assertSame(0, Str::substrCount('laravelPHPFramework', 'z', 2));
+        $this->assertSame(1, Str::substrCount('laravelPHPFramework', 'k', -1));
+        $this->assertSame(1, Str::substrCount('laravelPHPFramework', 'k', -1));
+        $this->assertSame(1, Str::substrCount('laravelPHPFramework', 'a', 1, 2));
+        $this->assertSame(1, Str::substrCount('laravelPHPFramework', 'a', 1, 2));
+        $this->assertSame(3, Str::substrCount('laravelPHPFramework', 'a', 1, -2));
+        $this->assertSame(1, Str::substrCount('laravelPHPFramework', 'a', -10, -3));
+    }
+
     public function testUcfirst()
     {
         $this->assertSame('Laravel', Str::ucfirst('laravel'));

tests/Support/SupportStringableTest.php

@@ -463,4 +463,18 @@ public function testSubstr()
         $this->assertSame('Ё', (string) $this->stringable('БГДЖИЛЁ')->substr(-1, 1));
         $this->assertSame('', (string) $this->stringable('Б')->substr(2));
     }
+
+    public function testSubstrCount()
+    {
+        $this->assertSame(3, $this->stringable('laravelPHPFramework')->substrCount('a'));
+        $this->assertSame(0, $this->stringable('laravelPHPFramework')->substrCount('z'));
+        $this->assertSame(1, $this->stringable('laravelPHPFramework')->substrCount('l', 2));
+        $this->assertSame(0, $this->stringable('laravelPHPFramework')->substrCount('z', 2));
+        $this->assertSame(1, $this->stringable('laravelPHPFramework')->substrCount('k', -1));
+        $this->assertSame(1, $this->stringable('laravelPHPFramework')->substrCount('k', -1));
+        $this->assertSame(1, $this->stringable('laravelPHPFramework')->substrCount('a', 1, 2));
+        $this->assertSame(1, $this->stringable('laravelPHPFramework')->substrCount('a', 1, 2));
+        $this->assertSame(3, $this->stringable('laravelPHPFramework')->substrCount('a', 1, -2));
+        $this->assertSame(1, $this->stringable('laravelPHPFramework')->substrCount('a', -10, -3));
+    }
 }