Php8.1

composer.json

@@ -1,16 +1,16 @@
 {
     "name": "mobtitude/zendframework1",
-    "description": "Zend Framework 1 fork compatible with PHP 7.2 by Mobtitude",
+    "description": "Zend Framework 1 fork compatible with PHP 8.1 by Mobtitude",
     "type": "library",
     "keywords": [
         "framework",
         "zf1",
-        "php-7.2"
+        "php-8.1"
     ],
     "homepage": "https://github.com/mobtitude/zendframework1",
     "license": "BSD-3-Clause",
     "require": {
-        "php": ">=5.2.2"
+        "php": "^8.1"
     },
     "autoload": {
         "psr-0": {
@@ -29,6 +29,7 @@
         }
     },
     "require-dev": {
+        "rector/rector": "^0.12.17",
         "phpunit/phpunit": "3.7.*",
         "phpunit/dbunit": "1.3.*"
     },

docker-compose.yml

@@ -0,0 +1,14 @@
+version: '3'
+services:
+  php-qa:
+    image: psfoundation/code-quality
+    working_dir: /project
+    volumes:
+      - ./:/project
+      - ~/.ssh:/root/.ssh
+  builder:
+    image: psfoundation/webapp-builder:1.0.13-php8.1
+    working_dir: /project
+    volumes:
+      - ./:/project
+      - ~/.ssh:/root/.ssh

library/Zend/Acl.php

@@ -223,11 +223,7 @@ public function removeRole($role)
     {
         $this->_getRoleRegistry()->remove($role);
 
-        if ($role instanceof Zend_Acl_Role_Interface) {
-            $roleId = $role->getRoleId();
-        } else {
-            $roleId = $role;
-        }
+        $roleId = $role instanceof Zend_Acl_Role_Interface ? $role->getRoleId() : $role;
 
         foreach ($this->_rules['allResources']['byRoleId'] as $roleIdCurrent => $rules) {
             if ($roleId === $roleIdCurrent) {
@@ -302,11 +298,7 @@ public function addResource($resource, $parent = null)
 
         if (null !== $parent) {
             try {
-                if ($parent instanceof Zend_Acl_Resource_Interface) {
-                    $resourceParentId = $parent->getResourceId();
-                } else {
-                    $resourceParentId = $parent;
-                }
+                $resourceParentId = $parent instanceof Zend_Acl_Resource_Interface ? $parent->getResourceId() : $parent;
                 $resourceParent = $this->get($resourceParentId);
             } catch (Zend_Acl_Exception $e) {
                 require_once 'Zend/Acl/Exception.php';
@@ -354,11 +346,7 @@ public function add(Zend_Acl_Resource_Interface $resource, $parent = null)
      */
     public function get($resource)
     {
-        if ($resource instanceof Zend_Acl_Resource_Interface) {
-            $resourceId = $resource->getResourceId();
-        } else {
-            $resourceId = (string) $resource;
-        }
+        $resourceId = $resource instanceof Zend_Acl_Resource_Interface ? $resource->getResourceId() : (string) $resource;
 
         if (!$this->has($resource)) {
             require_once 'Zend/Acl/Exception.php';
@@ -378,11 +366,7 @@ public function get($resource)
      */
     public function has($resource)
     {
-        if ($resource instanceof Zend_Acl_Resource_Interface) {
-            $resourceId = $resource->getResourceId();
-        } else {
-            $resourceId = (string) $resource;
-        }
+        $resourceId = $resource instanceof Zend_Acl_Resource_Interface ? $resource->getResourceId() : (string) $resource;
 
         return isset($this->_resources[$resourceId]);
     }
@@ -416,7 +400,7 @@ public function inherits($resource, $inherit, $onlyParent = false)
             $parentId = $this->_resources[$resourceId]['parent']->getResourceId();
             if ($inheritId === $parentId) {
                 return true;
-            } else if ($onlyParent) {
+            } elseif ($onlyParent) {
                 return false;
             }
         } else {
@@ -480,7 +464,7 @@ public function remove($resource)
      */
     public function removeAll()
     {
-        foreach ($this->_resources as $resourceId => $resource) {
+        foreach (array_keys($this->_resources) as $resourceId) {
             foreach ($this->_rules['byResourceId'] as $resourceIdCurrent => $rules) {
                 if ($resourceId === $resourceIdCurrent) {
                     unset($this->_rules['byResourceId'][$resourceIdCurrent]);
@@ -617,35 +601,27 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr
         // ensure that all specified Roles exist; normalize input to array of Role objects or null
         if (!is_array($roles)) {
             $roles = array($roles);
-        } else if (0 === count($roles)) {
+        } elseif ([] === $roles) {
             $roles = array(null);
         }
         $rolesTemp = $roles;
         $roles = array();
         foreach ($rolesTemp as $role) {
-            if (null !== $role) {
-                $roles[] = $this->_getRoleRegistry()->get($role);
-            } else {
-                $roles[] = null;
-            }
+            $roles[] = null !== $role ? $this->_getRoleRegistry()->get($role) : null;
         }
         unset($rolesTemp);
 
         // ensure that all specified Resources exist; normalize input to array of Resource objects or null
         if ($resources !== null) {
             if (!is_array($resources)) {
                 $resources = array($resources);
-            } else if (0 === count($resources)) {
+            } elseif ([] === $resources) {
                 $resources = array(null);
             }
             $resourcesTemp = $resources;
             $resources = array();
             foreach ($resourcesTemp as $resource) {
-                if (null !== $resource) {
-                    $resources[] = $this->get($resource);
-                } else {
-                    $resources[] = null;
-                }
+                $resources[] = null !== $resource ? $this->get($resource) : null;
             }
             unset($resourcesTemp, $resource);
         } else {
@@ -659,7 +635,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr
         // normalize privileges to array
         if (null === $privileges) {
             $privileges = array();
-        } else if (!is_array($privileges)) {
+        } elseif (!is_array($privileges)) {
             $privileges = array($privileges);
         }
 
@@ -672,7 +648,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr
                     foreach ($resources as $resource) {
                         foreach ($roles as $role) {
                             $rules =& $this->_getRules($resource, $role, true);
-                            if (0 === count($privileges)) {
+                            if ([] === $privileges) {
                                 $rules['allPrivileges']['type']   = $type;
                                 $rules['allPrivileges']['assert'] = $assert;
                                 if (!isset($rules['byPrivilegeId'])) {
@@ -690,7 +666,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr
                     // this block will apply to all resources in a global rule
                     foreach ($roles as $role) {
                         $rules =& $this->_getRules(null, $role, true);
-                        if (0 === count($privileges)) {
+                        if ([] === $privileges) {
                             $rules['allPrivileges']['type']   = $type;
                             $rules['allPrivileges']['assert'] = $assert;
                         } else {
@@ -713,7 +689,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr
                             if (null === $rules) {
                                 continue;
                             }
-                            if (0 === count($privileges)) {
+                            if ([] === $privileges) {
                                 if (null === $resource && null === $role) {
                                     if ($type === $rules['allPrivileges']['type']) {
                                         $rules = array(
@@ -756,7 +732,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr
                             if (null === $rules) {
                                 continue;
                             }
-                            if (0 === count($privileges)) {
+                            if ([] === $privileges) {
                                 if (null === $role) {
                                     if ($type === $rules['allPrivileges']['type']) {
                                         $rules = array(
@@ -853,7 +829,7 @@ public function isAllowed($role = null, $resource = null, $privilege = null)
             // query on all privileges
             do {
                 // depth-first search on $role if it is not 'allRoles' pseudo-parent
-                if (null !== $role && null !== ($result = $this->_roleDFSAllPrivileges($role, $resource, $privilege))) {
+                if (null !== $role && null !== ($result = $this->_roleDFSAllPrivileges($role, $resource))) {
                     return $result;
                 }
 
@@ -885,7 +861,7 @@ public function isAllowed($role = null, $resource = null, $privilege = null)
                 // look for rule on 'allRoles' pseudo-parent
                 if (null !== ($ruleType = $this->_getRuleType($resource, null, $privilege))) {
                     return self::TYPE_ALLOW === $ruleType;
-                } else if (null !== ($ruleTypeAllPrivileges = $this->_getRuleType($resource, null, null))) {
+                } elseif (null !== ($ruleTypeAllPrivileges = $this->_getRuleType($resource, null, null))) {
                     return self::TYPE_ALLOW === $ruleTypeAllPrivileges;
                 }
 
@@ -935,10 +911,8 @@ protected function _roleDFSAllPrivileges(Zend_Acl_Role_Interface $role, Zend_Acl
         }
 
         while (null !== ($role = array_pop($dfs['stack']))) {
-            if (!isset($dfs['visited'][$role->getRoleId()])) {
-                if (null !== ($result = $this->_roleDFSVisitAllPrivileges($role, $resource, $dfs))) {
-                    return $result;
-                }
+            if (!isset($dfs['visited'][$role->getRoleId()]) && null !== ($result = $this->_roleDFSVisitAllPrivileges($role, $resource, $dfs))) {
+                return $result;
             }
         }
 
@@ -1023,10 +997,8 @@ protected function _roleDFSOnePrivilege(Zend_Acl_Role_Interface $role, Zend_Acl_
         }
 
         while (null !== ($role = array_pop($dfs['stack']))) {
-            if (!isset($dfs['visited'][$role->getRoleId()])) {
-                if (null !== ($result = $this->_roleDFSVisitOnePrivilege($role, $resource, $privilege, $dfs))) {
-                    return $result;
-                }
+            if (!isset($dfs['visited'][$role->getRoleId()]) && null !== ($result = $this->_roleDFSVisitOnePrivilege($role, $resource, $privilege, $dfs))) {
+                return $result;
             }
         }
 
@@ -1069,7 +1041,7 @@ protected function _roleDFSVisitOnePrivilege(Zend_Acl_Role_Interface $role, Zend
 
         if (null !== ($ruleTypeOnePrivilege = $this->_getRuleType($resource, $role, $privilege))) {
             return self::TYPE_ALLOW === $ruleTypeOnePrivilege;
-        } else if (null !== ($ruleTypeAllPrivileges = $this->_getRuleType($resource, $role, null))) {
+        } elseif (null !== ($ruleTypeAllPrivileges = $this->_getRuleType($resource, $role, null))) {
             return self::TYPE_ALLOW === $ruleTypeAllPrivileges;
         }
 
@@ -1117,7 +1089,7 @@ protected function _getRuleType(Zend_Acl_Resource_Interface $resource = null, Ze
             } else {
                 return null;
             }
-        } else if (!isset($rules['byPrivilegeId'][$privilege])) {
+        } elseif (!isset($rules['byPrivilegeId'][$privilege])) {
             return null;
         } else {
             $rule = $rules['byPrivilegeId'][$privilege];
@@ -1136,9 +1108,9 @@ protected function _getRuleType(Zend_Acl_Resource_Interface $resource = null, Ze
 
         if (null === $rule['assert'] || $assertionValue) {
             return $rule['type'];
-        } else if (null !== $resource || null !== $role || null !== $privilege) {
+        } elseif (null !== $resource || null !== $role || null !== $privilege) {
             return null;
-        } else if (self::TYPE_ALLOW === $rule['type']) {
+        } elseif (self::TYPE_ALLOW === $rule['type']) {
             return self::TYPE_DENY;
         } else {
             return self::TYPE_ALLOW;

library/Zend/Acl/Role/Registry.php

@@ -84,11 +84,7 @@ public function add(Zend_Acl_Role_Interface $role, $parents = null)
             require_once 'Zend/Acl/Role/Registry/Exception.php';
             foreach ($parents as $parent) {
                 try {
-                    if ($parent instanceof Zend_Acl_Role_Interface) {
-                        $roleParentId = $parent->getRoleId();
-                    } else {
-                        $roleParentId = $parent;
-                    }
+                    $roleParentId = $parent instanceof Zend_Acl_Role_Interface ? $parent->getRoleId() : $parent;
                     $roleParent = $this->get($roleParentId);
                 } catch (Zend_Acl_Role_Registry_Exception $e) {
                     throw new Zend_Acl_Role_Registry_Exception("Parent Role id '$roleParentId' does not exist", 0, $e);
@@ -118,11 +114,7 @@ public function add(Zend_Acl_Role_Interface $role, $parents = null)
      */
     public function get($role)
     {
-        if ($role instanceof Zend_Acl_Role_Interface) {
-            $roleId = $role->getRoleId();
-        } else {
-            $roleId = (string) $role;
-        }
+        $roleId = $role instanceof Zend_Acl_Role_Interface ? $role->getRoleId() : (string) $role;
 
         if (!$this->has($role)) {
             /**
@@ -145,11 +137,7 @@ public function get($role)
      */
     public function has($role)
     {
-        if ($role instanceof Zend_Acl_Role_Interface) {
-            $roleId = $role->getRoleId();
-        } else {
-            $roleId = (string) $role;
-        }
+        $roleId = $role instanceof Zend_Acl_Role_Interface ? $role->getRoleId() : (string) $role;
 
         return isset($this->_roles[$roleId]);
     }

library/Zend/Amf/Parse/Amf0/Deserializer.php

@@ -238,8 +238,7 @@ public function readDate()
         $offset = $this->_stream->readInt();
 
         require_once 'Zend/Date.php';
-        $date   = new Zend_Date($timestamp);
-        return $date;
+        return new Zend_Date($timestamp);
     }
 
     /**
@@ -272,7 +271,7 @@ public function readTypedObject()
         $returnObject = new $loader();
         $properties = get_object_vars($this->readObject());
         foreach($properties as $key=>$value) {
-            if($key) {
+            if($key !== '' && $key !== '0') {
                 $returnObject->$key = $value;
             }
         }

library/Zend/Amf/Parse/Amf0/Serializer.php

@@ -157,14 +157,14 @@ public function writeTypeMarker(&$data, $markerType = null, $dataByVal = false)
                     $i = 0;
                     foreach (array_keys($data) as $key) {
                         // check if it contains non-integer keys
-                        if (!is_numeric($key) || intval($key) != $key) {
+                        if (!is_numeric($key) || (int) $key != $key) {
                             $markerType = Zend_Amf_Constants::AMF0_OBJECT;
                             break;
                             // check if it is a sparse indexed array
-                         } else if ($key != $i) {
-                             $markerType = Zend_Amf_Constants::AMF0_MIXEDARRAY;
-                             break;
-                         }
+                        } elseif ($key != $i) {
+                            $markerType = Zend_Amf_Constants::AMF0_MIXEDARRAY;
+                            break;
+                        }
                          $i++;
                     }
                     // Dealing with a standard numeric array
@@ -337,7 +337,7 @@ protected function getClassName($object)
                 $className = Zend_Amf_Parse_TypeLoader::getMappedClassName(get_class($object));
                 break;
                 // Check to see if the user has defined an explicit Action Script type.
-            case isset($object->_explicitType):
+            case property_exists($object, '_explicitType') && $object->_explicitType !== null:
                 $className = $object->_explicitType;
                 break;
                 // Check if user has defined a method for accessing the Action Script type