phpgearbox / string

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(),

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/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 +4 added lines, -1 removed lines

@@ -64,7 +64,10 @@
      */
     public function insert($substring, $index)
     {
-        if ($index > $this->getLength()) throw new \OutOfBoundsException();
+        if ($index > $this->getLength())
+        {
+            throw new \OutOfBoundsException();
+        }
 
         $start = UTF8::substr
         (

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 +12 added lines, -3 removed lines

@@ -35,12 +35,18 @@ 
     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 +56,10 @@ 
             $this->encoding
         );
 
-        if ($include === true) $result = $start.$result.$end;
+        if ($include === true)
+        {
+            $result = $start.$result.$end;
+        }
 
         return $this->newSelf($result);
     }

src/Methods/FirstLast.php

Spacing +2 added lines, -4 removed lines

@@ -28,8 +28,7 @@ 
 
         if ($n > 0)
         {
-            $first = UTF8::substr
-            (
+            $first = UTF8::substr(
                 $this->scalarString,
                 0,
                 $n,
@@ -53,8 +52,7 @@ 
 
         if ($n > 0)
         {
-            $last = UTF8::substr
-            (
+            $last = UTF8::substr(
                 $this->scalarString,
                 -$n,
                 null,

src/Methods/Remove.php

Spacing +4 added lines, -8 removed lines

@@ -26,10 +26,8 @@ 
     {
         if ($this->startsWith($substring))
         {
-            return $this->newSelf
-            (
-                UTF8::substr
-                (
+            return $this->newSelf(
+                UTF8::substr(
                     $this->scalarString,
                     UTF8::strlen($substring, $this->encoding),
                     null,
@@ -52,10 +50,8 @@ 
     {
         if ($this->endsWith($substring))
         {
-            return $this->newSelf
-            (
-                UTF8::substr
-                (
+            return $this->newSelf(
+                UTF8::substr(
                     $this->scalarString,
                     0,
                     $this->getLength() - UTF8::strlen($substring, $this->encoding),

src/Methods/Truncate.php

Spacing +3 added lines, -4 removed lines

@@ -36,15 +36,14 @@ 
         $substringLength = UTF8::strlen($substring, $this->encoding);
         $length -= $substringLength;
 
-        $truncated = UTF8::substr
-        (
+        $truncated = UTF8::substr(
             $this->scalarString,
             0,
             $length,
             $this->encoding
         );
 
-        return $this->newSelf($truncated . $substring);
+        return $this->newSelf($truncated.$substring);
     }
 
     /**
@@ -79,6 +78,6 @@ 
             $truncated = UTF8::substr($truncated, 0, $lastPos, $this->encoding);
         }
 
-        return $this->newSelf($truncated . $substring);
+        return $this->newSelf($truncated.$substring);
     }
 }

Braces +12 added lines, -3 removed lines

@@ -30,7 +30,10 @@ 
      */
     public function truncate($length, $substring = '')
     {
-        if ($length >= $this->getLength()) return $this;
+        if ($length >= $this->getLength())
+        {
+            return $this;
+        }
 
         // Need to further trim the string so we can append the substring
         $substringLength = UTF8::strlen($substring, $this->encoding);
@@ -63,7 +66,10 @@ 
      */
     public function safeTruncate($length, $substring = '')
     {
-        if ($length >= $this->getLength()) return $this;
+        if ($length >= $this->getLength())
+        {
+            return $this;
+        }
 
         // Need to further trim the string so we can append the substring
         $substringLength = UTF8::strlen($substring, $this->encoding);
@@ -76,7 +82,10 @@ 
         {
             // Find pos of the last occurrence of a space, get up to that
             $lastPos = UTF8::strrpos($truncated, ' ', 0, $this->encoding);
-            if (!is_integer($lastPos)) $lastPos = 0;
+            if (!is_integer($lastPos))
+            {
+                $lastPos = 0;
+            }
             $truncated = UTF8::substr($truncated, 0, $lastPos, $this->encoding);
         }
 

src/Methods/Pad.php

Spacing +3 added lines, -6 removed lines

@@ -37,8 +37,7 @@ 
     {
         if (!in_array($padType, ['left', 'right', 'both'], true))
         {
-            throw new \InvalidArgumentException
-            (
+            throw new \InvalidArgumentException(
                 'Pad expects $padType '."to be one of 'left', 'right' or 'both'"
             );
         }
@@ -118,16 +117,14 @@ 
 
         if (!$length || $paddedLength <= $strLength) return $this;
 
-        $leftPadding = UTF8::substr
-        (
+        $leftPadding = UTF8::substr(
             UTF8::str_repeat($padStr, ceil($left / $length)),
             0,
             $left,
             $this->encoding
         );
 
-        $rightPadding = UTF8::substr
-        (
+        $rightPadding = UTF8::substr(
             UTF8::str_repeat($padStr, ceil($right / $length)),
             0,
             $right,

Braces +4 added lines, -1 removed lines

@@ -116,7 +116,10 @@
         $strLength = $this->getLength();
         $paddedLength = $strLength + $left + $right;
 
-        if (!$length || $paddedLength <= $strLength) return $this;
+        if (!$length || $paddedLength <= $strLength)
+        {
+            return $this;
+        }
 
         $leftPadding = UTF8::substr
         (