From f0a453d72262cbe586b117ea17b8377eff10d55f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sun, 28 Apr 2013 23:48:13 +0200 Subject: [PATCH 1/3] Remove comma before value in array initialization --- library/Zend/Barcode/Object/Codabar.php | 4 +-- library/Zend/Barcode/Object/Code25.php | 26 ++++++++-------- .../Zend/Barcode/Object/Code25interleaved.php | 8 ++--- library/Zend/Barcode/Object/Code39.php | 2 +- library/Zend/Barcode/Object/Ean13.php | 26 ++++++++-------- library/Zend/Barcode/Object/Ean5.php | 16 +++++----- library/Zend/Barcode/Object/Ean8.php | 26 ++++++++-------- library/Zend/Barcode/Object/Postnet.php | 10 +++---- library/Zend/Barcode/Object/Royalmail.php | 10 +++---- library/Zend/Barcode/Object/Upca.php | 30 +++++++++---------- library/Zend/Barcode/Object/Upce.php | 20 ++++++------- 11 files changed, 89 insertions(+), 89 deletions(-) diff --git a/library/Zend/Barcode/Object/Codabar.php b/library/Zend/Barcode/Object/Codabar.php index f7cc159ff42..368ec8bea80 100644 --- a/library/Zend/Barcode/Object/Codabar.php +++ b/library/Zend/Barcode/Object/Codabar.php @@ -66,9 +66,9 @@ protected function prepareBarcode() $barcodeChar = str_split($this->codingMap[$char]); foreach ($barcodeChar as $c) { // visible, width, top, length - $barcodeTable[] = array($c , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array($c, $this->barThinWidth, 0, 1); } - $barcodeTable[] = array(0 , $this->barThinWidth); + $barcodeTable[] = array(0, $this->barThinWidth); } return $barcodeTable; } diff --git a/library/Zend/Barcode/Object/Code25.php b/library/Zend/Barcode/Object/Code25.php index 2e4f0e8f665..33a7b967414 100644 --- a/library/Zend/Barcode/Object/Code25.php +++ b/library/Zend/Barcode/Object/Code25.php @@ -66,12 +66,12 @@ protected function prepareBarcode() $barcodeTable = array(); // Start character (30301) - $barcodeTable[] = array(1 , $this->barThickWidth , 0 , 1); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1); - $barcodeTable[] = array(1 , $this->barThickWidth , 0 , 1); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1); - $barcodeTable[] = array(0 , $this->barThinWidth); + $barcodeTable[] = array(1, $this->barThickWidth, 0, 1); + $barcodeTable[] = array(0, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(1, $this->barThickWidth, 0, 1); + $barcodeTable[] = array(0, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(1, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(0, $this->barThinWidth); $text = str_split($this->getText()); foreach ($text as $char) { @@ -79,17 +79,17 @@ protected function prepareBarcode() foreach ($barcodeChar as $c) { /* visible, width, top, length */ $width = $c ? $this->barThickWidth : $this->barThinWidth; - $barcodeTable[] = array(1 , $width , 0 , 1); - $barcodeTable[] = array(0 , $this->barThinWidth); + $barcodeTable[] = array(1, $width, 0, 1); + $barcodeTable[] = array(0, $this->barThinWidth); } } // Stop character (30103) - $barcodeTable[] = array(1 , $this->barThickWidth , 0 , 1); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1); - $barcodeTable[] = array(1 , $this->barThickWidth , 0 , 1); + $barcodeTable[] = array(1, $this->barThickWidth, 0, 1); + $barcodeTable[] = array(0, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(1, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(0, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(1, $this->barThickWidth, 0, 1); return $barcodeTable; } diff --git a/library/Zend/Barcode/Object/Code25interleaved.php b/library/Zend/Barcode/Object/Code25interleaved.php index 6f79f8e1fd4..30c869076c2 100644 --- a/library/Zend/Barcode/Object/Code25interleaved.php +++ b/library/Zend/Barcode/Object/Code25interleaved.php @@ -98,14 +98,14 @@ protected function prepareBarcode() $barWidth = (substr($this->codingMap[$char2], $ibar, 1)) ? $this->barThickWidth : $this->barThinWidth; - $barcodeTable[] = array(0, $barWidth, 0 , 1); + $barcodeTable[] = array(0, $barWidth, 0, 1); } } // Stop character (100) - $barcodeTable[] = array(1 , $this->barThickWidth, 0, 1); - $barcodeTable[] = array(0 , $this->barThinWidth, 0, 1); - $barcodeTable[] = array(1 , $this->barThinWidth, 0, 1); + $barcodeTable[] = array(1, $this->barThickWidth, 0, 1); + $barcodeTable[] = array(0, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(1, $this->barThinWidth, 0, 1); return $barcodeTable; } diff --git a/library/Zend/Barcode/Object/Code39.php b/library/Zend/Barcode/Object/Code39.php index 89d3bc15795..e626c9f5af3 100644 --- a/library/Zend/Barcode/Object/Code39.php +++ b/library/Zend/Barcode/Object/Code39.php @@ -137,7 +137,7 @@ protected function prepareBarcode() $barcodeTable[] = array((int) $visible, $width, 0, 1); $visible = ! $visible; } - $barcodeTable[] = array(0 , $this->barThinWidth); + $barcodeTable[] = array(0, $this->barThinWidth); } return $barcodeTable; } diff --git a/library/Zend/Barcode/Object/Ean13.php b/library/Zend/Barcode/Object/Ean13.php index 7d9d8997d82..cbcaea4ee9c 100644 --- a/library/Zend/Barcode/Object/Ean13.php +++ b/library/Zend/Barcode/Object/Ean13.php @@ -90,9 +90,9 @@ protected function prepareBarcode() $height = ($this->drawText) ? 1.1 : 1; // Start character (101) - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); $textTable = str_split($this->getText()); $parity = $this->parities[$textTable[0]]; @@ -101,29 +101,29 @@ protected function prepareBarcode() for ($i = 1; $i < 7; $i++) { $bars = str_split($this->codingMap[$parity[$i - 1]][$textTable[$i]]); foreach ($bars as $b) { - $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array($b, $this->barThinWidth, 0, 1); } } // Middle character (01010) - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); // Second part for ($i = 7; $i < 13; $i++) { $bars = str_split($this->codingMap['C'][$textTable[$i]]); foreach ($bars as $b) { - $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array($b, $this->barThinWidth, 0, 1); } } // Stop character (101) - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); return $barcodeTable; } diff --git a/library/Zend/Barcode/Object/Ean5.php b/library/Zend/Barcode/Object/Ean5.php index 84396f29092..8911020155f 100644 --- a/library/Zend/Barcode/Object/Ean5.php +++ b/library/Zend/Barcode/Object/Ean5.php @@ -59,11 +59,11 @@ protected function prepareBarcode() $barcodeTable = array(); // Start character (01011) - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array(0, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(1, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(0, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(1, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(1, $this->barThinWidth, 0, 1); $firstCharacter = true; $textTable = str_split($this->getText()); @@ -74,12 +74,12 @@ protected function prepareBarcode() $firstCharacter = false; } else { // Intermediate character (01) - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array(0, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(1, $this->barThinWidth, 0, 1); } $bars = str_split($this->codingMap[$this->getParity($i)][$textTable[$i]]); foreach ($bars as $b) { - $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array($b, $this->barThinWidth, 0, 1); } } diff --git a/library/Zend/Barcode/Object/Ean8.php b/library/Zend/Barcode/Object/Ean8.php index 0e89abf9db9..a4dd39454ac 100644 --- a/library/Zend/Barcode/Object/Ean8.php +++ b/library/Zend/Barcode/Object/Ean8.php @@ -51,9 +51,9 @@ protected function prepareBarcode() $height = ($this->drawText) ? 1.1 : 1; // Start character (101) - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); $textTable = str_split($this->getText()); @@ -61,29 +61,29 @@ protected function prepareBarcode() for ($i = 0; $i < 4; $i++) { $bars = str_split($this->codingMap['A'][$textTable[$i]]); foreach ($bars as $b) { - $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array($b, $this->barThinWidth, 0, 1); } } // Middle character (01010) - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); // Second part for ($i = 4; $i < 8; $i++) { $bars = str_split($this->codingMap['C'][$textTable[$i]]); foreach ($bars as $b) { - $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array($b, $this->barThinWidth, 0, 1); } } // Stop character (101) - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); return $barcodeTable; } diff --git a/library/Zend/Barcode/Object/Postnet.php b/library/Zend/Barcode/Object/Postnet.php index a9d02ea5124..b44a11d663d 100644 --- a/library/Zend/Barcode/Object/Postnet.php +++ b/library/Zend/Barcode/Object/Postnet.php @@ -76,21 +76,21 @@ protected function prepareBarcode() $barcodeTable = array(); // Start character (1) - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array(1, $this->barThinWidth, 0, 1); + $barcodeTable[] = array(0, $this->barThinWidth, 0, 1); // Text to encode $textTable = str_split($this->getText()); foreach ($textTable as $char) { $bars = str_split($this->codingMap[$char]); foreach ($bars as $b) { - $barcodeTable[] = array(1 , $this->barThinWidth , 0.5 - $b * 0.5 , 1); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array(1, $this->barThinWidth, 0.5 - $b * 0.5, 1); + $barcodeTable[] = array(0, $this->barThinWidth, 0, 1); } } // Stop character (1) - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array(1, $this->barThinWidth, 0, 1); return $barcodeTable; } diff --git a/library/Zend/Barcode/Object/Royalmail.php b/library/Zend/Barcode/Object/Royalmail.php index 47a3861f69b..5d96f4734cf 100644 --- a/library/Zend/Barcode/Object/Royalmail.php +++ b/library/Zend/Barcode/Object/Royalmail.php @@ -92,21 +92,21 @@ protected function prepareBarcode() $barcodeTable = array(); // Start character (1) - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 5/8); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array(1, $this->barThinWidth, 0, 5/8); + $barcodeTable[] = array(0, $this->barThinWidth, 0, 1); // Text to encode $textTable = str_split($this->getText()); foreach ($textTable as $char) { $bars = str_split($this->codingMap[$char]); foreach ($bars as $b) { - $barcodeTable[] = array(1 , $this->barThinWidth , ($b > 1 ? 3/8 : 0) , ($b % 2 ? 5/8 : 1)); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array(1, $this->barThinWidth, ($b > 1 ? 3/8 : 0), ($b % 2 ? 5/8 : 1)); + $barcodeTable[] = array(0, $this->barThinWidth, 0, 1); } } // Stop character (1) - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array(1, $this->barThinWidth, 0, 1); return $barcodeTable; } diff --git a/library/Zend/Barcode/Object/Upca.php b/library/Zend/Barcode/Object/Upca.php index 7940dc62af4..2f74d16851e 100644 --- a/library/Zend/Barcode/Object/Upca.php +++ b/library/Zend/Barcode/Object/Upca.php @@ -50,51 +50,51 @@ protected function prepareBarcode() $height = ($this->drawText) ? 1.1 : 1; // Start character (101) - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); $textTable = str_split($this->getText()); // First character $bars = str_split($this->codingMap['A'][$textTable[0]]); foreach ($bars as $b) { - $barcodeTable[] = array($b , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array($b, $this->barThinWidth, 0, $height); } // First part for ($i = 1; $i < 6; $i++) { $bars = str_split($this->codingMap['A'][$textTable[$i]]); foreach ($bars as $b) { - $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array($b, $this->barThinWidth, 0, 1); } } // Middle character (01010) - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); // Second part for ($i = 6; $i < 11; $i++) { $bars = str_split($this->codingMap['C'][$textTable[$i]]); foreach ($bars as $b) { - $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array($b, $this->barThinWidth, 0, 1); } } // Last character $bars = str_split($this->codingMap['C'][$textTable[11]]); foreach ($bars as $b) { - $barcodeTable[] = array($b , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array($b, $this->barThinWidth, 0, $height); } // Stop character (101) - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); return $barcodeTable; } diff --git a/library/Zend/Barcode/Object/Upce.php b/library/Zend/Barcode/Object/Upce.php index 3648b232010..99b18dccc90 100644 --- a/library/Zend/Barcode/Object/Upce.php +++ b/library/Zend/Barcode/Object/Upce.php @@ -89,9 +89,9 @@ protected function prepareBarcode() $height = ($this->drawText) ? 1.1 : 1; // Start character (101) - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); $textTable = str_split($this->getText()); $system = 0; @@ -104,17 +104,17 @@ protected function prepareBarcode() for ($i = 1; $i < 7; $i++) { $bars = str_split($this->codingMap[$parity[$i - 1]][$textTable[$i]]); foreach ($bars as $b) { - $barcodeTable[] = array($b , $this->barThinWidth , 0 , 1); + $barcodeTable[] = array($b, $this->barThinWidth, 0, 1); } } // Stop character (10101) - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(0 , $this->barThinWidth , 0 , $height); - $barcodeTable[] = array(1 , $this->barThinWidth , 0 , $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(0, $this->barThinWidth, 0, $height); + $barcodeTable[] = array(1, $this->barThinWidth, 0, $height); return $barcodeTable; } From 1942f86df0074dfd78bc3b5240bc4d81752d3f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 29 Apr 2013 18:40:24 +0200 Subject: [PATCH 2/3] Trigger build From 8d86615ef8820458d687630ec0c7698f2c40d81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 29 Apr 2013 18:43:14 +0200 Subject: [PATCH 3/3] Remove more spaces before comma in array initializations --- library/Zend/Barcode/Object/AbstractObject.php | 2 +- library/Zend/Barcode/Object/Error.php | 4 ++-- library/Zend/Barcode/Renderer/AbstractRenderer.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library/Zend/Barcode/Object/AbstractObject.php b/library/Zend/Barcode/Object/AbstractObject.php index ffc4774f7fc..73b0c4813c8 100644 --- a/library/Zend/Barcode/Object/AbstractObject.php +++ b/library/Zend/Barcode/Object/AbstractObject.php @@ -1036,7 +1036,7 @@ protected function rotate($x1, $y1) $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)); } /** diff --git a/library/Zend/Barcode/Object/Error.php b/library/Zend/Barcode/Object/Error.php index 3c81f1660c4..a1197fc3ff0 100644 --- a/library/Zend/Barcode/Object/Error.php +++ b/library/Zend/Barcode/Object/Error.php @@ -52,8 +52,8 @@ public function getWidth($recalculate = false) public function draw() { $this->instructions = array(); - $this->addText('ERROR:', 10, array(5 , 18), $this->font, 0, 'left'); - $this->addText($this->text, 10, array(5 , 32), $this->font, 0, 'left'); + $this->addText('ERROR:', 10, array(5, 18), $this->font, 0, 'left'); + $this->addText($this->text, 10, array(5, 32), $this->font, 0, 'left'); return $this->instructions; } diff --git a/library/Zend/Barcode/Renderer/AbstractRenderer.php b/library/Zend/Barcode/Renderer/AbstractRenderer.php index f27d7d1c489..e9b6799a454 100644 --- a/library/Zend/Barcode/Renderer/AbstractRenderer.php +++ b/library/Zend/Barcode/Renderer/AbstractRenderer.php @@ -215,7 +215,7 @@ public function setAutomaticRenderError($value) */ public function setHorizontalPosition($value) { - if (!in_array($value, array('left' , 'center' , 'right'))) { + if (!in_array($value, array('left', 'center', 'right'))) { throw new Exception\UnexpectedValueException( "Invalid barcode position provided must be 'left', 'center' or 'right'" ); @@ -241,7 +241,7 @@ public function getHorizontalPosition() */ public function setVerticalPosition($value) { - if (!in_array($value, array('top' , 'middle' , 'bottom'))) { + if (!in_array($value, array('top', 'middle', 'bottom'))) { throw new Exception\UnexpectedValueException( "Invalid barcode position provided must be 'top', 'middle' or 'bottom'" );