Merge pull request #540 from mhujer/php7-fix-xml-rpc

Fix PHP 7 BC breaks in Zend_XmlRpc/Amf_Server
zendframework · Mar 31, 2015 · 276db36 · 276db36
2 parents 7cbb1d5 + 17f179d
commit 276db36
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/library/Zend/Amf/Server.php b/library/Zend/Amf/Server.php
@@ -767,9 +767,9 @@ public function setClass($class, $namespace = '', $argv = null)
             throw new Zend_Amf_Server_Exception('Invalid method or class; must be a classname or object');
         }
 
-        $argv = null;
+        $args = null;
         if (2 < func_num_args()) {
-            $argv = array_slice(func_get_args(), 2);
+            $args = array_slice(func_get_args(), 2);
         }
 
         // Use the class name as the name space by default.
@@ -780,7 +780,7 @@ public function setClass($class, $namespace = '', $argv = null)
 
         $this->_classAllowed[is_object($class) ? get_class($class) : $class] = true;
 
-        $this->_methods[] = Zend_Server_Reflection::reflectClass($class, $argv, $namespace);
+        $this->_methods[] = Zend_Server_Reflection::reflectClass($class, $args, $namespace);
         $this->_buildDispatchTable();
 
         return $this;

diff --git a/library/Zend/XmlRpc/Server.php b/library/Zend/XmlRpc/Server.php
@@ -278,13 +278,13 @@ public function setClass($class, $namespace = '', $argv = null)
             throw new Zend_XmlRpc_Server_Exception('Invalid method class', 610);
         }
 
-        $argv = null;
+        $args = null;
         if (2 < func_num_args()) {
-            $argv = func_get_args();
-            $argv = array_slice($argv, 2);
+            $args = func_get_args();
+            $args = array_slice($args, 2);
         }
 
-        $dispatchable = Zend_Server_Reflection::reflectClass($class, $argv, $namespace);
+        $dispatchable = Zend_Server_Reflection::reflectClass($class, $args, $namespace);
         foreach ($dispatchable->getMethods() as $reflection) {
             $this->_buildSignature($reflection, $class);
         }