formatting

Author: taylorotwell

src/Illuminate/Support/Str.php

@@ -133,22 +133,20 @@ public static function beforeLast($subject, $search)
     }
 
     /**
-     * Get the portion of a string between a given values.
+     * Get the portion of a string between two given values.
      *
      * @param  string  $subject
-     * @param  string  $before
-     * @param  string  $after
+     * @param  string  $from
+     * @param  string  $to
      * @return string
      */
-    public static function between($subject, $before, $after)
+    public static function between($subject, $from, $to)
     {
-        if ($before === '' || $after === '') {
+        if ($from === '' || $to === '') {
             return $subject;
         }
 
-        $rightCropped = static::after($subject, $before);
-
-        return static::beforeLast($rightCropped, $after);
+        return static::beforeLast(static::after($subject, $from), $to);
     }
 
     /**

src/Illuminate/Support/Stringable.php

@@ -133,15 +133,15 @@ public function beforeLast($search)
     }
 
     /**
-     * Get the portion of a string between a given values.
+     * Get the portion of a string between two given values.
      *
-     * @param  string  $before
-     * @param  string  $after
+     * @param  string  $from
+     * @param  string  $to
      * @return static
      */
-    public function between($before, $after)
+    public function between($from, $to)
     {
-        return new static(Str::between($this->value, $before, $after));
+        return new static(Str::between($this->value, $from, $to));
     }
 
     /**