phpgearbox / string

src/Methods/Replace.php

Doc Comments +2 added lines, -2 removed lines

@@ -18,9 +18,9 @@
     /**
      * Replaces all occurrences of $search in $str by $replacement.
      *
-     * @param  string|array $search        The needle to search for.
+     * @param  string $search        The needle to search for.
      *
-     * @param  string|array $replacement   The string to replace with.
+     * @param  string $replacement   The string to replace with.
      *
      * @param  bool         $caseSensitive To enforce case-sensitivity or not.
      *

Spacing +5 added lines, -10 removed lines

@@ -30,8 +30,7 @@ 
     {
         if ($caseSensitive)
         {
-            $return = UTF8::str_replace
-            (
+            $return = UTF8::str_replace(
                 $search,
                 $replacement,
                 $this->scalarString
@@ -39,8 +38,7 @@ 
         }
         else
         {
-            $return = UTF8::str_ireplace
-            (
+            $return = UTF8::str_ireplace(
                 $search,
                 $replacement,
                 $this->scalarString
@@ -76,8 +74,7 @@ 
 
         if (count($search) !== count($replacement))
         {
-            throw new \InvalidArgumentException
-            (
+            throw new \InvalidArgumentException(
                 '$search and $replacement must the same length!'
             );
         }
@@ -103,8 +100,7 @@ 
      */
     public function replaceBeginning($search, $replacement)
     {
-        return $this->regexReplace
-        (
+        return $this->regexReplace(
             '^'.preg_quote($search, '/'),
             UTF8::str_replace('\\', '\\\\', $replacement)
         );
@@ -120,8 +116,7 @@ 
      */
     public function replaceEnding($search, $replacement)
     {
-        return $this->regexReplace
-        (
+        return $this->regexReplace(
             preg_quote($search, '/').'$',
             UTF8::str_replace('\\', '\\\\', $replacement)
         );

Braces +7 added lines, -4 removed lines

@@ -36,8 +36,7 @@ 
                 $replacement,
                 $this->scalarString
             );
-        }
-        else
+        } else
         {
             $return = UTF8::str_ireplace
             (
@@ -71,8 +70,12 @@ 
      */
     public function replaceExact($search, $replacement)
     {
-        if (!is_array($search)) $search = [$search];
-        if (!is_array($replacement)) $replacement = [$replacement];
+        if (!is_array($search)) {
+            $search = [$search];
+        }
+        if (!is_array($replacement)) {
+            $replacement = [$replacement];
+        }
 
         if (count($search) !== count($replacement))
         {

src/Methods/Trim.php

Unused Use Statements -2 removed lines

@@ -11,8 +11,6 @@
 // -----------------------------------------------------------------------------
 ////////////////////////////////////////////////////////////////////////////////
 
-use voku\helper\UTF8;
-
 trait Trim
 {
     /**

Braces +1 added lines, -2 removed lines

@@ -110,8 +110,7 @@
             }
 
             $toBeAppended = $string;
-        }
-        else
+        } else
         {
             // Ensure the incoming string is string like... Str will throw
             // exceptions if not. We also make the assumption that any "scalar"

src/Exceptions/MisMatchedEncodingException.php

Spacing +1 added lines, -2 removed lines

@@ -15,8 +15,7 @@
 {
     public function __construct()
     {
-        parent::__construct
-        (
+        parent::__construct(
             'You can not append a string of a different encoding '.
             'to that of the existing string!'
         );

src/Builder.php

Spacing +2 added lines, -4 removed lines

@@ -232,16 +232,14 @@
      */
     public function remove($startIndex, $length)
     {
-        $start = UTF8::substr
-        (
+        $start = UTF8::substr(
             (string)$this->str,
             0,
             $startIndex,
             $this->str->getEncoding()
         );
 
-        $end = UTF8::substr
-        (
+        $end = UTF8::substr(
             (string)$this->str,
             $startIndex + $length,
             $this->str->getLength(),

Braces +1 added lines, -2 removed lines

@@ -110,8 +110,7 @@
             }
 
             $toBeAppended = $string;
-        }
-        else
+        } else
         {
             // Ensure the incoming string is string like... Str will throw
             // exceptions if not. We also make the assumption that any "scalar"

src/Methods/StartEndWith.php

Spacing +2 added lines, -4 removed lines

@@ -29,8 +29,7 @@ 
      */
     public function startsWith($substring, $caseSensitive = true)
     {
-        $startOfStr = UTF8::substr
-        (
+        $startOfStr = UTF8::substr(
             $this->scalarString,
             0,
             UTF8::strlen($substring, $this->encoding),
@@ -60,8 +59,7 @@ 
     {
         $substringLength = UTF8::strlen($substring, $this->encoding);
 
-        $endOfStr = UTF8::substr
-        (
+        $endOfStr = UTF8::substr(
             $this->scalarString,
             $this->getLength() - $substringLength,
             $substringLength,

src/Methods/Ensure.php

Braces +2 added lines, -4 removed lines

@@ -27,8 +27,7 @@ 
         if ($this->startsWith($substring))
         {
             return $this;
-        }
-        else
+        } else
         {
             return $this->newSelf($substring.$this->scalarString);
         }
@@ -46,8 +45,7 @@ 
         if ($this->endsWith($substring))
         {
             return $this;
-        }
-        else
+        } else
         {
             return $this->newSelf($this->scalarString.$substring);
         }

Unused Use Statements -2 removed lines

@@ -11,8 +11,6 @@
 // -----------------------------------------------------------------------------
 ////////////////////////////////////////////////////////////////////////////////
 
-use voku\helper\UTF8;
-
 trait Trim
 {
     /**

src/Methods/Misc.php

Spacing +6 added lines, -12 removed lines

@@ -66,16 +66,14 @@ 
     {
         if ($index > $this->getLength()) throw new \OutOfBoundsException();
 
-        $start = UTF8::substr
-        (
+        $start = UTF8::substr(
             $this->scalarString,
             0,
             $index,
             $this->encoding
         );
 
-        $end = UTF8::substr
-        (
+        $end = UTF8::substr(
             $this->scalarString,
             $index,
             $this->getLength(),
@@ -104,8 +102,7 @@ 
      */
     public function repeat($multiplier)
     {
-        return $this->newSelf
-        (
+        return $this->newSelf(
             UTF8::str_repeat($this->scalarString, $multiplier)
         );
     }
@@ -163,8 +160,7 @@ 
             $length = $end - $start;
         }
 
-        return $this->newSelf
-        (
+        return $this->newSelf(
             UTF8::substr($this->scalarString, $start, $length, $this->encoding)
         );
     }
@@ -179,8 +175,7 @@ 
      */
     public function surround($substring)
     {
-        return $this->newSelf
-        (
+        return $this->newSelf(
             implode('', [$substring, $this->scalarString, $substring])
         );
     }
@@ -213,8 +208,7 @@ 
     {
         if ($caseSensitive)
         {
-            return UTF8::substr_count
-            (
+            return UTF8::substr_count(
                 $this->scalarString,
                 $substring,
                 $this->encoding

Braces +6 added lines, -7 removed lines

@@ -64,7 +64,9 @@ 
      */
     public function insert($substring, $index)
     {
-        if ($index > $this->getLength()) throw new \OutOfBoundsException();
+        if ($index > $this->getLength()) {
+            throw new \OutOfBoundsException();
+        }
 
         $start = UTF8::substr
         (
@@ -149,16 +151,13 @@ 
         if ($end === null)
         {
             $length = $this->getLength();
-        }
-        elseif ($end >= 0 && $end <= $start)
+        } elseif ($end >= 0 && $end <= $start)
         {
             return $this->newSelf('');
-        }
-        elseif ($end < 0)
+        } elseif ($end < 0)
         {
             $length = $this->getLength() + $end - $start;
-        }
-        else
+        } else
         {
             $length = $end - $start;
         }

src/Methods/Between.php

Spacing +1 added lines, -2 removed lines

@@ -42,8 +42,7 @@
         $endIndex = $this->indexOf($end, $substrIndex);
         if ($endIndex === false) return $this->newSelf('');
 
-        $result = UTF8::substr
-        (
+        $result = UTF8::substr(
             $this->scalarString,
             $substrIndex,
             $endIndex - $substrIndex,

Braces +9 added lines, -3 removed lines

@@ -35,12 +35,16 @@ 
     public function between($start, $end, $offset = 0, $include = false)
     {
         $startIndex = $this->indexOf($start, $offset);
-        if ($startIndex === false) return $this->newSelf('');
+        if ($startIndex === false) {
+            return $this->newSelf('');
+        }
 
         $substrIndex = $startIndex + UTF8::strlen($start, $this->encoding);
 
         $endIndex = $this->indexOf($end, $substrIndex);
-        if ($endIndex === false) return $this->newSelf('');
+        if ($endIndex === false) {
+            return $this->newSelf('');
+        }
 
         $result = UTF8::substr
         (
@@ -50,7 +54,9 @@ 
             $this->encoding
         );
 
-        if ($include === true) $result = $start.$result.$end;
+        if ($include === true) {
+            $result = $start.$result.$end;
+        }
 
         return $this->newSelf($result);
     }

src/Methods/To.php

Braces +8 added lines, -11 removed lines

@@ -160,12 +160,10 @@ 
         if (array_key_exists($key, $map))
         {
             return $map[$key];
-        }
-        elseif (is_numeric($this->scalarString))
+        } elseif (is_numeric($this->scalarString))
         {
             return ((int)$this->scalarString > 0);
-        }
-        else
+        } else
         {
             return (bool)$this->regexReplace('[[:space:]]', '')->scalarString;
         }
@@ -271,8 +269,7 @@ 
                 if (isset($match[1]))
                 {
                     return UTF8::strtoupper($match[1], $this->encoding);
-                }
-                else
+                } else
                 {
                     return '';
                 }
@@ -292,7 +289,9 @@ 
 
         $camelCase = $this->newSelf($camelCase);
 
-        if ($upperFirst === true) $camelCase = $camelCase->upperCaseFirst();
+        if ($upperFirst === true) {
+            $camelCase = $camelCase->upperCaseFirst();
+        }
 
         return $camelCase;
     }
@@ -319,8 +318,7 @@ 
                 if ("$matchInt" == $match)
                 {
                     return '_' . $match . '_';
-                }
-                else
+                } else
                 {
                     return '_' . UTF8::strtolower($match, $this->encoding);
                 }
@@ -372,8 +370,7 @@ 
                 if ($ignore && in_array($match[0], $ignore, true))
                 {
                     return $match[0];
-                }
-                else
+                } else
                 {
                     return (string)$this->newSelf($match[0])
                     ->toLowerCase()->upperCaseFirst();

Spacing +27 added lines, -46 removed lines

@@ -44,8 +44,7 @@ 
      */
     public function toLowerCase()
     {
-        return $this->newSelf
-        (
+        return $this->newSelf(
             UTF8::strtolower($this->scalarString, $this->encoding)
         );
     }
@@ -57,8 +56,7 @@ 
      */
     public function toUpperCase()
     {
-        return $this->newSelf
-        (
+        return $this->newSelf(
             UTF8::strtoupper($this->scalarString, $this->encoding)
         );
     }
@@ -74,15 +72,13 @@ 
     {
         if (!class_exists('\\ICanBoogie\\Inflector'))
         {
-            throw new \RuntimeException
-            (
+            throw new \RuntimeException(
                 "This method requires ICanBoogie\Inflector. ".
                 "Install with: composer require icanboogie/inflector"
             );
         }
 
-        return $this->newSelf
-        (
+        return $this->newSelf(
             \ICanBoogie\Inflector::get($language)
             ->singularize($this->scalarString)
         );
@@ -99,15 +95,13 @@ 
     {
         if (!class_exists('\\ICanBoogie\\Inflector'))
         {
-            throw new \RuntimeException
-            (
+            throw new \RuntimeException(
                 "This method requires ICanBoogie\Inflector. ".
                 "Install with: composer require icanboogie/inflector"
             );
         }
 
-        return $this->newSelf
-        (
+        return $this->newSelf(
             \ICanBoogie\Inflector::get($language)
             ->pluralize($this->scalarString)
         );
@@ -123,8 +117,7 @@ 
      */
     public function toAscii()
     {
-        return $this->newSelf
-        (
+        return $this->newSelf(
             UTF8::toAscii($this->scalarString)
         );
     }
@@ -184,10 +177,8 @@ 
      */
     public function toSpaces($tabLength = 4)
     {
-        return $this->newSelf
-        (
-            UTF8::str_replace
-            (
+        return $this->newSelf(
+            UTF8::str_replace(
                 "\t",
                 UTF8::str_repeat(' ', $tabLength),
                 $this->scalarString
@@ -208,10 +199,8 @@ 
      */
     public function toTabs($tabLength = 4)
     {
-        return $this->newSelf
-        (
-            UTF8::str_replace
-            (
+        return $this->newSelf(
+            UTF8::str_replace(
                 UTF8::str_repeat(' ', $tabLength),
                 "\t",
                 $this->scalarString
@@ -263,10 +252,9 @@ 
 
         $camelCase = preg_replace('/^[-_]+/', '', (string)$camelCase);
 
-        $camelCase = preg_replace_callback
-        (
+        $camelCase = preg_replace_callback(
             '/[-_\s]+(.)?/u',
-            function ($match)
+            function($match)
             {
                 if (isset($match[1]))
                 {
@@ -280,10 +268,9 @@ 
             $camelCase
         );
 
-        $camelCase = preg_replace_callback
-        (
+        $camelCase = preg_replace_callback(
             '/[\d]+(.)?/u',
-            function ($match)
+            function($match)
             {
                 return UTF8::strtoupper($match[0], $this->encoding);
             },
@@ -308,31 +295,29 @@ 
 
         $snake = str_replace('-', '_', $snake);
 
-        $snake = preg_replace_callback
-        (
+        $snake = preg_replace_callback(
             '/([\d|A-Z])/u',
-            function ($matches)
+            function($matches)
             {
                 $match = $matches[1];
                 $matchInt = (int)$match;
 
                 if ("$matchInt" == $match)
                 {
-                    return '_' . $match . '_';
+                    return '_'.$match.'_';
                 }
                 else
                 {
-                    return '_' . UTF8::strtolower($match, $this->encoding);
+                    return '_'.UTF8::strtolower($match, $this->encoding);
                 }
             },
             $snake
         );
 
-        $snake = preg_replace
-        (
+        $snake = preg_replace(
             [
-                '/\s+/',        // convert spaces to "_"
-                '/^\s+|\s+$/',  // trim leading & trailing spaces
+                '/\s+/', // convert spaces to "_"
+                '/^\s+|\s+$/', // trim leading & trailing spaces
                 '/_+/'          // remove double "_"
             ],
             [
@@ -364,10 +349,9 @@ 
      */
     public function toTitleCase($ignore = null)
     {
-        return $this->newSelf(preg_replace_callback
-        (
+        return $this->newSelf(preg_replace_callback(
             '/([\S]+)/u',
-            function ($match) use ($ignore)
+            function($match) use ($ignore)
             {
                 if ($ignore && in_array($match[0], $ignore, true))
                 {
@@ -415,17 +399,14 @@ 
     {
         if (!class_exists('\\voku\\helper\\URLify'))
         {
-            throw new \RuntimeException
-            (
+            throw new \RuntimeException(
                 "This method requires \voku\helper\URLify. ".
                 "Install with: composer require voku/urlify"
             );
         }
 
-        return $this->newSelf
-        (
-            \voku\helper\URLify::slug
-            (
+        return $this->newSelf(
+            \voku\helper\URLify::slug(
                 $this->scalarString,
                 $language,
                 $replacement,