Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Quoc Vu committed May 9, 2013
114 parents 90b47c5 + 89df4b8 + 07eac97 + dbff227 + a8bc04a + 9e53124 + aa8a772 + 1dacd62 + b1d673b + 4ca3a91 + 3823a47 + fcdb53c + 4695159 + 8c4a1a4 + 1ac8bc9 + 266a726 + a48d0b4 + 8bbe006 + f7a58c4 + ef00607 + 03f1a39 + fa9020e + 290a868 + 12376e4 + f183282 + 5609ded + b742a14 + 6ee62cd + 2d5f08c + 5f0a20d + da6d437 + 6020243 + 6cf319f + 7764705 + 8858064 + d35a73e + 4dca7a7 + e331113 + b288c81 + a7e1ad0 + c0434da + bc3b794 + 137fd45 + d2ea768 + 614b493 + f2158f1 + 6ad7c37 + 4f10632 + 1be14cc + 46a76e6 + bb3de95 + f1962e2 + 8c5e72d + 580978e + fcbde5a + 0bc3146 + e29de4d + 3fda4ad + 69ba799 + 3227b7b + 5f6a326 + 0f56ab5 + 5b30430 + a696f90 + 08b23c4 + 6438497 + 1d7c8db + 9d80a9e + 10c5fc3 + 875f572 + d32773b + ab30fab + 679b87a + 4d48267 + 9b1b333 + a1ead02 + 8013fb4 + 257d444 + 742fa1f + fbadf39 + d24dc4d + 7886448 + 445cc01 + 58a19ab + 194409f + 4a0a5ab + e2b5a72 + 399dc4f + c027f2a + bd63175 + 5faf735 + 6b5631d + e91ce9b + 3c20bc3 + 269ff93 + 3bb86fe + 2cc8054 + ab199de + 4a7857c + a36f375 + a8ec94c + f4ffca4 + 8355c2f + 4f1d801 + fdb75ff + 0a0d8b3 + 59ca0b9 + b28f8fa + 3b565ef + c026857 + e99f31a + 715843c + f85a410 + 2213be0 commit 07035bd
Show file tree
Hide file tree
Showing 25 changed files with 643 additions and 86 deletions.
6 changes: 6 additions & 0 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
"php": ">=5.3.3",
"zendframework/zend-stdlib": "self.version"
},
"extra": {
"branch-alias": {
"dev-master": "2.2-dev",
"dev-develop": "2.3-dev"
}
},
"homepage": "https://github.com/zendframework/zend-progress-bar",
"autoload-dev": {
"psr-4": {
Expand Down
10 changes: 3 additions & 7 deletions src/Adapter/AbstractAdapter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter;
Expand All @@ -15,9 +14,6 @@

/**
* Abstract class for Zend_ProgressBar_Adapters
*
* @category Zend
* @package Zend_ProgressBar
*/
abstract class AbstractAdapter
{
Expand Down Expand Up @@ -77,8 +73,8 @@ public function setOptions(array $options)
* @param float $current Current progress value
* @param float $max Max progress value
* @param float $percent Current percent value
* @param integer $timeTaken Taken time in seconds
* @param integer $timeRemaining Remaining time in seconds
* @param int $timeTaken Taken time in seconds
* @param int $timeRemaining Remaining time in seconds
* @param string $text Status text
* @return void
*/
Expand Down
38 changes: 21 additions & 17 deletions src/Adapter/Console.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,19 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter;

use Zend\ProgressBar\Adapter\Exception;
use Zend\Stdlib\ErrorHandler;
use Zend\Stdlib\StringUtils;

/**
* Zend_ProgressBar_Adapter_Console offers a text-based progressbar for console
* applications
*
* @category Zend
* @package Zend_ProgressBar
*/
class Console extends AbstractAdapter
{
Expand Down Expand Up @@ -60,7 +57,7 @@ class Console extends AbstractAdapter
/**
* Width of the progressbar
*
* @var integer
* @var int
*/
protected $width = null;

Expand All @@ -69,9 +66,11 @@ class Console extends AbstractAdapter
*
* @var array
*/
protected $elements = array(self::ELEMENT_PERCENT,
self::ELEMENT_BAR,
self::ELEMENT_ETA);
protected $elements = array(
self::ELEMENT_PERCENT,
self::ELEMENT_BAR,
self::ELEMENT_ETA,
);

/**
* Which action to do at finish call
Expand All @@ -83,7 +82,7 @@ class Console extends AbstractAdapter
/**
* Width of the bar element
*
* @var integer
* @var int
*/
protected $barWidth;

Expand Down Expand Up @@ -125,7 +124,7 @@ class Console extends AbstractAdapter
/**
* Whether the output started yet or not
*
* @var boolean
* @var bool
*/
protected $outputStarted = false;

Expand Down Expand Up @@ -207,12 +206,12 @@ public function getOutputStream()
/**
* Set the width of the progressbar
*
* @param integer $width
* @param int $width
* @return \Zend\ProgressBar\Adapter\Console
*/
public function setWidth($width = null)
{
if ($width === null || !is_integer($width)) {
if ($width === null || !is_int($width)) {
if (substr(PHP_OS, 0, 3) === 'WIN') {
// We have to default to 79 on windows, because the windows
// terminal always has a fixed width of 80 characters and the
Expand Down Expand Up @@ -318,7 +317,7 @@ public function setBarIndicatorChar($char)
/**
* Set the width of the text element
*
* @param integer $width
* @param int $width
* @return \Zend\ProgressBar\Adapter\Console
*/
public function setTextWidth($width)
Expand Down Expand Up @@ -368,8 +367,8 @@ public function setFinishAction($action)
* @param float $current Current progress value
* @param float $max Max progress value
* @param float $percent Current percent value
* @param integer $timeTaken Taken time in seconds
* @param integer $timeRemaining Remaining time in seconds
* @param int $timeTaken Taken time in seconds
* @param int $timeRemaining Remaining time in seconds
* @param string $text Status text
* @return void
*/
Expand Down Expand Up @@ -438,7 +437,12 @@ public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $te
break;

case self::ELEMENT_TEXT:
$renderedElements[] = \Zend\Text\MultiByte::strPad(substr($text, 0, $this->textWidth), $this->textWidth, ' ', STR_PAD_RIGHT, $this->charset);
$renderedElements[] = StringUtils::getWrapper($this->charset)->strPad(
substr($text, 0, $this->textWidth),
$this->textWidth,
' ',
STR_PAD_RIGHT
);
break;
}
}
Expand Down
6 changes: 1 addition & 5 deletions src/Adapter/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter\Exception;
Expand All @@ -14,9 +13,6 @@

/**
* Exception class for Zend_ProgressBar_Adapter
*
* @category Zend
* @package Zend_ProgressBar
*/
interface ExceptionInterface extends ProgressBarException
{
Expand Down
6 changes: 1 addition & 5 deletions src/Adapter/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter\Exception;
Expand All @@ -14,9 +13,6 @@

/**
* Exception for Zend_Progressbar component.
*
* @category Zend
* @package Zend_ProgressBar
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
Expand Down
6 changes: 1 addition & 5 deletions src/Adapter/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter\Exception;
Expand All @@ -14,9 +13,6 @@

/**
* Exception for Zend_Progressbar component.
*
* @category Zend
* @package Zend_ProgressBar
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
Expand Down
14 changes: 5 additions & 9 deletions src/Adapter/JsPull.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter;
Expand All @@ -15,23 +14,20 @@
/**
* Zend_ProgressBar_Adapter_JsPull offers a simple method for updating a
* progressbar in a browser.
*
* @category Zend
* @package Zend_ProgressBar
*/
class JsPull extends AbstractAdapter
{
/**
* Whether to exit after json data send or not
*
* @var boolean
* @var bool
*/
protected $exitAfterSend = true;

/**
* Set whether to exit after json data send or not
*
* @param boolean $exitAfterSend
* @param bool $exitAfterSend
* @return \Zend\ProgressBar\Adapter\JsPull
*/
public function setExitAfterSend($exitAfterSend)
Expand All @@ -45,8 +41,8 @@ public function setExitAfterSend($exitAfterSend)
* @param float $current Current progress value
* @param float $max Max progress value
* @param float $percent Current percent value
* @param integer $timeTaken Taken time in seconds
* @param integer $timeRemaining Remaining time in seconds
* @param int $timeTaken Taken time in seconds
* @param int $timeRemaining Remaining time in seconds
* @param string $text Status text
* @return void
*/
Expand Down
10 changes: 3 additions & 7 deletions src/Adapter/JsPush.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter;
Expand All @@ -15,9 +14,6 @@
/**
* Zend_ProgressBar_Adapter_JsPush offers a simple method for updating a
* progressbar in a browser.
*
* @category Zend
* @package Zend_ProgressBar
*/
class JsPush extends AbstractAdapter
{
Expand Down Expand Up @@ -67,8 +63,8 @@ public function setFinishMethodName($methodName)
* @param float $current Current progress value
* @param float $max Max progress value
* @param float $percent Current percent value
* @param integer $timeTaken Taken time in seconds
* @param integer $timeRemaining Remaining time in seconds
* @param int $timeTaken Taken time in seconds
* @param int $timeRemaining Remaining time in seconds
* @param string $text Status text
* @return void
*/
Expand Down
6 changes: 1 addition & 5 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Exception;

/**
* Exception class for Zend_ProgressBar
*
* @category Zend
* @package Zend_ProgressBar
*/
interface ExceptionInterface
{
Expand Down
6 changes: 1 addition & 5 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Exception;

/**
* Exception for Zend_Progressbar component.
*
* @category Zend
* @package Zend_ProgressBar
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
Expand Down
6 changes: 1 addition & 5 deletions src/Exception/OutOfRangeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Exception;

/**
* Exception for Zend_Progressbar component.
*
* @category Zend
* @package Zend_ProgressBar
*/
class OutOfRangeException extends \OutOfRangeException implements ExceptionInterface
{
Expand Down
13 changes: 13 additions & 0 deletions src/Exception/PhpEnvironmentException.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\ProgressBar\Exception;

class PhpEnvironmentException extends RuntimeException
{}
6 changes: 1 addition & 5 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Exception;

/**
* Exception for Zend_Progressbar component.
*
* @category Zend
* @package Zend_ProgressBar
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{}
Loading

0 comments on commit 07035bd

Please sign in to comment.