Merge branch 'master' into markup

Conflicts: library/Zend/Markup/Parser/Textile.php library/Zend/Markup/Renderer/AbstractRenderer.php library/Zend/Markup/Renderer/Html.php
zendframework · Oct 30, 2010 · 614b493 · 614b493
2 parents 7db7f2b + 6020243
commit 614b493
Show file tree

Hide file tree

Showing 15 changed files with 161 additions and 65 deletions.
diff --git a/src/Adapter/AbstractAdapter.php b/src/Adapter/AbstractAdapter.php
@@ -16,7 +16,6 @@
  * @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
- * @version   $Id$
  */
 
 /**

diff --git a/src/Adapter/Console.php b/src/Adapter/Console.php
@@ -14,13 +14,13 @@
  * @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
- * @version    $Id$
  */
 
 /**
  * @namespace
  */
 namespace Zend\ProgressBar\Adapter;
+use Zend\ProgressBar\Adapter\Exception;
 
 /**
  * Zend_ProgressBar_Adapter_Console offers a text-based progressbar for console
@@ -188,7 +188,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 +266,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 +286,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 +304,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 +364,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;

diff --git a/src/Adapter/Exception.php b/src/Adapter/Exception.php
@@ -16,7 +16,6 @@
  * @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
- * @version   $Id$
  */
 
 /**
@@ -34,6 +33,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
 {
 }
diff --git a/src/Adapter/Exception/InvalidArgumentException.php b/src/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 license@zend.com 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
+{
+}
diff --git a/src/Adapter/Exception/RuntimeException.php b/src/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 license@zend.com 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
+{
+}
diff --git a/src/Adapter/JsPull.php b/src/Adapter/JsPull.php
@@ -14,7 +14,6 @@
  * @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
- * @version    $Id$
  */
 
 /**

diff --git a/src/Adapter/JsPush.php b/src/Adapter/JsPush.php
@@ -14,7 +14,6 @@
  * @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
- * @version    $Id$
  */
 
 /**

diff --git a/src/Exception.php b/src/Exception.php
@@ -16,7 +16,6 @@
  * @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
- * @version   $Id$
  */
 
 /**
@@ -34,6 +33,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
 {
 }
diff --git a/src/Exception/OutOfRangeException.php b/src/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 license@zend.com 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
+{
+}
diff --git a/src/ProgressBar.php b/src/ProgressBar.php
@@ -14,13 +14,13 @@
  * @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
- * @version    $Id$
  */
 
 /**
  * @namespace
  */
 namespace Zend\ProgressBar;
+use Zend\ProgressBar\Exception;
 
 /**
  * Zend_ProgressBar offers an interface for multiple enviroments.
@@ -96,7 +96,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;

diff --git a/test/Adapter/ConsoleTest.php b/test/Adapter/ConsoleTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
@@ -99,14 +98,8 @@ public function testFixedWidth()
 
     public function testInvalidElement()
     {
-        try {
-            $adapter = new Stub(array('width' => 30, 'elements' => array('foo')));
-            $adapter->notify(0, 100, 0, 0, null, null);
-
-            $this->fail('An expected Zend_ProgressBar_Adapter_Exception has not been raised');
-        } catch (Adapter\Exception $expected) {
-            $this->assertContains('Invalid element found in $elements array', $expected->getMessage());
-        }
+        $this->setExpectedException('Zend\ProgressBar\Adapter\Exception\InvalidArgumentException', 'Invalid element found');
+        $adapter = new Stub(array('width' => 30, 'elements' => array('foo')));
     }
 
     public function testCariageReturn()
@@ -244,13 +237,12 @@ public function testSetOutputStreamOpen() {
         $this->assertArrayHasKey('test1', MockupStream::$tests);
     }
 
-    public function testSetOutputStreamOpenFail() {
-        try {
-            $adapter = new Adapter\Console();
-            $adapter->setOutputStream(null);
-            $this->fail('Expected Zend_ProgressBar_Adapter_Exception');
-        } catch (Adapter\Exception $e) {
-        }
+    public function testSetOutputStreamOpenFail()
+    {
+        $adapter = new Adapter\Console();
+
+        $this->setExpectedException('Zend\ProgressBar\Adapter\Exception\RuntimeException', 'Unable to open stream');
+        $adapter->setOutputStream(null);
     }
 
     public function testSetOutputStreamReplaceStream() {
@@ -291,34 +283,28 @@ public function testFinishNone() {
         $this->assertEquals('', MockupStream::$tests['test7']);
     }
 
-    public function testSetBarLeftChar() {
-        try {
-            $adapter = new Adapter\Console();
-            $adapter->setBarLeftChar(null);
-            $this->fail('Expected Zend_ProgressBar_Adapter_Exception');
-        } catch (Adapter\Exception $e) {
-            $this->assertEquals($e->getMessage(), 'Character may not be empty');
-        }
+    public function testSetBarLeftChar()
+    {
+        $adapter = new Adapter\Console();
+
+        $this->setExpectedException('Zend\ProgressBar\Adapter\Exception\InvalidArgumentException','Character may not be empty');
+        $adapter->setBarLeftChar(null);
     }
 
-    public function testSetBarRightChar() {
-        try {
-            $adapter = new Adapter\Console();
-            $adapter->setBarRightChar(null);
-            $this->fail('Expected Zend_ProgressBar_Adapter_Exception');
-        } catch (Adapter\Exception $e) {
-            $this->assertEquals($e->getMessage(), 'Character may not be empty');
-        }
+    public function testSetBarRightChar()
+    {
+        $adapter = new Adapter\Console();
+
+        $this->setExpectedException('Zend\ProgressBar\Adapter\Exception\InvalidArgumentException','Character may not be empty');
+        $adapter->setBarRightChar(null);
     }
 
-    public function testSetInvalidFinishAction() {
-        try {
-            $adapter = new Adapter\Console();
-            $adapter->setFinishAction('CUSTOM_FINISH_ACTION');
-            $this->fail('Expected Zend_ProgressBar_Adapter_Exception');
-        } catch (Adapter\Exception $e) {
-            $this->assertEquals($e->getMessage(), 'Invalid finish action specified');
-        }
+    public function testSetInvalidFinishAction()
+    {
+        $adapter = new Adapter\Console();
+
+        $this->setExpectedException('Zend\ProgressBar\Adapter\Exception\InvalidArgumentException','Invalid finish action specified');
+        $adapter->setFinishAction('CUSTOM_FINISH_ACTION');
     }
 
 }

diff --git a/test/Adapter/JsPullTest.php b/test/Adapter/JsPullTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/Adapter/JsPushTest.php b/test/Adapter/JsPushTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/Adapter/MockupStream.php b/test/Adapter/MockupStream.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**