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

Commit

Permalink
Merge branch 'master' into feature/db-story-35
Browse files Browse the repository at this point in the history
Conflicts:
	library/Zend/Db/Sql/Exception/RuntimeException.php
  • Loading branch information
Ralph Schindler committed May 8, 2012
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 34 deletions.
8 changes: 2 additions & 6 deletions src/Adapter/Console.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,8 @@
* Zend_ProgressBar_Adapter_Console offers a text-based progressbar for console
* applications
*
* @uses \Zend\ProgressBar\Adapter\Adapter
* @uses \Zend\ProgressBar\Adapter\Exception
* @uses \Zend\Text\MultiByte
* @category Zend
* @package Zend_ProgressBar
* @uses Zend_ProgressBar_Adapter_Interface
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down Expand Up @@ -370,7 +366,7 @@ public function setFinishAction($action)
}

/**
* Defined by Zend_ProgressBar_Adapter_Interface
* Defined by Zend\ProgressBar\Adapter\AbstractAdapter
*
* @param float $current Current progress value
* @param float $max Max progress value
Expand Down Expand Up @@ -457,7 +453,7 @@ public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $te
}

/**
* Defined by Zend_ProgressBar_Adapter_Interface
* Defined by Zend\ProgressBar\Adapter\AbstractAdapter
*
* @return void
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\ProgressBar\Adapter;
namespace Zend\ProgressBar\Adapter\Exception;

use Zend\ProgressBar\Exception\ExceptionInterface as ProgressBarException;

/**
* Exception class for Zend_ProgressBar_Adapter
*
* @uses \Zend\ProgressBar\Exception
* @category Zend
* @package Zend_ProgressBar
* @uses \Zend\ProgressBar\Exception
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Exception extends \Zend\ProgressBar\Exception
interface ExceptionInterface
extends ProgressBarException
{
}
4 changes: 1 addition & 3 deletions src/Adapter/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,17 @@
*/

namespace Zend\ProgressBar\Adapter\Exception;
use Zend\ProgressBar\Adapter\Exception;

/**
* Exception for Zend_Progressbar component.
*
* @uses Zend\Exception
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class InvalidArgumentException
extends \InvalidArgumentException
implements Exception
implements ExceptionInterface
{
}
4 changes: 1 addition & 3 deletions src/Adapter/Exception/RuntimeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,17 @@
*/

namespace Zend\ProgressBar\Adapter\Exception;
use Zend\ProgressBar\Adapter\Exception;

/**
* Exception for Zend_Progressbar component.
*
* @uses Zend\Exception
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class RuntimeException
extends \RuntimeException
implements Exception
implements ExceptionInterface
{
}
7 changes: 2 additions & 5 deletions src/Adapter/JsPull.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,8 @@
* Zend_ProgressBar_Adapter_JsPull offers a simple method for updating a
* progressbar in a browser.
*
* @uses \Zend\Json\Json
* @uses \Zend\ProgressBar\Adapter\Adapter
* @category Zend
* @package Zend_ProgressBar
* @uses Zend_ProgressBar_Adapter_Interface
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand All @@ -53,7 +50,7 @@ public function setExitAfterSend($exitAfterSend)
}

/**
* Defined by Zend_ProgressBar_Adapter_Interface
* Defined by Zend\ProgressBar\Adapter\AbstractAdapter
*
* @param float $current Current progress value
* @param float $max Max progress value
Expand Down Expand Up @@ -82,7 +79,7 @@ public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $te
}

/**
* Defined by Zend_ProgressBar_Adapter_Interface
* Defined by Zend\ProgressBar\Adapter\AbstractAdapter
*
* @return void
*/
Expand Down
7 changes: 2 additions & 5 deletions src/Adapter/JsPush.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,8 @@
* Zend_ProgressBar_Adapter_JsPush offers a simple method for updating a
* progressbar in a browser.
*
* @uses \Zend\Json\Json
* @uses \Zend\ProgressBar\Adapter\Adapter
* @category Zend
* @package Zend_ProgressBar
* @uses Zend_ProgressBar_Adapter_Interface
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand Down Expand Up @@ -75,7 +72,7 @@ public function setFinishMethodName($methodName)
}

/**
* Defined by Zend_ProgressBar_Adapter_Interface
* Defined by Zend\ProgressBar\Adapter\AbstractAdapter
*
* @param float $current Current progress value
* @param float $max Max progress value
Expand Down Expand Up @@ -105,7 +102,7 @@ public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $te
}

/**
* Defined by Zend_ProgressBar_Adapter_Interface
* Defined by Zend\ProgressBar\Adapter\AbstractAdapter
*
* @return void
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Exception.php → src/Exception/ExceptionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\ProgressBar;
namespace Zend\ProgressBar\Exception;

/**
* Exception class for Zend_ProgressBar
Expand All @@ -28,6 +28,6 @@
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Exception
interface ExceptionInterface
{
}
4 changes: 1 addition & 3 deletions src/Exception/OutOfRangeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,17 @@
*/

namespace Zend\ProgressBar\Exception;
use Zend\ProgressBar\Exception;

/**
* Exception for Zend_Progressbar component.
*
* @uses Zend\Exception
* @category Zend
* @package Zend_ProgressBar
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class OutOfRangeException
extends \OutOfRangeException
implements Exception
implements ExceptionInterface
{
}
6 changes: 3 additions & 3 deletions src/ProgressBar.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ class ProgressBar
/**
* Create a new progressbar backend.
*
* @param \Zend\ProgressBar\Adapter\Adapter $adapter
* @param Adapter\AbstractAdapter $adapter
* @param float $min
* @param float $max
* @param string $persistenceNamespace
* @throws \Zend\ProgressBar\Exception When $min is greater than $max
* @throws Exception\OutOfRangeException When $min is greater than $max
*/
public function __construct(Adapter\AbstractAdapter $adapter, $min = 0, $max = 100, $persistenceNamespace = null)
{
Expand Down Expand Up @@ -131,7 +131,7 @@ public function __construct(Adapter\AbstractAdapter $adapter, $min = 0, $max = 1
/**
* Get the current adapter
*
* @return \Zend\ProgressBar\Adapter\Adapter
* @return Adapter\AbstractAdapter
*/
public function getAdapter()
{
Expand Down

0 comments on commit 3fda4ad

Please sign in to comment.