Merge branch 'master' of https://github.com/zendframework/zf2

zendframework · May 17, 2014 · 394fee8 · 394fee8
commit 394fee8
Show file tree

Hide file tree

Showing 45 changed files with 346 additions and 110 deletions.
diff --git a/composer.json b/composer.json
@@ -13,26 +13,27 @@
         }
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.3.23",
         "zendframework/zend-stdlib": "self.version",
         "zendframework/zend-validator": "self.version"
     },
     "require-dev": {
         "zendframework/zend-servicemanager": "self.version",
         "zendframework/zendpdf": "*",
+        "zendframework/zend-validator": "self.version",
         "fabpot/php-cs-fixer": "1.7.*",
         "satooshi/php-coveralls": "dev-master",
         "phpunit/PHPUnit": "~4.0"
     },
     "suggest": {
-        "zendframework/zend-servicemanager": "Zend\\ServiceManager component, required when using the factory methods of Zend\\Barcode.",
+        "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
         "zendframework/zendpdf": "ZendPdf component",
         "zendframework/zend-validator": "Zend\\Validator component"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2-dev",
-            "dev-develop": "2.3-dev"
+            "dev-master": "2.3-dev",
+            "dev-develop": "2.4-dev"
         }
     },
     "autoload-dev": {

diff --git a/src/Barcode.php b/src/Barcode.php
@@ -182,7 +182,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array())
         }
 
         /*
-         * Verify that an barcode name has been specified.
+         * Verify that a barcode name has been specified.
          */
         if (!is_string($barcode) || empty($barcode)) {
             throw new Exception\InvalidArgumentException(
@@ -234,7 +234,7 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array
         }
 
         /*
-         * Verify that an barcode name has been specified.
+         * Verify that a barcode name has been specified.
          */
         if (!is_string($renderer) || empty($renderer)) {
             throw new Exception\RendererCreationException(

diff --git a/src/Object/AbstractObject.php b/src/Object/AbstractObject.php
@@ -800,7 +800,7 @@ protected function addPolygon(array $points, $color = null, $filled = true)
      * Add a text drawing instruction in the set of instructions
      * @param string $text
      * @param float $size
-     * @param array $position
+     * @param int[] $position
      * @param string $font
      * @param int $color
      * @param string $alignment
@@ -844,6 +844,7 @@ public function checkParams()
 
     /**
      * Check if a text is really provided to barcode
+     * @param string|null $value
      * @return void
      * @throws \Zend\Barcode\Object\Exception\ExceptionInterface
      */
@@ -1026,7 +1027,7 @@ public function getOffsetTop($recalculate = false)
      * Apply rotation on a point in X/Y dimensions
      * @param float $x1     x-position before rotation
      * @param float $y1     y-position before rotation
-     * @return array        Array of two elements corresponding to the new XY point
+     * @return int[]    Array of two elements corresponding to the new XY point
      */
     protected function rotate($x1, $y1)
     {

diff --git a/src/Object/Codabar.php b/src/Object/Codabar.php
@@ -62,6 +62,7 @@ protected function checkSpecificParams()
     protected function prepareBarcode()
     {
         $text = str_split($this->getText());
+        $barcodeTable = array();
         foreach ($text as $char) {
             $barcodeChar = str_split($this->codingMap[$char]);
             foreach ($barcodeChar as $c) {

diff --git a/src/Object/Code128.php b/src/Object/Code128.php
@@ -208,9 +208,9 @@ protected function convertToBarcodeChars($string)
         $currentCharset = null;
         $result = array();
 
-        for ($pos = 0; $pos < strlen($string); $pos++) {
+        $strlen = strlen($string);
+        for ($pos = 0; $pos < $strlen; $pos++) {
             $char = $string[$pos];
-            $code = null;
 
             if (static::_isDigit($string, $pos, 4) && $currentCharset != 'C'
              || static::_isDigit($string, $pos, 2) && $currentCharset == 'C') {
@@ -247,7 +247,7 @@ protected function convertToBarcodeChars($string)
                 if ($pos == 0) {
                     $code = array_search("START A", $this->charSets['A']);
                 } else {
-                    $code =array_search("Code A", $this->charSets[$currentCharset]);
+                    $code = array_search("Code A", $this->charSets[$currentCharset]);
                 }
                 $result[] = $code;
                 $currentCharset = 'A';

diff --git a/src/Object/Code25interleaved.php b/src/Object/Code25interleaved.php
@@ -73,6 +73,8 @@ protected function prepareBarcode()
             $this->withBorder = false;
         }
 
+        $barcodeTable = array();
+
         // Start character (0000)
         $barcodeTable[] = array(1, $this->barThinWidth, 0, 1);
         $barcodeTable[] = array(0, $this->barThinWidth, 0, 1);

diff --git a/src/Object/Ean5.php b/src/Object/Ean5.php
@@ -104,6 +104,10 @@ public function getChecksum($text)
         return ($checksum % 10);
     }
 
+    /**
+     * @param int $i
+     * @return string
+     */
     protected function getParity($i)
     {
         $checksum = $this->getChecksum($this->getText());

diff --git a/src/Object/Identcode.php b/src/Object/Identcode.php
@@ -40,7 +40,7 @@ public function getTextToDisplay()
      * Check allowed characters
      * @param  string $value
      * @return string
-     * @throws  Exception
+     * @throws Exception\BarcodeValidationException
      */
     public function validateText($value)
     {

diff --git a/src/Renderer/AbstractRenderer.php b/src/Renderer/AbstractRenderer.php
@@ -79,6 +79,12 @@ abstract class AbstractRenderer implements RendererInterface
      */
     protected $resource;
 
+    /**
+     * Show a transparent background
+     * @var Boolean
+     */
+    protected $transparentBackground = false;
+
     /**
      * Constructor
      * @param array|Traversable $options
@@ -135,6 +141,28 @@ public function getRendererNamespace()
         return $this->rendererNamespace;
     }
 
+    /**
+     * Set whether background should be transparent
+     * Will work for SVG and Image (png and gif only)
+     *
+     * @param $bool
+     * @return $this
+     */
+    public function setTransparentBackground($bool)
+    {
+        $this->transparentBackground = $bool;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getTransparentBackground()
+    {
+        return $this->transparentBackground;
+    }
+
     /**
      * Retrieve renderer type
      * @return string

diff --git a/src/Renderer/Image.php b/src/Renderer/Image.php
@@ -22,8 +22,8 @@ class Image extends AbstractRenderer
      * @var array
      */
     protected $allowedImageType = array('png',
-                                        'jpeg',
-                                        'gif'  );
+        'jpeg',
+        'gif'  );
 
     /**
      * Image format
@@ -194,22 +194,7 @@ protected function initRenderer()
         $barcodeWidth  = $this->barcode->getWidth(true);
         $barcodeHeight = $this->barcode->getHeight(true);
 
-        if ($this->resource !== null) {
-            $foreColor       = $this->barcode->getForeColor();
-            $backgroundColor = $this->barcode->getBackgroundColor();
-            $this->imageBackgroundColor = imagecolorallocate(
-                $this->resource,
-                ($backgroundColor & 0xFF0000) >> 16,
-                ($backgroundColor & 0x00FF00) >> 8,
-                $backgroundColor & 0x0000FF
-            );
-            $this->imageForeColor = imagecolorallocate(
-                $this->resource,
-                ($foreColor & 0xFF0000) >> 16,
-                ($foreColor & 0x00FF00) >> 8,
-                $foreColor & 0x0000FF
-            );
-        } else {
+        if (null === $this->resource) {
             $width = $barcodeWidth;
             $height = $barcodeHeight;
             if ($this->userWidth && $this->barcode->getType() != 'error') {
@@ -219,32 +204,44 @@ protected function initRenderer()
                 $height = $this->userHeight;
             }
 
-            $foreColor       = $this->barcode->getForeColor();
-            $backgroundColor = $this->barcode->getBackgroundColor();
             $this->resource = imagecreatetruecolor($width, $height);
 
-            $this->imageBackgroundColor = imagecolorallocate(
-                $this->resource,
-                ($backgroundColor & 0xFF0000) >> 16,
-                ($backgroundColor & 0x00FF00) >> 8,
-                $backgroundColor & 0x0000FF
-            );
-            $this->imageForeColor = imagecolorallocate(
-                $this->resource,
-                ($foreColor & 0xFF0000) >> 16,
-                ($foreColor & 0x00FF00) >> 8,
-                $foreColor & 0x0000FF
-            );
             $white = imagecolorallocate($this->resource, 255, 255, 255);
             imagefilledrectangle($this->resource, 0, 0, $width - 1, $height - 1, $white);
         }
+
+        $foreColor = $this->barcode->getForeColor();
+        $this->imageForeColor = imagecolorallocate(
+            $this->resource,
+            ($foreColor & 0xFF0000) >> 16,
+            ($foreColor & 0x00FF00) >> 8,
+            $foreColor & 0x0000FF
+        );
+
+        $backgroundColor = $this->barcode->getBackgroundColor();
+        $this->imageBackgroundColor = imagecolorallocate(
+            $this->resource,
+            ($backgroundColor & 0xFF0000) >> 16,
+            ($backgroundColor & 0x00FF00) >> 8,
+            $backgroundColor & 0x0000FF
+        );
+
+        // JPEG does not support transparency, if transparentBackground is true and
+        // image type is JPEG, ignore transparency
+        if($this->getImageType() != "jpeg" && $this->transparentBackground) {
+            imagecolortransparent($this->resource, $this->imageBackgroundColor);
+        }
+
         $this->adjustPosition(imagesy($this->resource), imagesx($this->resource));
-        imagefilledrectangle($this->resource,
-                             $this->leftOffset,
-                             $this->topOffset,
-                             $this->leftOffset + $barcodeWidth - 1,
-                             $this->topOffset + $barcodeHeight - 1,
-                             $this->imageBackgroundColor);
+
+        imagefilledrectangle(
+            $this->resource,
+            $this->leftOffset,
+            $this->topOffset,
+            $this->leftOffset + $barcodeWidth - 1,
+            $this->topOffset + $barcodeHeight - 1,
+            $this->imageBackgroundColor
+        );
     }
 
     /**
@@ -330,18 +327,18 @@ public function render()
     protected function drawPolygon($points, $color, $filled = true)
     {
         $newPoints = array($points[0][0] + $this->leftOffset,
-                           $points[0][1] + $this->topOffset,
-                           $points[1][0] + $this->leftOffset,
-                           $points[1][1] + $this->topOffset,
-                           $points[2][0] + $this->leftOffset,
-                           $points[2][1] + $this->topOffset,
-                           $points[3][0] + $this->leftOffset,
-                           $points[3][1] + $this->topOffset,   );
+            $points[0][1] + $this->topOffset,
+            $points[1][0] + $this->leftOffset,
+            $points[1][1] + $this->topOffset,
+            $points[2][0] + $this->leftOffset,
+            $points[2][1] + $this->topOffset,
+            $points[3][0] + $this->leftOffset,
+            $points[3][1] + $this->topOffset,   );
 
         $allocatedColor = imagecolorallocate($this->resource,
-                                             ($color & 0xFF0000) >> 16,
-                                             ($color & 0x00FF00) >> 8,
-                                              $color & 0x0000FF         );
+            ($color & 0xFF0000) >> 16,
+            ($color & 0x00FF00) >> 8,
+            $color & 0x0000FF         );
 
         if ($filled) {
             imagefilledpolygon($this->resource, $newPoints, 4, $allocatedColor);
@@ -365,9 +362,9 @@ protected function drawPolygon($points, $color, $filled = true)
     protected function drawText($text, $size, $position, $font, $color, $alignment = 'center', $orientation = 0)
     {
         $allocatedColor = imagecolorallocate($this->resource,
-                                             ($color & 0xFF0000) >> 16,
-                                             ($color & 0x00FF00) >> 8,
-                                              $color & 0x0000FF         );
+            ($color & 0xFF0000) >> 16,
+            ($color & 0x00FF00) >> 8,
+            $color & 0x0000FF         );
 
         if ($font == null) {
             $font = 3;
@@ -422,13 +419,13 @@ protected function drawText($text, $size, $position, $font, $color, $alignment =
                     break;
             }
             imagettftext($this->resource,
-                         $size,
-                         $orientation,
-                         $position[0] - ($width * cos(pi() * $orientation / 180)),
-                         $position[1] + ($width * sin(pi() * $orientation / 180)),
-                         $allocatedColor,
-                         $font,
-                         $text);
+                $size,
+                $orientation,
+                $position[0] - ($width * cos(pi() * $orientation / 180)),
+                $position[1] + ($width * sin(pi() * $orientation / 180)),
+                $allocatedColor,
+                $font,
+                $text);
         }
     }
 }
diff --git a/src/Renderer/Pdf.php b/src/Renderer/Pdf.php
@@ -104,6 +104,8 @@ protected function initRenderer()
     protected function drawPolygon($points, $color, $filled = true)
     {
         $page = $this->resource->pages[$this->page];
+        $x = array();
+        $y = array();
         foreach ($points as $point) {
             $x[] = $point[0] * $this->moduleSize + $this->leftOffset;
             $y[] = $page->getHeight() - $point[1] * $this->moduleSize - $this->topOffset;

diff --git a/src/Renderer/RendererInterface.php b/src/Renderer/RendererInterface.php
@@ -79,6 +79,7 @@ public function getLeftOffset();
     /**
      * Activate/Deactivate the automatic rendering of exception
      * @param  bool $value
+     * @return self
      */
     public function setAutomaticRenderError($value);