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

Commit

Permalink
Merge branch 'develop' of https://github.com/zendframework/zf2 into d…
Browse files Browse the repository at this point in the history 
…evelop
  • Loading branch information
Stefan Kleff committed Jan 23, 2013
96 parents 399dc4f + c027f2a + 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 + e2b5a72 + bd63175 + e91ce9b + 3c20bc3 + 269ff93 + 3bb86fe + 2cc8054 + ab199de + 4a7857c + a36f375 + a8ec94c + f4ffca4 + 8355c2f + 4f1d801 + fdb75ff commit b28f8fa
Show file tree
Hide file tree
Showing 19 changed files with 598 additions and 49 deletions.
4 changes: 0 additions & 4 deletions src/Adapter/AbstractAdapter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @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
* @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
12 changes: 7 additions & 5 deletions src/Adapter/Console.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,17 @@
* @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
* @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 @@ -438,7 +435,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
4 changes: 0 additions & 4 deletions src/Adapter/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @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
* @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
4 changes: 0 additions & 4 deletions src/Adapter/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @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
* @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
4 changes: 0 additions & 4 deletions src/Adapter/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @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
* @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
4 changes: 0 additions & 4 deletions src/Adapter/JsPull.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @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
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Adapter;
Expand All @@ -15,9 +14,6 @@
/**
* Zend_ProgressBar_Adapter_JsPull offers a simple method for updating a
* progressbar in a browser.
*
* @category Zend
* @package Zend_ProgressBar
*/
class JsPull extends AbstractAdapter
{
Expand Down
4 changes: 0 additions & 4 deletions src/Adapter/JsPush.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @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
* @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
4 changes: 0 additions & 4 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @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
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Exception;

/**
* Exception class for Zend_ProgressBar
*
* @category Zend
* @package Zend_ProgressBar
*/
interface ExceptionInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @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
* @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
4 changes: 0 additions & 4 deletions src/Exception/OutOfRangeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @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
* @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
{}
4 changes: 0 additions & 4 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @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
* @package Zend_ProgressBar
*/

namespace Zend\ProgressBar\Exception;

/**
* Exception for Zend_Progressbar component.
*
* @category Zend
* @package Zend_ProgressBar
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{}
4 changes: 0 additions & 4 deletions src/ProgressBar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @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
* @package Zend_ProgressBar
*/

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

/**
* Zend_ProgressBar offers an interface for multiple environments.
*
* @category Zend
* @package Zend_ProgressBar
*/
class ProgressBar
{
Expand Down
Loading

0 comments on commit b28f8fa

Please sign in to comment.