jack-worman · jack-worman · Mar 19, 2026 · Mar 19, 2026 · Mar 19, 2026
diff --git a/packages/zend-acl/library/Zend/Acl.php b/packages/zend-acl/library/Zend/Acl.php
@@ -1080,9 +1080,9 @@ protected function _getRuleType(?Zend_Acl_Resource_Interface $resource = null, ?
             return null;
         } elseif (self::TYPE_ALLOW === $rule['type']) {
             return self::TYPE_DENY;
-        } else {
-            return self::TYPE_ALLOW;
         }
+
+        return self::TYPE_ALLOW;
     }
 
     /**

diff --git a/packages/zend-cache/library/Zend/Cache/Backend/File.php b/packages/zend-cache/library/Zend/Cache/Backend/File.php
@@ -499,15 +499,14 @@ protected function _getMetadatas($id)
     {
         if (isset($this->_metadatasArray[$id])) {
             return $this->_metadatasArray[$id];
-        } else {
-            $metadatas = $this->_loadMetadatas($id);
-            if (!$metadatas) {
-                return false;
-            }
-            $this->_setMetadatas($id, $metadatas, false);
-
-            return $metadatas;
         }
+        $metadatas = $this->_loadMetadatas($id);
+        if (!$metadatas) {
+            return false;
+        }
+        $this->_setMetadatas($id, $metadatas, false);
+
+        return $metadatas;
     }
 
     /**
@@ -628,9 +627,9 @@ protected function _isMetadatasFile($fileName)
         $id = $this->_fileNameToId($fileName);
         if ('internal-metadatas---' == substr((string) $id, 0, 21)) {
             return true;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
@@ -957,9 +956,9 @@ protected function _path($id, $parts = false)
         }
         if ($parts) {
             return $partsArray;
-        } else {
-            return $root;
         }
+
+        return $root;
     }
 
     /**

diff --git a/packages/zend-cache/library/Zend/Cache/Backend/Sqlite.php b/packages/zend-cache/library/Zend/Cache/Backend/Sqlite.php
@@ -435,9 +435,9 @@ public function touch($id, $extraLifetime)
         $res = $this->_query('UPDATE cache SET lastModified='.time().", expire=$newExpire WHERE id='$id'");
         if ($res) {
             return true;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
@@ -492,14 +492,13 @@ private function _getConnection()
     {
         if (is_resource($this->_db)) {
             return $this->_db;
-        } else {
-            $this->_db = @sqlite_open($this->_options['cache_db_complete_path']);
-            if (!is_resource($this->_db)) {
-                Zend_Cache::throwException('Impossible to open '.$this->_options['cache_db_complete_path'].' cache DB file');
-            }
-
-            return $this->_db;
         }
+        $this->_db = @sqlite_open($this->_options['cache_db_complete_path']);
+        if (!is_resource($this->_db)) {
+            Zend_Cache::throwException('Impossible to open '.$this->_options['cache_db_complete_path'].' cache DB file');
+        }
+
+        return $this->_db;
     }
 
     /**
@@ -516,9 +515,9 @@ private function _query($query)
             $res = @sqlite_query($db, $query);
             if (false === $res) {
                 return false;
-            } else {
-                return $res;
             }
+
+            return $res;
         }
 
         return false;

diff --git a/packages/zend-cache/library/Zend/Cache/Backend/TwoLevels.php b/packages/zend-cache/library/Zend/Cache/Backend/TwoLevels.php
@@ -152,9 +152,9 @@ public function test($id)
         $fastTest = $this->_fastBackend->test($id);
         if ($fastTest) {
             return $fastTest;
-        } else {
-            return $this->_slowBackend->test($id);
         }
+
+        return $this->_slowBackend->test($id);
     }
 
     /**

diff --git a/packages/zend-cache/library/Zend/Cache/Backend/ZendPlatform.php b/packages/zend-cache/library/Zend/Cache/Backend/ZendPlatform.php
@@ -75,9 +75,9 @@ public function load($id, $doNotTestCacheValidity = false)
         $res = output_cache_get($id, $lifetime);
         if ($res) {
             return $res[0];
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**

diff --git a/packages/zend-cache/library/Zend/Cache/Frontend/Output.php b/packages/zend-cache/library/Zend/Cache/Frontend/Output.php
@@ -45,9 +45,9 @@ public function start($id, $doNotTestCacheValidity = false, $echoData = true)
                 echo $data;
 
                 return true;
-            } else {
-                return $data;
             }
+
+            return $data;
         }
         ob_start();
         ob_implicit_flush(false);

diff --git a/packages/zend-config/library/Zend/Config/Writer/Ini.php b/packages/zend-config/library/Zend/Config/Writer/Ini.php
@@ -80,7 +80,7 @@ public function render()
         } else {
             $config = $this->_sortRootElements($this->_config);
             foreach ($config as $sectionName => $data) {
-                if (!($data instanceof Zend_Config)) {
+                if (!$data instanceof Zend_Config) {
                     $iniString .= $sectionName
                                .' = '
                                .$this->_prepareValue($data)
@@ -138,9 +138,8 @@ protected function _prepareValue($value)
             return $value ? 'true' : 'false';
         } elseif (false === strpos((string) $value, '"')) {
             return '"'.$value.'"';
-        } else {
-            throw new Zend_Config_Exception('Value can not contain double quotes "');
         }
+        throw new Zend_Config_Exception('Value can not contain double quotes "');
     }
 
     /**

diff --git a/packages/zend-config/library/Zend/Config/Writer/Xml.php b/packages/zend-config/library/Zend/Config/Writer/Xml.php
@@ -34,7 +34,7 @@ public function render()
             $this->_addBranch($this->_config, $child, $xml);
         } else {
             foreach ($this->_config as $sectionName => $data) {
-                if (!($data instanceof Zend_Config)) {
+                if (!$data instanceof Zend_Config) {
                     $xml->addChild($sectionName, (string) $data);
                 } else {
                     $child = $xml->addChild($sectionName);

diff --git a/packages/zend-controller/library/Zend/Controller/Action/Helper/Abstract.php b/packages/zend-controller/library/Zend/Controller/Action/Helper/Abstract.php
@@ -129,8 +129,8 @@ public function getName()
             $helperName = strrchr($fullClassName, '\\');
 
             return ltrim((string) $helperName, '\\');
-        } else {
-            return $fullClassName;
         }
+
+        return $fullClassName;
     }
 }
diff --git a/packages/zend-controller/library/Zend/Controller/Action/Helper/ContextSwitch.php b/packages/zend-controller/library/Zend/Controller/Action/Helper/ContextSwitch.php
@@ -1305,9 +1305,9 @@ public function getActionContexts($action = null)
             $action = (string) $action;
             if (isset($controller->{$contextKey}[$action])) {
                 return $controller->{$contextKey}[$action];
-            } else {
-                return [];
             }
+
+            return [];
         }
 
         return $controller->$contextKey;

diff --git a/packages/zend-controller/library/Zend/Controller/Action/HelperBroker.php b/packages/zend-controller/library/Zend/Controller/Action/HelperBroker.php
@@ -98,8 +98,6 @@ public static function addPath($path, $prefix = 'Zend_Controller_Action_Helper')
     public static function addHelper(Zend_Controller_Action_Helper_Abstract $helper)
     {
         self::getStack()->push($helper);
-
-        return;
     }
 
     /**
@@ -110,8 +108,6 @@ public static function addHelper(Zend_Controller_Action_Helper_Abstract $helper)
     public static function resetHelpers()
     {
         self::$_stack = null;
-
-        return;
     }
 
     /**

diff --git a/packages/zend-controller/library/Zend/Controller/Action/HelperBroker/PriorityStack.php b/packages/zend-controller/library/Zend/Controller/Action/HelperBroker/PriorityStack.php
@@ -94,9 +94,9 @@ public function offsetExists($priorityOrHelperName)
     {
         if (is_string($priorityOrHelperName)) {
             return array_key_exists($priorityOrHelperName, $this->_helpersByNameRef);
-        } else {
-            return array_key_exists($priorityOrHelperName, $this->_helpersByPriority);
         }
+
+        return array_key_exists($priorityOrHelperName, $this->_helpersByPriority);
     }
 
     /**
@@ -115,9 +115,9 @@ public function offsetGet($priorityOrHelperName)
 
         if (is_string($priorityOrHelperName)) {
             return $this->_helpersByNameRef[$priorityOrHelperName];
-        } else {
-            return $this->_helpersByPriority[$priorityOrHelperName];
         }
+
+        return $this->_helpersByPriority[$priorityOrHelperName];
     }
 
     /**

diff --git a/packages/zend-controller/library/Zend/Controller/Plugin/Broker.php b/packages/zend-controller/library/Zend/Controller/Plugin/Broker.php
@@ -215,9 +215,8 @@ public function routeStartup(Zend_Controller_Request_Abstract $request)
             } catch (Throwable $e) {
                 if (Zend_Controller_Front::getInstance()->throwExceptions()) {
                     throw new Zend_Controller_Exception($e->getMessage().$e->getTraceAsString(), $e->getCode(), $e);
-                } else {
-                    $this->getResponse()->setException($e);
                 }
+                $this->getResponse()->setException($e);
             }
         }
     }
@@ -236,9 +235,8 @@ public function routeShutdown(Zend_Controller_Request_Abstract $request)
             } catch (Throwable $e) {
                 if (Zend_Controller_Front::getInstance()->throwExceptions()) {
                     throw new Zend_Controller_Exception($e->getMessage().$e->getTraceAsString(), $e->getCode(), $e);
-                } else {
-                    $this->getResponse()->setException($e);
                 }
+                $this->getResponse()->setException($e);
             }
         }
     }
@@ -261,9 +259,8 @@ public function dispatchLoopStartup(Zend_Controller_Request_Abstract $request)
             } catch (Throwable $e) {
                 if (Zend_Controller_Front::getInstance()->throwExceptions()) {
                     throw new Zend_Controller_Exception($e->getMessage().$e->getTraceAsString(), $e->getCode(), $e);
-                } else {
-                    $this->getResponse()->setException($e);
                 }
+                $this->getResponse()->setException($e);
             }
         }
     }
@@ -281,11 +278,10 @@ public function preDispatch(Zend_Controller_Request_Abstract $request)
             } catch (Throwable $e) {
                 if (Zend_Controller_Front::getInstance()->throwExceptions()) {
                     throw new Zend_Controller_Exception($e->getMessage().$e->getTraceAsString(), $e->getCode(), $e);
-                } else {
-                    $this->getResponse()->setException($e);
-                    // skip rendering of normal dispatch give the error handler a try
-                    $this->getRequest()->setDispatched(false);
                 }
+                $this->getResponse()->setException($e);
+                // skip rendering of normal dispatch give the error handler a try
+                $this->getRequest()->setDispatched(false);
             }
         }
     }
@@ -303,9 +299,8 @@ public function postDispatch(Zend_Controller_Request_Abstract $request)
             } catch (Throwable $e) {
                 if (Zend_Controller_Front::getInstance()->throwExceptions()) {
                     throw new Zend_Controller_Exception($e->getMessage().$e->getTraceAsString(), $e->getCode(), $e);
-                } else {
-                    $this->getResponse()->setException($e);
                 }
+                $this->getResponse()->setException($e);
             }
         }
     }
@@ -323,9 +318,8 @@ public function dispatchLoopShutdown()
             } catch (Throwable $e) {
                 if (Zend_Controller_Front::getInstance()->throwExceptions()) {
                     throw new Zend_Controller_Exception($e->getMessage().$e->getTraceAsString(), $e->getCode(), $e);
-                } else {
-                    $this->getResponse()->setException($e);
                 }
+                $this->getResponse()->setException($e);
             }
         }
     }

diff --git a/packages/zend-controller/library/Zend/Controller/Request/Http.php b/packages/zend-controller/library/Zend/Controller/Request/Http.php
@@ -1086,9 +1086,9 @@ public function getHttpHost()
             return '';
         } elseif ((self::SCHEME_HTTP == $scheme && 80 == $port) || (self::SCHEME_HTTPS == $scheme && 443 == $port)) {
             return $name;
-        } else {
-            return $name.':'.$port;
         }
+
+        return $name.':'.$port;
     }
 
     /**

diff --git a/packages/zend-controller/library/Zend/Controller/Router/Route.php b/packages/zend-controller/library/Zend/Controller/Router/Route.php
@@ -227,9 +227,9 @@ public function match($path, $partial = false)
                 if (!array_key_exists($pos, $this->_parts)) {
                     if ($partial) {
                         break;
-                    } else {
-                        return false;
                     }
+
+                    return false;
                 }
 
                 $matchedPath .= $pathPart.$this->_urlDelimiter;
@@ -508,20 +508,18 @@ public function getTranslator()
     {
         if (null !== $this->_translator) {
             return $this->_translator;
-        } else {
-            if (($translator = self::getDefaultTranslator()) !== null) {
-                return $translator;
-            } else {
-                try {
-                    $translator = Zend_Registry::get('Zend_Translate');
-                } catch (Zend_Exception $e) {
-                    $translator = null;
-                }
+        }
+        if (($translator = self::getDefaultTranslator()) !== null) {
+            return $translator;
+        }
+        try {
+            $translator = Zend_Registry::get('Zend_Translate');
+        } catch (Zend_Exception $e) {
+            $translator = null;
+        }
 
-                if ($translator instanceof Zend_Translate) {
-                    return $translator;
-                }
-            }
+        if ($translator instanceof Zend_Translate) {
+            return $translator;
         }
 
         throw new Zend_Controller_Router_Exception('Could not find a translator');
@@ -562,20 +560,18 @@ public function getLocale()
     {
         if (null !== $this->_locale) {
             return $this->_locale;
-        } else {
-            if (($locale = self::getDefaultLocale()) !== null) {
-                return $locale;
-            } else {
-                try {
-                    $locale = Zend_Registry::get('Zend_Locale');
-                } catch (Zend_Exception $e) {
-                    $locale = null;
-                }
+        }
+        if (($locale = self::getDefaultLocale()) !== null) {
+            return $locale;
+        }
+        try {
+            $locale = Zend_Registry::get('Zend_Locale');
+        } catch (Zend_Exception $e) {
+            $locale = null;
+        }
 
-                if (null !== $locale) {
-                    return $locale;
-                }
-            }
+        if (null !== $locale) {
+            return $locale;
         }
 
         return null;
-Original file line number
+Diff line change
@@ Expand Up @@
         public static function addHelper(Zend_Controller_Action_Helper_Abstract $helper)
         {
             self::getStack()->push($helper);
-            return;
         }
         /**
@@ Expand All @@
         public static function resetHelpers()
         {
             self::$_stack = null;
-            return;
         }
         /**
@@ Expand Down @@