tweet_live: comparison web/lib/Zend/Barcode/Object/ObjectAbstract.php

equal deleted inserted replaced

-:5a6b6e770365
+:68c69c656a2c
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Barcode
 * @subpackage Object
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: ObjectAbstract.php 24593 2012-01-05 20:35:02Z matthew $
+* @version    $Id$
 */
 /**
 * Class for generate Barcode
 *
 * @category   Zend
 * @package    Zend_Barcode
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 abstract class Zend_Barcode_Object_ObjectAbstract
 {
 /**
 * Namespace of the barcode for autoloading
+*
 * @var string
 */
 protected $_barcodeNamespace = 'Zend_Barcode_Object';
 /**
 * Set of drawing instructions
+*
 * @var array
 */
 protected $_instructions = array();
 /**
 * Barcode type
+*
 * @var string
 */
 protected $_type = null;
 /**
 * Height of the object
+*
 * @var integer
 */
 protected $_height = null;
 /**
 * Width of the object
+*
 * @var integer
 */
 protected $_width = null;
 /**
 * Height of the bar
+*
 * @var integer
 */
 protected $_barHeight = 50;
 /**
 * Width of a thin bar
+*
 * @var integer
 */
 protected $_barThinWidth = 1;
 /**
 * Width of a thick bar
+*
 * @var integer
 */
 protected $_barThickWidth = 3;
 /**
 * Factor to multiply bar and font measure
 * (barHeight, barThinWidth, barThickWidth & fontSize)
+*
 * @var integer
 */
 protected $_factor = 1;
 /**
 * Font and bars color of the object
+*
 * @var integer
 */
 protected $_foreColor = 0x000000;
 /**
 * Background color of the object
+*
 * @var integer
 */
 protected $_backgroundColor = 0xFFFFFF;
 /**
 * Activate/deactivate border of the object
+*
 * @var boolean
 */
 protected $_withBorder = false;
 /**
 * Activate/deactivate drawing of quiet zones
+*
 * @var boolean
 */
 protected $_withQuietZones = true;
 /**
 * Force quiet zones even if
+*
 * @var boolean
 */
 protected $_mandatoryQuietZones = false;
 /**
 * Orientation of the barcode in degrees
+*
 * @var float
 */
 protected $_orientation = 0;
 /**
 * Offset from the top the object
 * (calculated from the orientation)
+*
 * @var integer
 */
 protected $_offsetTop = null;
 /**
 * Offset from the left the object
 * (calculated from the orientation)
+*
 * @var integer
 */
 protected $_offsetLeft = null;
 /**
 * Text to display
+*
 * @var string
 */
 protected $_text = null;
 /**
 * Display (or not) human readable text
+*
 * @var boolean
 */
 protected $_drawText = true;
 /**
 * Adjust (or not) position of human readable characters with barcode
+*
 * @var boolean
 */
 protected $_stretchText = false;
 /**
 * Font resource
 *  - integer (1 to 5): corresponds to GD included fonts
 *  - string: corresponds to path of a TTF font
+*
 * @var integer|string
 */
 protected $_font = null;
 /**
 * Font size
+*
 * @var float
 */
 protected $_fontSize = 10;
 /**
 * Drawing of checksum
+*
 * @var boolean
 */
 protected $_withChecksum = false;
 /**
 * Drawing of checksum inside text
+*
 * @var boolean
 */
 protected $_withChecksumInText = false;
 /**
 * Fix barcode length (numeric or string like 'even')
+*
 * @var $_barcodeLength integer | string
 */
 protected $_barcodeLength = null;
 /**
 * Activate automatic addition of leading zeros
 * if barcode length is fixed
+*
 * @var $_addLeadingZeros boolean
 */
 protected $_addLeadingZeros = true;
 /**
 * Activation of mandatory checksum
 * to deactivate unauthorized modification
+*
 * @var $_mandatoryChecksum boolean
 */
 protected $_mandatoryChecksum = false;
 /**
 * Character used to substitute checksum character for validation
+*
 * @var $_substituteChecksumCharacter mixed
 */
 protected $_substituteChecksumCharacter = 0;
 /**
 * TTF font name: can be set before instanciation of the object
+*
 * @var string
 */
 protected static $_staticFont = null;
 /**
 * Constructor
+*
 * @param array|Zend_Config $options
-* @return void
 */
 public function __construct($options = null)
 {
 $this->_getDefaultOptions();
 if (self::$_staticFont !== null) {
 $options = $options->toArray();
 }
 if (is_array($options)) {
 $this->setOptions($options);
 }
-$this->_type = strtolower(substr(get_class($this), strlen($this->_barcodeNamespace) + 1));
+$this->_type = strtolower(
+substr(get_class($this), strlen($this->_barcodeNamespace) + 1)
+);
 if ($this->_mandatoryChecksum) {
 $this->_withChecksum = true;
 $this->_withChecksumInText = true;
 }
 }
 /**
 * Set default options for particular object
-* @return void
 */
 protected function _getDefaultOptions()
 {
 }
 /**
 * Set barcode state from options array
+*
 * @param  array $options
-* @return Zend_Barcode_Object
+* @return $this
 */
 public function setOptions($options)
 {
 foreach ($options as $key => $value) {
 $method = 'set' . $key;
 return $this;
 }
 /**
 * Set barcode state from config object
+*
 * @param Zend_Config $config
-* @return Zend_Barcode_Object
+* @return $this
 */
 public function setConfig(Zend_Config $config)
 {
 return $this->setOptions($config->toArray());
 }
 /**
 * Set barcode namespace for autoloading
 *
 * @param string $namespace
-* @return Zend_Barcode_Object
+* @return $this
 */
 public function setBarcodeNamespace($namespace)
 {
 $this->_barcodeNamespace = $namespace;
 return $this;
 return $this->_barcodeNamespace;
 }
 /**
 * Retrieve type of barcode
+*
 * @return string
 */
 public function getType()
 {
 return $this->_type;
 }
 /**
 * Set height of the barcode bar
+*
 * @param integer $value
-* @return Zend_Barcode_Object
+* @return $this
-* @throw Zend_Barcode_Object_Exception
+* @throws Zend_Barcode_Object_Exception
 */
 public function setBarHeight($value)
 {
 if (intval($value) <= 0) {
 require_once 'Zend/Barcode/Object/Exception.php';
 return $this;
 }
 /**
 * Get height of the barcode bar
+*
 * @return integer
 */
 public function getBarHeight()
 {
 return $this->_barHeight;
 }
 /**
 * Set thickness of thin bar
+*
 * @param integer $value
-* @return Zend_Barcode_Object
+* @return $this
-* @throw Zend_Barcode_Object_Exception
+* @throws Zend_Barcode_Object_Exception
 */
 public function setBarThinWidth($value)
 {
 if (intval($value) <= 0) {
 require_once 'Zend/Barcode/Object/Exception.php';
 return $this;
 }
 /**
 * Get thickness of thin bar
+*
 * @return integer
 */
 public function getBarThinWidth()
 {
 return $this->_barThinWidth;
 }
 /**
 * Set thickness of thick bar
+*
 * @param integer $value
-* @return Zend_Barcode_Object
+* @return $this
-* @throw Zend_Barcode_Object_Exception
+* @throws Zend_Barcode_Object_Exception
 */
 public function setBarThickWidth($value)
 {
 if (intval($value) <= 0) {
 require_once 'Zend/Barcode/Object/Exception.php';
 return $this;
 }
 /**
 * Get thickness of thick bar
+*
 * @return integer
 */
 public function getBarThickWidth()
 {
 return $this->_barThickWidth;
 }
 /**
 * Set factor applying to
 * thinBarWidth - thickBarWidth - barHeight - fontSize
-* @param float $value
+*
-* @return Zend_Barcode_Object
+* @param int|float|string|bool $value
-* @throw Zend_Barcode_Object_Exception
+* @return $this
+* @throws Zend_Barcode_Object_Exception
 */
 public function setFactor($value)
 {
 if (floatval($value) <= 0) {
 require_once 'Zend/Barcode/Object/Exception.php';
 }
 /**
 * Get factor applying to
 * thinBarWidth - thickBarWidth - barHeight - fontSize
+*
 * @return integer
 */
 public function getFactor()
 {
 return $this->_factor;
 }
 /**
 * Set color of the barcode and text
+*
 * @param string $value
-* @return Zend_Barcode_Object
+* @return $this
-* @throw Zend_Barcode_Object_Exception
+* @throws Zend_Barcode_Object_Exception
 */
 public function setForeColor($value)
 {
 if (preg_match('`\#[0-9A-F]{6}`', $value)) {
 $this->_foreColor = hexdec($value);
 return $this;
 }
 /**
 * Retrieve color of the barcode and text
+*
 * @return unknown
 */
 public function getForeColor()
 {
 return $this->_foreColor;
 }
 /**
 * Set the color of the background
+*
 * @param integer $value
-* @return Zend_Barcode_Object
+* @return $this
-* @throw Zend_Barcode_Object_Exception
+* @throws Zend_Barcode_Object_Exception
 */
 public function setBackgroundColor($value)
 {
 if (preg_match('`\#[0-9A-F]{6}`', $value)) {
 $this->_backgroundColor = hexdec($value);
 return $this;
 }
 /**
 * Retrieve background color of the image
+*
 * @return integer
 */
 public function getBackgroundColor()
 {
 return $this->_backgroundColor;
 }
 /**
 * Activate/deactivate drawing of the bar
+*
 * @param boolean $value
-* @return Zend_Barcode_Object
+* @return $this
 */
 public function setWithBorder($value)
 {
 $this->_withBorder = (bool) $value;
 return $this;
 }
 /**
 * Retrieve if border are draw or not
+*
 * @return boolean
 */
 public function getWithBorder()
 {
 return $this->_withBorder;
 }
 /**
 * Activate/deactivate drawing of the quiet zones
+*
 * @param boolean $value
-* @return Zend_Barcode_Object
+* @return $this
 */
 public function setWithQuietZones($value)
 {
 $this->_withQuietZones = (bool) $value;
 return $this;
 }
 /**
 * Retrieve if quiet zones are draw or not
+*
 * @return boolean
 */
 public function getWithQuietZones()
 {
 return $this->_withQuietZones;
 }
 /**
 * Allow fast inversion of font/bars color and background color
-* @return Zend_Barcode_Object
+*
+* @return $this
 */
 public function setReverseColor()
 {
 $tmp                    = $this->_foreColor;
 $this->_foreColor       = $this->_backgroundColor;
 $this->_backgroundColor = $tmp;
 return $this;
 }
 /**
 * Set orientation of barcode and text
-* @param float $value
+*
-* @return Zend_Barcode_Object
+* @param int|float|string|bool $value
-* @throw Zend_Barcode_Object_Exception
+* @return $this
+* @throws Zend_Barcode_Object_Exception
 */
 public function setOrientation($value)
 {
-$this->_orientation = floatval($value) - floor(floatval($value) / 360) * 360;
+$value              = floatval($value);
+$this->_orientation = $value - floor($value / 360) * 360;
 return $this;
 }
 /**
 * Retrieve orientation of barcode and text
+*
 * @return float
 */
 public function getOrientation()
 {
 return $this->_orientation;
 }
 /**
 * Set text to encode
+*
 * @param string $value
-* @return Zend_Barcode_Object
+* @return $this
 */
 public function setText($value)
 {
 $this->_text = trim($value);
 return $this;
 }
 /**
 * Retrieve text to encode
+*
 * @return string
 */
 public function getText()
 {
 $text = $this->_text;
 return $this->_addLeadingZeros($text);
 }
 /**
 * Automatically add leading zeros if barcode length is fixed
-* @param string $text
+*
+* @param string  $text
 * @param boolean $withoutChecksum
+* @return string
 */
 protected function _addLeadingZeros($text, $withoutChecksum = false)
 {
 if ($this->_barcodeLength && $this->_addLeadingZeros) {
 $omitChecksum = (int) ($this->_withChecksum && $withoutChecksum);
 return $text;
 }
 /**
 * Retrieve text to encode
+*
 * @return string
 */
 public function getRawText()
 {
 return $this->_text;
 }
 /**
 * Retrieve text to display
+*
 * @return string
 */
 public function getTextToDisplay()
 {
 if ($this->_withChecksumInText) {
 }
 }
 /**
 * Activate/deactivate drawing of text to encode
+*
 * @param boolean $value
-* @return Zend_Barcode_Object
+* @return $this
 */
 public function setDrawText($value)
 {
 $this->_drawText = (bool) $value;
 return $this;
 }
 /**
 * Retrieve if drawing of text to encode is enabled
+*
 * @return boolean
 */
 public function getDrawText()
 {
 return $this->_drawText;
 }
 /**
 * Activate/deactivate the adjustment of the position
 * of the characters to the position of the bars
+*
 * @param boolean $value
-* @return Zend_Barcode_Object
+* @return $this
-* @throw Zend_Barcode_Object_Exception
+* @throws Zend_Barcode_Object_Exception
 */
 public function setStretchText($value)
 {
 $this->_stretchText = (bool) $value;
 return $this;
 }
 /**
 * Retrieve if the adjustment of the position of the characters
 * to the position of the bars is enabled
+*
 * @return boolean
 */
 public function getStretchText()
 {
 return $this->_stretchText;
 /**
 * Activate/deactivate the automatic generation
 * of the checksum character
 * added to the barcode text
+*
 * @param boolean $value
-* @return Zend_Barcode_Object
+* @return $this
 */
 public function setWithChecksum($value)
 {
 if (!$this->_mandatoryChecksum) {
 $this->_withChecksum = (bool) $value;
 }
 /**
 * Retrieve if the checksum character is automatically
 * added to the barcode text
+*
 * @return boolean
 */
 public function getWithChecksum()
 {
 return $this->_withChecksum;
 /**
 * Activate/deactivate the automatic generation
 * of the checksum character
 * added to the barcode text
+*
 * @param boolean $value
-* @return Zend_Barcode_Object
+* @return $this
-* @throw Zend_Barcode_Object_Exception
+* @throws Zend_Barcode_Object_Exception
 */
 public function setWithChecksumInText($value)
 {
 if (!$this->_mandatoryChecksum) {
 $this->_withChecksumInText = (bool) $value;
 }
 return $this;
 }
 /**
 * Retrieve if the checksum character is automatically
 * added to the barcode text
+*
 * @return boolean
 */
 public function getWithChecksumInText()
 {
 return $this->_withChecksumInText;
 }
 /**
 * Set the font for all instances of barcode
+*
 * @param string $font
-* @return void
 */
 public static function setBarcodeFont($font)
 {
 if (is_string($font) || (is_int($font) && $font >= 1 && $font <= 5)) {
 self::$_staticFont = $font;
 /**
 * Set the font:
 *  - 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_Object
+* @return $this
-* @throw Zend_Barcode_Object_Exception
+* @throws Zend_Barcode_Object_Exception
 */
 public function setFont($value)
 {
 if (is_int($value) && $value >= 1 && $value <= 5) {
 if (!extension_loaded('gd')) {
 $this->_fontSize = imagefontheight($value);
 } elseif (is_string($value)) {
 $this->_font = $value;
 } else {
 require_once 'Zend/Barcode/Object/Exception.php';
-throw new Zend_Barcode_Object_Exception(sprintf(
+throw new Zend_Barcode_Object_Exception(
-'Invalid font "%s" provided to setFont()',
+sprintf(
-$value
+'Invalid font "%s" provided to setFont()',
-));
+$value
+)
+);
 }
 return $this;
 }
 /**
 * Retrieve the font
+*
 * @return integer|string
 */
 public function getFont()
 {
 return $this->_font;
 }
 /**
 * Set the size of the font in case of TTF
+*
 * @param float $value
-* @return Zend_Barcode_Object
+* @return $this
-* @throw Zend_Barcode_Object_Exception
+* @throws Zend_Barcode_Object_Exception
 */
 public function setFontSize($value)
 {
 if (is_numeric($this->_font)) {
 // Case of numeric font with GD
 return $this;
 }
 /**
 * Retrieve the size of the font in case of TTF
+*
 * @return float
 */
 public function getFontSize()
 {
 return $this->_fontSize;
 }
 /**
 * Quiet zone before first bar
 * and after the last bar
+*
 * @return integer
 */
 public function getQuietZone()
 {
 if ($this->_withQuietZones || $this->_mandatoryQuietZones) {
 }
 }
 /**
 * Add an instruction in the array of instructions
+*
 * @param array $instruction
 */
 protected function _addInstruction(array $instruction)
 {
 $this->_instructions[] = $instruction;
 }
 /**
 * Retrieve the set of drawing instructions
+*
 * @return array
 */
 public function getInstructions()
 {
 return $this->_instructions;
 }
 /**
 * Add a polygon drawing instruction in the set of instructions
-* @param array $points
+*
+* @param array   $points
 * @param integer $color
 * @param boolean $filled
 */
 protected function _addPolygon(array $points, $color = null, $filled = true)
 {
 if ($color === null) {
 $color = $this->_foreColor;
 }
-$this->_addInstruction(array(
+$this->_addInstruction(
-'type'   => 'polygon',
+array(
-'points' => $points,
+'type'   => 'polygon',
-'color'  => $color,
+'points' => $points,
-'filled' => $filled,
+'color'  => $color,
-));
+'filled' => $filled,
+)
+);
 }
 /**
 * Add a text drawing instruction in the set of instructions
-* @param string $text
+*
-* @param float $size
+* @param string    $text
-* @param array $position
+* @param float     $size
-* @param string $font
+* @param array     $position
-* @param integer $color
+* @param string    $font
-* @param string $alignment
+* @param integer   $color
-* @param float $orientation
+* @param string    $alignment
+* @param float|int $orientation
 */
 protected function _addText(
 $text,
 $size,
 $position,
 $orientation = 0
 ) {
 if ($color === null) {
 $color = $this->_foreColor;
 }
-$this->_addInstruction(array(
+$this->_addInstruction(
-'type'        => 'text',
+array(
-'text'        => $text,
+'type'        => 'text',
-'size'        => $size,
+'text'        => $text,
-'position'    => $position,
+'size'        => $size,
-'font'        => $font,
+'position'    => $position,
-'color'       => $color,
+'font'        => $font,
-'alignment'   => $alignment,
+'color'       => $color,
-'orientation' => $orientation,
+'alignment'   => $alignment,
-));
+'orientation' => $orientation,
+)
+);
 }
 /**
 * Checking of parameters after all settings
-* @return void
+*
+* @return bool
 */
 public function checkParams()
 {
 $this->_checkText();
 $this->_checkFontAndOrientation();
 return true;
 }
 /**
 * Check if a text is really provided to barcode
-* @return void
+*
-* @throw Zend_Barcode_Object_Exception
+* @param string|null $value
+* @throws Zend_Barcode_Object_Exception
 */
 protected function _checkText($value = null)
 {
 if ($value === null) {
 $value = $this->_text;
 $this->validateText($value);
 }
 /**
 * Check the ratio between the thick and the thin bar
-* @param integer $min
+*
-* @param integer $max
+* @param int $min
-* @return void
+* @param int $max
-* @throw Zend_Barcode_Object_Exception
+* @throws Zend_Barcode_Object_Exception
 */
 protected function _checkRatio($min = 2, $max = 3)
 {
 $ratio = $this->_barThickWidth / $this->_barThinWidth;
 if (!($ratio >= $min && $ratio <= $max)) {
 require_once 'Zend/Barcode/Object/Exception.php';
-throw new Zend_Barcode_Object_Exception(sprintf(
+throw new Zend_Barcode_Object_Exception(
-'Ratio thick/thin bar must be between %0.1f and %0.1f (actual %0.3f)',
+sprintf(
-$min,
+'Ratio thick/thin bar must be between %0.1f and %0.1f (actual %0.3f)',
-$max,
+$min,
-$ratio
+$max,
-));
+$ratio
+)
+);
 }
 }
 /**
 * Drawing with an angle is just allow TTF font
-* @return void
+*
-* @throw Zend_Barcode_Object_Exception
+* @throws Zend_Barcode_Object_Exception
 */
 protected function _checkFontAndOrientation()
 {
 if (is_numeric($this->_font) && $this->_orientation != 0) {
 require_once 'Zend/Barcode/Object/Exception.php';
 );
 }
 }
 /**
-* Width of the result image
+* Width of the result image (before any rotation)
-* (before any rotation)
+*
 * @return integer
 */
 protected function _calculateWidth()
 {
 return (int) $this->_withBorder
 + (int) $this->_withBorder;
 }
 /**
 * Calculate the width of the barcode
+*
 * @return integer
 */
 abstract protected function _calculateBarcodeWidth();
 /**
 * Height of the result object
-* @return integer
+*
+* @return int
 */
 protected function _calculateHeight()
 {
 return (int) $this->_withBorder * 2
 + $this->_calculateBarcodeHeight()
 + (int) $this->_withBorder * 2;
 }
 /**
 * Height of the barcode
-* @return integer
+*
+* @return int
 */
 protected function _calculateBarcodeHeight()
 {
 $textHeight = 0;
 $extraHeight = 0;
 if ($this->_drawText) {
 $textHeight += $this->_fontSize;
 $extraHeight = 2;
 }
-return ($this->_barHeight + $textHeight) * $this->_factor + $extraHeight;
+return ($this->_barHeight + $textHeight) * $this->_factor
++ $extraHeight;
 }
 /**
 * Get height of the result object
-* @return integer
+*
+* @param bool $recalculate
+* @return int
 */
 public function getHeight($recalculate = false)
 {
 if ($this->_height === null || $recalculate) {
 $this->_height =
-abs($this->_calculateHeight() * cos($this->_orientation / 180 * pi()))
+abs(
-+ abs($this->_calculateWidth() * sin($this->_orientation / 180 * pi()));
+$this->_calculateHeight() * cos(
+$this->_orientation / 180 * pi()
+)
+)
++ abs(
+$this->_calculateWidth() * sin(
+$this->_orientation / 180 * pi()
+)
+);
 }
 return $this->_height;
 }
 /**
 * Get width of the result object
-* @return integer
+*
+* @param bool $recalculate
+* @return int
 */
 public function getWidth($recalculate = false)
 {
 if ($this->_width === null || $recalculate) {
 $this->_width =
-abs($this->_calculateWidth() * cos($this->_orientation / 180 * pi()))
+abs(
-+ abs($this->_calculateHeight() * sin($this->_orientation / 180 * pi()));
+$this->_calculateWidth() * cos(
+$this->_orientation / 180 * pi()
+)
+)
++ abs(
+$this->_calculateHeight() * sin(
+$this->_orientation / 180 * pi()
+)
+);
 }
 return $this->_width;
 }
 /**
 * Calculate the offset from the left of the object
 * if an orientation is activated
-* @param boolean $recalculate
+*
+* @param bool $recalculate
 * @return float
 */
 public function getOffsetLeft($recalculate = false)
 {
 if ($this->_offsetLeft === null || $recalculate) {
 }
 /**
 * Calculate the offset from the top of the object
 * if an orientation is activated
-* @param boolean $recalculate
+*
+* @param bool $recalculate
 * @return float
 */
 public function getOffsetTop($recalculate = false)
 {
 if ($this->_offsetTop === null || $recalculate) {
 return $this->_offsetTop;
 }
 /**
 * Apply rotation on a point in X/Y dimensions
-* @param float $x1     x-position before rotation
+*
-* @param float $y1     y-position before rotation
+* @param  float $x1 x-position before rotation
-* @return array        Array of two elements corresponding to the new XY point
+* @param  float $y1 y-position before rotation
+* @return array Array of two elements corresponding to the new XY point
 */
 protected function _rotate($x1, $y1)
 {
 $x2 = $x1 * cos($this->_orientation / 180 * pi())
 - $y1 * sin($this->_orientation / 180 * pi())
 + $this->getOffsetLeft();
 $y2 = $y1 * cos($this->_orientation / 180 * pi())
 + $x1 * sin($this->_orientation / 180 * pi())
 + $this->getOffsetTop();
-return array(intval($x2) , intval($y2));
+return array(
+intval($x2),
+intval($y2)
+);
 }
 /**
 * Complete drawing of the barcode
+*
 * @return array Table of instructions
 */
 public function draw()
 {
 $this->checkParams();
 return $this->getInstructions();
 }
 /**
 * Draw the barcode
-* @return void
 */
 protected function _drawBarcode()
 {
 $barcodeTable = $this->_prepareBarcode();
 $this->_calculateWidth() - 1,
 $this->_calculateHeight() - 1
 );
 $point4 = $this->_rotate($this->_calculateWidth() - 1, 0);
-$this->_addPolygon(array(
+$this->_addPolygon(
-$point1,
+array(
-$point2,
+$point1,
-$point3,
+$point2,
-$point4
+$point3,
-), $this->_backgroundColor);
+$point4
+), $this->_backgroundColor
+);
 $xpos     += $this->getQuietZone();
 $barLength = $this->_barHeight * $this->_factor;
 foreach ($barcodeTable as $bar) {
 );
 $point4 = $this->_rotate(
 $xpos + $width - 1,
 $ypos + $bar[2] * $barLength
 );
-$this->_addPolygon(array(
+$this->_addPolygon(
-$point1,
+array(
-$point2,
+$point1,
-$point3,
+$point2,
-$point4,
+$point3,
-));
+$point4,
+)
+);
 }
 $xpos += $width;
 }
 $this->_postDrawBarcode();
 }
 /**
 * Partial function to draw border
-* @return void
 */
 protected function _drawBorder()
 {
 if ($this->_withBorder) {
 $point1 = $this->_rotate(0, 0);
 $point3 = $this->_rotate(
 $this->_calculateWidth() - 1,
 $this->_calculateHeight() - 1
 );
 $point4 = $this->_rotate(0, $this->_calculateHeight() - 1);
-$this->_addPolygon(array(
+$this->_addPolygon(
-$point1,
+array(
-$point2,
+$point1,
-$point3,
+$point2,
-$point4,
+$point3,
-$point1,
+$point4,
-), $this->_foreColor, false);
+$point1,
+), $this->_foreColor, false
+);
 }
 }
 /**
 * Partial function to draw text
-* @return void
 */
 protected function _drawText()
 {
 if ($this->_drawText) {
 $text = $this->getTextToDisplay();
 }
 }
 /**
 * Check for invalid characters
-* @param   string $value    Text to be ckecked
+*
-* @return void
+* @param string $value Text to be ckecked
 */
 public function validateText($value)
 {
 $this->_validateText($value);
 }
 /**
 * Standard validation for most of barcode objects
+*
 * @param string $value
 * @param array  $options
+* @throws Zend_Barcode_Object_Exception
 */
 protected function _validateText($value, $options = array())
 {
 $validatorName = (isset($options['validator'])) ? $options['validator'] : $this->getType();
-$validator = new Zend_Validate_Barcode(array(
+$validator = new Zend_Validate_Barcode(
-'adapter'  => $validatorName,
+array(
-'checksum' => false,
+'adapter'  => $validatorName,
-));
+'checksum' => false,
+)
+);
 $checksumCharacter = '';
 $withChecksum = false;
 if ($this->_mandatoryChecksum) {
 $checksumCharacter = $this->_substituteChecksumCharacter;
 $withChecksum = true;
 }
-$value = $this->_addLeadingZeros($value, $withChecksum) . $checksumCharacter;
+$value = $this->_addLeadingZeros($value, $withChecksum)
+. $checksumCharacter;
 if (!$validator->isValid($value)) {
 $message = implode("\n", $validator->getMessages());
 /**
 */
 abstract protected function _prepareBarcode();
 /**
 * Checking of parameters after all settings
-*
-* @return void
 */
 abstract protected function _checkParams();
 /**
 * Allow each child to draw something else
-*
-* @return void
 */
 protected function _preDrawBarcode()
 {
 }
 /**
 * Allow each child to draw something else
 * (ex: bearer bars in interleaved 2 of 5 code)
-*
-* @return void
 */
 protected function _postDrawBarcode()
 {
 }
 }

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd