Merge branch 'master' of git://github.com/zendframework/zf2 into zf11884

zendframework · Nov 19, 2011 · f6cf6f8 · f6cf6f8
commit f6cf6f8
Show file tree

Hide file tree

Showing 72 changed files with 2,737 additions and 2,659 deletions.
diff --git a/src/Barcode.php b/src/Barcode.php
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -23,12 +23,12 @@
  * @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-2011 Zend Technologies USA Inc. (http://www.zend.com)
@@ -38,4 +38,4 @@ class InvalidArgumentException
     extends \InvalidArgumentException
     implements Exception
 {
-}
+}
diff --git a/src/Exception/RendererCreationException.php b/src/Exception/RendererCreationException.php
@@ -23,12 +23,12 @@
  * @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-2011 Zend Technologies USA Inc. (http://www.zend.com)
@@ -38,4 +38,4 @@ class RendererCreationException
     extends \InvalidArgumentException
     implements Exception
 {
-}
+}
diff --git a/src/BarcodeObject.php → src/Object.php b/src/BarcodeObject.php → src/Object.php
@@ -23,7 +23,6 @@
  * @namespace
  */
 namespace Zend\Barcode;
-use Zend\Config\Config;
 
 /**
  * Interface for generate Barcode
@@ -33,34 +32,27 @@
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface BarcodeObject
+interface Object
 {
     /**
      * Constructor
-     * @param array|\Zend\Config\Config $options
+     * @param array|Traversable $options
      * @return void
      */
     public function __construct($options = null);
 
     /**
      * Set barcode state from options array
      * @param  array $options
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setOptions($options);
 
-    /**
-     * Set barcode state from config object
-     * @param \Zend\Config\Config $config
-     * @return \Zend\Barcode\BarcodeObject
-     */
-    public function setConfig(Config $config);
-
     /**
      * Set barcode namespace for autoloading
      *
      * @param string $namespace
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setBarcodeNamespace($namespace);
 
@@ -80,7 +72,7 @@ public function getType();
     /**
      * Set height of the barcode bar
      * @param integer $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setBarHeight($value);
 
@@ -93,7 +85,7 @@ public function getBarHeight();
     /**
      * Set thickness of thin bar
      * @param integer $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setBarThinWidth($value);
 
@@ -106,7 +98,7 @@ public function getBarThinWidth();
     /**
      * Set thickness of thick bar
      * @param integer $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setBarThickWidth($value);
 
@@ -120,7 +112,7 @@ public function getBarThickWidth();
      * Set factor applying to
      * thinBarWidth - thickBarWidth - barHeight - fontSize
      * @param integer $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setFactor($value);
 
@@ -134,7 +126,7 @@ public function getFactor();
     /**
      * Set color of the barcode and text
      * @param string $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setForeColor($value);
 
@@ -147,7 +139,7 @@ public function getForeColor();
     /**
      * Set the color of the background
      * @param integer $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setBackgroundColor($value);
 
@@ -160,7 +152,7 @@ public function getBackgroundColor();
     /**
      * Activate/deactivate drawing of the bar
      * @param boolean $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setWithBorder($value);
 
@@ -172,14 +164,14 @@ public function getWithBorder();
 
     /**
      * Allow fast inversion of font/bars color and background color
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setReverseColor();
 
     /**
      * Set orientation of barcode and text
      * @param float $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setOrientation($value);
 
@@ -192,7 +184,7 @@ public function getOrientation();
     /**
      * Set text to encode
      * @param string $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setText($value);
 
@@ -217,7 +209,7 @@ public function getTextToDisplay();
     /**
      * Activate/deactivate drawing of text to encode
      * @param boolean $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setDrawText($value);
 
@@ -231,7 +223,7 @@ public function getDrawText();
      * Activate/deactivate the adjustment of the position
      * of the characters to the position of the bars
      * @param boolean $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setStretchText($value);
 
@@ -247,7 +239,7 @@ public function getStretchText();
      * of the checksum character
      * added to the barcode text
      * @param boolean $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setWithChecksum($value);
 
@@ -263,7 +255,7 @@ public function getWithChecksum();
      * of the checksum character
      * added to the barcode text
      * @param boolean $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setWithChecksumInText($value);
 
@@ -279,7 +271,7 @@ public function getWithChecksumInText();
      *  - if integer between 1 and 5, use gd built-in fonts
      *  - if string, $value is assumed to be the path to a TTF font
      * @param integer|string $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setFont($value);
 
@@ -292,7 +284,7 @@ public function getFont();
     /**
      * Set the size of the font in case of TTF
      * @param float $value
-     * @return \Zend\Barcode\BarcodeObject
+     * @return Object
      */
     public function setFontSize($value);