Merge branch 'str-between' of https://github.com/osbre/framework into osbre-str-between

Author: taylorotwell

src/Illuminate/Support/Str.php

@@ -132,6 +132,25 @@ public static function beforeLast($subject, $search)
         return static::substr($subject, 0, $pos);
     }
 
+    /**
+     * Get the portion of a string between a given values.
+     *
+     * @param  string  $subject
+     * @param  string  $before
+     * @param  string  $after
+     * @return string
+     */
+    public static function between($subject, $before, $after)
+    {
+        if ($before === '' || $after === '') {
+            return $subject;
+        }
+
+        $rightCropped = static::after($subject, $before);
+
+        return static::beforeLast($rightCropped, $after);
+    }
+
     /**
      * Convert a value to camel case.
      *

src/Illuminate/Support/Stringable.php

@@ -132,6 +132,18 @@ public function beforeLast($search)
         return new static(Str::beforeLast($this->value, $search));
     }
 
+    /**
+     * Get the portion of a string between a given values.
+     *
+     * @param  string  $before
+     * @param  string  $after
+     * @return static
+     */
+    public function between($before, $after)
+    {
+        return new static(Str::between($this->value, $before, $after));
+    }
+
     /**
      * Convert a value to camel case.
      *

tests/Support/SupportStrTest.php

@@ -127,6 +127,21 @@ public function testStrBeforeLast()
         $this->assertSame('yv2et', Str::beforeLast('yv2et2te', 2));
     }
 
+    public function testStrBetween()
+    {
+        $this->assertSame('abc', Str::between('abc', '', 'c'));
+        $this->assertSame('abc', Str::between('abc', 'a', ''));
+        $this->assertSame('abc', Str::between('abc', '', ''));
+        $this->assertSame('b', Str::between('abc', 'a', 'c'));
+        $this->assertSame('b', Str::between('dddabc', 'a', 'c'));
+        $this->assertSame('b', Str::between('abcddd', 'a', 'c'));
+        $this->assertSame('b', Str::between('dddabcddd', 'a', 'c'));
+        $this->assertSame('nn', Str::between('hannah', 'ha', 'ah'));
+        $this->assertSame('a]ab[b', Str::between('[a]ab[b]', '[', ']'));
+        $this->assertSame('foo', Str::between('foofoobar', 'foo', 'bar'));
+        $this->assertSame('bar', Str::between('foobarbar', 'foo', 'bar'));
+    }
+
     public function testStrAfter()
     {
         $this->assertSame('nah', Str::after('hannah', 'han'));