Code cleanup and added UnknownTypeException

Author: casperbakker

src/BarcodeGenerator.php

@@ -34,6 +34,7 @@
 use Picqer\Barcode\Exceptions\InvalidCheckDigitException;
 use Picqer\Barcode\Exceptions\InvalidFormatException;
 use Picqer\Barcode\Exceptions\InvalidLengthException;
+use Picqer\Barcode\Exceptions\UnknownTypeException;
 
 abstract class BarcodeGenerator
 {
@@ -200,12 +201,14 @@ protected function getBarcodeData($code, $type)
                 break;
             }
             default: {
-                $arrcode = false;
+                throw new UnknownTypeException();
                 break;
             }
         }
 
-        $arrcode = $this->convertBarcodeArrayToNewStyle($arrcode);
+        if ( ! isset($arrcode['maxWidth'])) {
+            $arrcode = $this->convertBarcodeArrayToNewStyle($arrcode);
+        }
 
         return $arrcode;
     }
@@ -517,8 +520,8 @@ protected function checksum_code39($code)
             '%'
         );
         $sum = 0;
-        $clen = strlen($code);
-        for ($i = 0; $i < $clen; ++$i) {
+        $codelength = strlen($code);
+        for ($i = 0; $i < $codelength; ++$i) {
             $k = array_keys($chars, $code{$i});
             $sum += $k[0];
         }
@@ -1429,7 +1432,7 @@ protected function get128ABsequence($code)
         $sequence = array();
         // get A sequences (if any)
         $numseq = array();
-        preg_match_all('/([\0-\31])/', $code, $numseq, PREG_OFFSET_CAPTURE);
+        preg_match_all('/([\x00-\x1f])/', $code, $numseq, PREG_OFFSET_CAPTURE);
         if (isset($numseq[1]) AND ! empty($numseq[1])) {
             $end_offset = 0;
             foreach ($numseq[1] as $val) {
@@ -2690,19 +2693,17 @@ protected function barcode_imb_pre($code)
      * @param $number (string) number to convert specified as a string
      * @return string hexadecimal representation
      */
-    public function dec_to_hex($number)
+    protected function dec_to_hex($number)
     {
-        $hex = array();
         if ($number == 0) {
             return '00';
         }
+
+        $hex = [];
+
         while ($number > 0) {
-            if ($number == 0) {
-                array_push($hex, '0');
-            } else {
-                array_push($hex, strtoupper(dechex(bcmod($number, '16'))));
-                $number = bcdiv($number, '16', 0);
-            }
+            array_push($hex, strtoupper(dechex(bcmod($number, '16'))));
+            $number = bcdiv($number, '16', 0);
         }
         $hex = array_reverse($hex);
 
@@ -2716,7 +2717,7 @@ public function dec_to_hex($number)
      * @param $hex (string) hexadecimal number to convert specified as a string
      * @return string hexadecimal representation
      */
-    public function hex_to_dec($hex)
+    protected function hex_to_dec($hex)
     {
         $dec = 0;
         $bitval = 1;

src/BarcodeGeneratorHTML.php

@@ -12,13 +12,12 @@ class BarcodeGeneratorHTML extends BarcodeGenerator
      * @param string $type type of barcode
      * @param int $widthFactor Width of a single bar element in pixels.
      * @param int $totalHeight Height of a single bar element in pixels.
-     * @param int $color Foreground color for bar elements (background is transparent).
+     * @param int|string $color Foreground color for bar elements (background is transparent).
      * @return string HTML code.
      * @public
      */
     public function getBarcode($code, $type, $widthFactor = 2, $totalHeight = 30, $color = 'black')
     {
-
         $barcodeData = $this->getBarcodeData($code, $type);
 
         $html = '<div style="font-size:0;position:relative;width:' . ($barcodeData['maxWidth'] * $widthFactor) . 'px;height:' . ($totalHeight) . 'px;">' . "\n";

src/BarcodeGeneratorJPG.php

@@ -37,7 +37,7 @@ public function getBarcode($code, $type, $widthFactor = 2, $totalHeight = 30, $c
             $jpg = new \Imagick();
             $jpg->newImage($width, $height, 'none', 'jpg');
             $imageMagickObject = new \imagickdraw();
-            $imageMagickObject->setfillcolor($colorForeground);
+            $imageMagickObject->setFillColor($colorForeground);
         } else {
             return false;
         }
@@ -50,7 +50,7 @@ public function getBarcode($code, $type, $widthFactor = 2, $totalHeight = 30, $c
             if ($bar['drawBar']) {
                 $y = round(($bar['positionVertical'] * $totalHeight / $barcodeData['maxHeight']), 3);
                 // draw a vertical bar
-                if ($imagick) {
+                if ($imagick && isset($imageMagickObject)) {
                     $imageMagickObject->rectangle($positionHorizontal, $y, ($positionHorizontal + $bw), ($y + $bh));
                 } else {
                     imagefilledrectangle($jpg, $positionHorizontal, $y, ($positionHorizontal + $bw) - 1, ($y + $bh),
@@ -60,8 +60,8 @@ public function getBarcode($code, $type, $widthFactor = 2, $totalHeight = 30, $c
             $positionHorizontal += $bw;
         }
         ob_start();
-        if ($imagick) {
-            $jpg->drawimage($imageMagickObject);
+        if ($imagick && isset($imageMagickObject)) {
+            $jpg->drawImage($imageMagickObject);
             echo $jpg;
         } else {
             imagejpeg($jpg);

src/BarcodeGeneratorPNG.php

@@ -37,7 +37,7 @@ public function getBarcode($code, $type, $widthFactor = 2, $totalHeight = 30, $c
             $png = new \Imagick();
             $png->newImage($width, $height, 'none', 'png');
             $imageMagickObject = new \imagickdraw();
-            $imageMagickObject->setfillcolor($colorForeground);
+            $imageMagickObject->setFillColor($colorForeground);
         } else {
             return false;
         }
@@ -50,7 +50,7 @@ public function getBarcode($code, $type, $widthFactor = 2, $totalHeight = 30, $c
             if ($bar['drawBar']) {
                 $y = round(($bar['positionVertical'] * $totalHeight / $barcodeData['maxHeight']), 3);
                 // draw a vertical bar
-                if ($imagick) {
+                if ($imagick && isset($imageMagickObject)) {
                     $imageMagickObject->rectangle($positionHorizontal, $y, ($positionHorizontal + $bw), ($y + $bh));
                 } else {
                     imagefilledrectangle($png, $positionHorizontal, $y, ($positionHorizontal + $bw) - 1, ($y + $bh),
@@ -60,8 +60,8 @@ public function getBarcode($code, $type, $widthFactor = 2, $totalHeight = 30, $c
             $positionHorizontal += $bw;
         }
         ob_start();
-        if ($imagick) {
-            $png->drawimage($imageMagickObject);
+        if ($imagick && isset($imageMagickObject)) {
+            $png->drawImage($imageMagickObject);
             echo $png;
         } else {
             imagepng($png);

src/Exceptions/UnknownTypeException.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Picqer\Barcode\Exceptions;
+
+class UnknownTypeException extends BarcodeException {}

tests/BarcodeTest.php

@@ -87,7 +87,6 @@ public function ean13_generator_accepting_11_chars_and_generates_13th_check_digi
         $this->assertStringEqualsFile('tests/verified-files/0049000004632-ean13.svg', $generated);
     }
 
-
     /**
      * @test
      * @expectedException \Picqer\Barcode\Exceptions\InvalidCheckDigitException
@@ -97,4 +96,14 @@ public function ean13_generator_throws_exception_when_wrong_check_digit_is_given
         $generator = new Picqer\Barcode\BarcodeGeneratorSVG();
         $generator->getBarcode('0049000004633', $generator::TYPE_EAN_13);
     }
+
+    /**
+     * @test
+     * @expectedException \Picqer\Barcode\Exceptions\UnknownTypeException
+     */
+    public function generator_throws_unknown_type_exceptions()
+    {
+        $generator = new Picqer\Barcode\BarcodeGeneratorSVG();
+        $generator->getBarcode('0049000004633', 'vladimir');
+    }
 }