phpgearbox / string

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 +6 added lines, -2 removed lines

@@ -30,7 +30,9 @@ 
      */
     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 +65,9 @@ 
      */
     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);

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

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

src/Methods/CaseManipulators.php

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
                 if ($match[0] == $marchToUpper)
                 {
                     return UTF8::strtolower($match[0], $this->encoding);
-                }
-                else
+                } else
                 {
                     return $marchToUpper;
                 }

Spacing +4 added lines, -7 removed lines

@@ -24,8 +24,7 @@ 
     {
         $first = UTF8::substr($this->scalarString, 0, 1, $this->encoding);
 
-        $rest = UTF8::substr
-        (
+        $rest = UTF8::substr(
             $this->scalarString,
             1,
             $this->getLength() - 1,
@@ -44,8 +43,7 @@ 
     {
         $first = UTF8::substr($this->scalarString, 0, 1, $this->encoding);
 
-        $rest = UTF8::substr
-        (
+        $rest = UTF8::substr(
             $this->scalarString,
             1,
             $this->getLength() - 1,
@@ -62,10 +60,9 @@ 
      */
     public function swapCase()
     {
-        return $this->newSelf(preg_replace_callback
-        (
+        return $this->newSelf(preg_replace_callback(
             '/[\S]/u',
-            function ($match)
+            function($match)
             {
                 $marchToUpper = UTF8::strtoupper($match[0], $this->encoding);
 

src/Methods/Has.php

Unused Use Statements -2 removed lines

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

src/Methods/Is.php

Unused Use Statements -2 removed lines

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

Braces +12 added lines, -4 removed lines

@@ -88,7 +88,9 @@ 
      */
     public function isJson()
     {
-        if ($this->getLength() === 0) return false;
+        if ($this->getLength() === 0) {
+            return false;
+        }
 
         json_decode($this->scalarString);
 
@@ -102,7 +104,9 @@ 
      */
     public function isSerialized()
     {
-        if ($this->getLength() === 0) return false;
+        if ($this->getLength() === 0) {
+            return false;
+        }
 
         /** @noinspection PhpUsageOfSilenceOperatorInspection */
         return
@@ -120,7 +124,9 @@ 
     public function isBase64()
     {
         // An empty string is by definition not encoded.
-        if ($this->getLength() === 0) return false;
+        if ($this->getLength() === 0) {
+            return false;
+        }
 
         // Grab the current string value.
         $possiblyEncoded = $this->scalarString;
@@ -129,7 +135,9 @@ 
         $decoded = base64_decode($possiblyEncoded, true);
 
         // If we get false it can't be base64
-        if ($decoded === false) return false;
+        if ($decoded === false) {
+            return false;
+        }
 
         // Lets double check
         return (base64_encode($decoded) === $this->scalarString);

src/Base.php

Doc Comments +3 added lines, -3 removed lines

@@ -144,12 +144,12 @@ 
     /**
      * Factory method to create a new Gears\String\Str object.
      *
-     * @param mixed  $string             Must be a scalar string or an object
+     * @param string  $string             Must be a scalar string or an object
      *                                   that implements the __toString() method
      *                                   or a value that is castable to a scalar
      *                                   string.
      *
-     * @param string $encoding           The character encoding to use for this
+     * @param string string           The character encoding to use for this
      *                                   string. If not specified, defaults to
      *                                   the value returned from
      *                                   mb_internal_encoding().
@@ -272,7 +272,7 @@ 
      *
      * @param  mixed $offset The index from which to retrieve the char
      *
-     * @return string                 The character at the specified index
+     * @return Base                 The character at the specified index
      * @throws \OutOfBoundsException If the positive or negative offset does
      *                               not exist
      */

Spacing +4 added lines, -7 removed lines

@@ -96,15 +96,13 @@ 
         // Make sure we can use the provided string value as a string.
         if (is_array($string))
         {
-            throw new \InvalidArgumentException
-            (
+            throw new \InvalidArgumentException(
                 'Passed value cannot be an array'
             );
         }
         elseif (is_object($string) && !method_exists($string, '__toString'))
         {
-            throw new \InvalidArgumentException
-            (
+            throw new \InvalidArgumentException(
                 'Passed object must have a __toString method'
             );
         }
@@ -126,7 +124,7 @@ 
         }
 
         // Set the strings length property.
-        $this->stringLength = UTF8::strlen($this->scalarString,$this->encoding);
+        $this->stringLength = UTF8::strlen($this->scalarString, $this->encoding);
     }
 
     /**
@@ -286,8 +284,7 @@ 
             throw new \OutOfBoundsException('No character exists at the index');
         }
 
-        return $this->newSelf(UTF8::substr
-        (
+        return $this->newSelf(UTF8::substr(
             $this->scalarString,
             $offset,
             1,

Braces +7 added lines, -9 removed lines

@@ -100,8 +100,7 @@ 
             (
                 'Passed value cannot be an array'
             );
-        }
-        elseif (is_object($string) && !method_exists($string, '__toString'))
+        } elseif (is_object($string) && !method_exists($string, '__toString'))
         {
             throw new \InvalidArgumentException
             (
@@ -119,8 +118,7 @@ 
         if ($encoding !== null)
         {
             $this->encoding = $encoding;
-        }
-        else
+        } else
         {
             $this->encoding = mb_internal_encoding();
         }
@@ -199,13 +197,11 @@ 
             {
                 // Convert the scalar string to a Str Object
                 $strObjects[$key] = $this->newSelf($value);
-            }
-            elseif (is_array($value))
+            } elseif (is_array($value))
             {
                 // Recurse into the array
                 $strObjects[$key] = $this->newSelfs($value);
-            }
-            else
+            } else
             {
                 // We don't know what it is do do nothing to it
                 $strObjects[$key] = $value;
@@ -259,7 +255,9 @@ 
     {
         $index = (int)$index;
 
-        if ($index >= 0) return ($this->getLength() > $index);
+        if ($index >= 0) {
+            return ($this->getLength() > $index);
+        }
 
         return ($this->getLength() >= abs($index));
     }

src/Methods/Html.php

Spacing +6 added lines, -12 removed lines

@@ -26,10 +26,8 @@ 
      */
     public function htmlDecode($flags = ENT_COMPAT)
     {
-        return $this->newSelf
-        (
-            UTF8::html_entity_decode
-            (
+        return $this->newSelf(
+            UTF8::html_entity_decode(
                 $this->scalarString,
                 $flags,
                 $this->encoding
@@ -54,10 +52,8 @@ 
     {
         if ($flags === null) $flags = ENT_QUOTES | ENT_SUBSTITUTE;
 
-        return $this->newSelf
-        (
-            UTF8::htmlentities
-            (
+        return $this->newSelf(
+            UTF8::htmlentities(
                 $this->scalarString,
                 $flags,
                 $this->encoding,
@@ -97,8 +93,7 @@ 
             }
             else
             {
-                throw new \RuntimeException
-                (
+                throw new \RuntimeException(
                     "This method requires \voku\helper\AntiXSS. ".
                     "Install with: composer require voku/anti-xss"
                 );
@@ -122,8 +117,7 @@ 
      */
     public function htmlStripTags($allowableTags = null)
     {
-        return $this->newSelf
-        (
+        return $this->newSelf(
             UTF8::strip_tags($this->scalarString, $allowableTags)
         );
     }

Braces +4 added lines, -3 removed lines

@@ -52,7 +52,9 @@ 
      */
     public function htmlEncode($flags = null, $doubleEncode = true)
     {
-        if ($flags === null) $flags = ENT_QUOTES | ENT_SUBSTITUTE;
+        if ($flags === null) {
+            $flags = ENT_QUOTES | ENT_SUBSTITUTE;
+        }
 
         return $this->newSelf
         (
@@ -94,8 +96,7 @@ 
             if (class_exists('\\voku\\helper\\AntiXSS'))
             {
                 $antiXss = new \voku\helper\AntiXSS();
-            }
-            else
+            } else
             {
                 throw new \RuntimeException
                 (

src/Methods/IndexOf.php

Spacing +2 added lines, -4 removed lines

@@ -29,8 +29,7 @@ 
      */
     public function indexOf($needle, $offset = 0)
     {
-        return UTF8::strpos
-        (
+        return UTF8::strpos(
             $this->scalarString,
             (string)$needle,
             (int)$offset,
@@ -53,8 +52,7 @@ 
      */
     public function indexOfLast($needle, $offset = 0)
     {
-        return UTF8::strrpos
-        (
+        return UTF8::strrpos(
             $this->scalarString,
             (string)$needle,
             (int)$offset,