diff --git a/src/Stringy/StaticStringy.php b/src/Stringy/StaticStringy.php index 013aafd..ec78825 100644 --- a/src/Stringy/StaticStringy.php +++ b/src/Stringy/StaticStringy.php @@ -132,7 +132,6 @@ class StaticStringy * equivalents. * * @param string $str String to remove special chars - * @param string $encoding The character encoding * @return string String with those characters removed */ public static function tidy($str) @@ -146,6 +145,7 @@ class StaticStringy * multibyte whitespace such as the thin space and ideographic space. * * @param string $str The string to cleanup whitespace + * @param string $encoding The character encoding * @return string The trimmed string with condensed whitespace */ public static function collapseWhitespace($str, $encoding = null) diff --git a/src/Stringy/Stringy.php b/src/Stringy/Stringy.php index 7d0ed56..155d6de 100644 --- a/src/Stringy/Stringy.php +++ b/src/Stringy/Stringy.php @@ -418,9 +418,9 @@ class Stringy * Returns a new string of a given length such that the end of the string is * padded. Alias for pad() with a $padType of 'right'. * - * @param int $length Desired string length after padding - * @param string $padStr String used to pad, defaults to space - * @return string Object with a right padded $str + * @param int $length Desired string length after padding + * @param string $padStr String used to pad, defaults to space + * @return Stringy Object with a right padded $str */ public function padRight($length, $padStr = ' ') { @@ -639,7 +639,7 @@ class Stringy // If the last word was truncated if (mb_strpos($stringy->str, ' ', $length - 1, $stringy->encoding) != $length) { - // Find pos of the last occurence of a space, and get everything up until + // Find pos of the last occurrence of a space, and get everything up until $lastPos = mb_strrpos($truncated, ' ', 0, $stringy->encoding); $truncated = mb_substr($truncated, 0, $lastPos, $stringy->encoding); } @@ -947,7 +947,7 @@ class Stringy /** * Returns true if $str matches the supplied pattern, false otherwise. * - * @param string Regex pattern to match against + * @param string $pattern Regex pattern to match against * @return bool Whether or not $str matches the pattern */ private function matchesPattern($pattern)