Skip to content

Commit

Permalink
Global namespace not needed for constants
Browse files Browse the repository at this point in the history
  • Loading branch information
marc-mabe committed Jan 6, 2013
1 parent 5ef114b commit adb6827
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion library/Zend/ProgressBar/Adapter/Console.php
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $te
substr($text, 0, $this->textWidth),
$this->textWidth,
' ',
\STR_PAD_RIGHT
STR_PAD_RIGHT
);
break;
}
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ public function wordWrap($string, $width = 75, $break = "\n", $cut = false)
* @param integer $padType
* @return string
*/
public function strPad($input, $padLength, $padString = ' ', $padType = \STR_PAD_RIGHT)
public function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT)
{
if (StringUtils::isSingleByteEncoding($this->getEncoding())) {
return str_pad($input, $padLength, $padString, $padType);
Expand All @@ -250,7 +250,7 @@ public function strPad($input, $padLength, $padString = ' ', $padType = \STR_PAD

$repeatCount = floor($lengthOfPadding / $padStringLength);

if ($padType === \STR_PAD_BOTH) {
if ($padType === STR_PAD_BOTH) {
$lastStringLeft = '';
$lastStringRight = '';
$repeatCountLeft = $repeatCountRight = ($repeatCount - $repeatCount % 2) / 2;
Expand All @@ -269,7 +269,7 @@ public function strPad($input, $padLength, $padString = ' ', $padType = \STR_PAD

$lastString = $this->substr($padString, 0, $lengthOfPadding % $padStringLength);

if ($padType === \STR_PAD_LEFT) {
if ($padType === STR_PAD_LEFT) {
return str_repeat($padString, $repeatCount) . $lastString . $input;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,5 @@ public function wordWrap($str, $width = 75, $break = "\n", $cut = false);
* @param integer $padType
* @return string
*/
public function strPad($input, $padLength, $padString = ' ', $padType = \STR_PAD_RIGHT);
public function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT);
}
2 changes: 1 addition & 1 deletion library/Zend/Text/MultiByte.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static function wordWrap($string, $width = 75, $break = "\n", $cut = fals
* @return string
* @deprecated Please use Zend\Stdlib\StringUtils instead
*/
public static function strPad($input, $padLength, $padString = ' ', $padType = \STR_PAD_RIGHT, $charset = 'utf-8')
public static function strPad($input, $padLength, $padString = ' ', $padType = STR_PAD_RIGHT, $charset = 'utf-8')
{
trigger_error(sprintf(
"This method is deprecated, please use '%s' instead",
Expand Down

0 comments on commit adb6827

Please sign in to comment.