Progressbar: review exception, all tests passed

library/Zend/ProgressBar/Adapter/Console.php

@@ -21,6 +21,7 @@
  * @namespace
  */
 namespace Zend\ProgressBar\Adapter;
+use Zend\ProgressBar\Adapter\Exception;
 
 /**
  * Zend_ProgressBar_Adapter_Console offers a text-based progressbar for console
@@ -188,7 +189,7 @@ public function setOutputStream($resource)
        $stream = @fopen($resource, 'w');
 
        if ($stream === false) {
-            throw new Exception('Unable to open stream');
+            throw new Exception\RuntimeException('Unable to open stream');
        }
 
        if ($this->_outputStream !== null) {
@@ -266,7 +267,7 @@ public function setElements(array $elements)
                                  self::ELEMENT_TEXT);
 
         if (count(array_diff($elements, $allowedElements)) > 0) {
-            throw new Exception('Invalid element found in $elements array');
+            throw new Exception\InvalidArgumentException('Invalid element found in $elements array');
         }
 
         $this->_elements = $elements;
@@ -286,7 +287,7 @@ public function setElements(array $elements)
     public function setBarLeftChar($char)
     {
         if (empty($char)) {
-            throw new Exception('Character may not be empty');
+            throw new Exception\InvalidArgumentException('Character may not be empty');
         }
 
         $this->_barLeftChar = (string) $char;
@@ -304,7 +305,7 @@ public function setBarLeftChar($char)
     public function setBarRightChar($char)
     {
         if (empty($char)) {
-            throw new Exception('Character may not be empty');
+            throw new Exception\InvalidArgumentException('Character may not be empty');
         }
 
         $this->_barRightChar = (string) $char;
@@ -364,7 +365,7 @@ public function setFinishAction($action)
                                 self::FINISH_ACTION_NONE);
 
         if (!in_array($action, $allowedActions)) {
-            throw new Exception('Invalid finish action specified');
+            throw new Exception\InvalidArgumentException('Invalid finish action specified');
         }
 
         $this->_finishAction = $action;

library/Zend/ProgressBar/Adapter/Exception.php

@@ -34,6 +34,6 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Exception extends \Zend\ProgressBar\Exception
+interface Exception extends \Zend\ProgressBar\Exception
 {
 }

library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_ProgressBar
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @namespace
+ */
+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-2010 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
+{
+}

library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_ProgressBar
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @namespace
+ */
+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-2010 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
+{
+}

library/Zend/ProgressBar/Exception.php

@@ -34,6 +34,6 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Exception extends \Zend\Exception
+interface Exception
 {
 }

library/Zend/ProgressBar/Exception/OutOfRangeException.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_ProgressBar
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version    $Id$
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+
+/**
+ * @namespace
+ */
+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-2010 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
+{
+}

library/Zend/ProgressBar/ProgressBar.php

@@ -21,6 +21,7 @@
  * @namespace
  */
 namespace Zend\ProgressBar;
+use Zend\ProgressBar\Exception;
 
 /**
  * Zend_ProgressBar offers an interface for multiple enviroments.
@@ -96,7 +97,7 @@ public function __construct(Adapter\AbstractAdapter $adapter, $min = 0, $max = 1
     {
         // Check min/max values and set them
         if ($min > $max) {
-            throw new Exception('$max must be greater than $min');
+            throw new Exception\OutOfRangeException('$max must be greater than $min');
         }
 
         $this->_min     = (float) $min;