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 · d95685a · d95685a
2 parents 1863312 + 9fceeb6
commit d95685a
Show file tree

Hide file tree

Showing 60 changed files with 552 additions and 176 deletions.
diff --git a/src/Barcode.php b/src/Barcode.php
@@ -16,18 +16,18 @@
  * @package    Zend_Barcode
  * @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\Barcode;
-use Zend\Barcode\Renderer,
-    Zend\Loader\PluginLoader,
+use Zend\Loader\PluginLoader,
     Zend\Loader\ShortNameLocater,
     Zend\Config\Config,
-    Zend;
+    Zend,
+    Zend\Barcode\Exception\RendererCreationException,
+    Zend\Barcode\Exception\InvalidArgumentException;
 
 /**
  * Class for generate Barcode
@@ -78,7 +78,7 @@ public static function setPluginLoader(ShortNameLocater $loader, $type)
                 self::$_loaders[$type] = $loader;
                 return;
             default:
-                throw new Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type));
+                throw new InvalidArgumentException(sprintf('Invalid type "%s" provided to setPluginLoader()', $type));
         }
     }
 
@@ -107,7 +107,7 @@ public static function getPluginLoader($type)
                 }
                 return self::$_loaders[$type];
             default:
-                throw new Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type));
+                throw new InvalidArgumentException(sprintf('Invalid type "%s" provided to getPluginLoader()', $type));
         }
     }
 
@@ -166,9 +166,8 @@ public static function factory($barcode,
         try {
             $barcode  = self::makeBarcode($barcode, $barcodeConfig);
             $renderer = self::makeRenderer($renderer, $rendererConfig);
-        } catch (Zend\Exception $e) {
-            $renderable = ($e instanceof Exception) ? $e->isRenderable() : false;
-            if ($automaticRenderError && $renderable) {
+        } catch (Exception $e) {
+            if ($automaticRenderError && !($e instanceof RendererCreationException)) {
                 $barcode  = self::makeBarcode('error', array( 'text' => $e->getMessage() ));
                 $renderer = self::makeRenderer($renderer, array());
             } else {
@@ -215,7 +214,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array())
          * Verify that barcode parameters are in an array.
          */
         if (!is_array($barcodeConfig)) {
-            throw new Exception(
+            throw new InvalidArgumentException(
                 'Barcode parameters must be in an array or a \Zend\Config\Config object'
             );
         }
@@ -224,7 +223,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array())
          * Verify that an barcode name has been specified.
          */
         if (!is_string($barcode) || empty($barcode)) {
-            throw new Exception(
+            throw new InvalidArgumentException(
                 'Barcode name must be specified in a string'
             );
         }
@@ -241,7 +240,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array())
          * Verify that the object created is a descendent of the abstract barcode type.
          */
         if (!$bcAdapter instanceof BarcodeObject) {
-            throw new Exception(
+            throw new InvalidArgumentException(
                 "Barcode class '$barcodeName' does not implement \Zend\Barcode\BarcodeObject"
             );
         }
@@ -257,7 +256,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array())
      */
     public static function makeRenderer($renderer = 'image', $rendererConfig = array())
     {
-        if ($renderer instanceof Renderer) {
+        if ($renderer instanceof BarcodeRenderer) {
             return $renderer;
         }
 
@@ -281,22 +280,18 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array
          * Verify that barcode parameters are in an array.
          */
         if (!is_array($rendererConfig)) {
-            $e = new Exception(
+            throw new RendererCreationException(
                 'Barcode parameters must be in an array or a \Zend\Config\Config object'
             );
-            $e->setIsRenderable(false);
-            throw $e;
         }
 
         /*
          * Verify that an barcode name has been specified.
          */
         if (!is_string($renderer) || empty($renderer)) {
-            $e = new Exception(
+            throw new RendererCreationException(
                 'Renderer name must be specified in a string'
             );
-            $e->setIsRenderable(false);
-            throw $e;
         }
 
         $rendererName = self::getPluginLoader(self::RENDERER)->load($renderer);
@@ -310,12 +305,10 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array
         /*
          * Verify that the object created is a descendent of the abstract barcode type.
          */
-        if (!$rdrAdapter instanceof Renderer) {
-            $e = new Exception(
+        if (!$rdrAdapter instanceof BarcodeRenderer) {
+            throw new RendererCreationException(
                 "Renderer class '$rendererName' does not implements \Zend\Barcode\Renderer"
             );
-            $e->setIsRenderable(false);
-            throw $e;
         }
         return $rdrAdapter;
     }

diff --git a/src/BarcodeObject.php b/src/BarcodeObject.php
@@ -17,7 +17,6 @@
  * @subpackage Object
  * @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/Renderer.php → src/BarcodeRenderer.php b/src/Renderer.php → src/BarcodeRenderer.php
@@ -17,7 +17,6 @@
  * @subpackage Renderer
  * @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$
  */
 
 /**
@@ -35,7 +34,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Renderer
+interface BarcodeRenderer
 {
     /**
      * Constructor

diff --git a/src/Exception.php b/src/Exception.php
@@ -16,51 +16,22 @@
  * @package    Zend_Barcode
  * @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\Barcode;
-use Zend;
 
 /**
- * Zend_Barcode_Exception
+ * Exception for Zend_Barcode component.
  *
- * @uses       \Zend\Exception
+ * @uses       Zend\Exception
  * @category   Zend
  * @package    Zend_Barcode
  * @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
 {
-    /**
-     * Is this exception renderable?
-     * @var bool
-     */
-    protected $_isRenderable = true;
-
-    /**
-     * Set renderable flag
-     *
-     * @param  bool $flag
-     * @return \Zend\Barcode\Exception
-     */
-    public function setIsRenderable($flag)
-    {
-        $this->_isRenderable = (bool) $flag;
-        return $this;
-    }
-
-    /**
-     * Retrieve renderable flag
-     *
-     * @return bool
-     */
-    public function isRenderable()
-    {
-        return $this->_isRenderable;
-    }
 }
diff --git a/src/Exception/InvalidArgumentException.php b/src/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_Barcode
+ * @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\Barcode\Exception;
+use Zend\Barcode\Exception;
+
+/**
+ * Exception for Zend_Barcode component.
+ *
+ * @uses       Zend\Exception
+ * @category   Zend
+ * @package    Zend_Barcode
+ * @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/Exception/RendererCreationException.php b/src/Exception/RendererCreationException.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_Barcode
+ * @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\Barcode\Exception;
+use Zend\Barcode\Exception;
+
+/**
+ * Exception for Zend_Barcode component.
+ *
+ * @uses       Zend\Exception
+ * @category   Zend
+ * @package    Zend_Barcode
+ * @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 RendererCreationException
+    extends \InvalidArgumentException
+    implements Exception
+{
+}