Merge pull request zendframework/zendframework#3065 branch 'hotfix/re…

…turn-instead-else'
zendframework · Nov 29, 2012 · 71ba5e4 · 71ba5e4
commit 71ba5e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 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;
     }
 
     /**