Merge branch 'master' into 2574

zendframework · Jan 3, 2013 · 0e69738 · 0e69738
commit 0e69738
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Object/AbstractObject.php b/src/Object/AbstractObject.php
@@ -576,9 +576,9 @@ public function getTextToDisplay()
     {
         if ($this->withChecksumInText) {
             return $this->getText();
-        } else {
-            return $this->addLeadingZeros($this->text, true);
         }
+
+        return $this->addLeadingZeros($this->text, true);
     }
 
     /**
@@ -758,9 +758,9 @@ public function getQuietZone()
     {
         if ($this->withQuietZones || $this->mandatoryQuietZones) {
             return 10 * $this->barThinWidth * $this->factor;
-        } else {
-            return 0;
         }
+
+        return 0;
     }
 
     /**

diff --git a/src/Object/Code39.php b/src/Object/Code39.php
@@ -119,9 +119,9 @@ public function getTextToDisplay()
         $text = parent::getTextToDisplay();
         if (substr($text, 0, 1) != '*' && substr($text, -1) != '*') {
             return '*' . $text . '*';
-        } else {
-            return $text;
         }
+
+        return $text;
     }
 
     /**

diff --git a/src/Object/Ean5.php b/src/Object/Ean5.php
@@ -101,7 +101,7 @@ public function getChecksum($text)
         $this->checkText($text);
         $checksum = 0;
 
-        for ($i = 0 ; $i < $this->barcodeLength; $i ++) {
+        for ($i = 0; $i < $this->barcodeLength; $i ++) {
             $checksum += intval($text{$i}) * ($i % 2 ? 9 : 3);
         }