Commit 84ecedac authored by Tim Rohaly's avatar Tim Rohaly
Browse files

Issue #3210622 by TR: [D7] PHP 8.0 introduced breaking change to call_user_func_array()

parent b2c6e883

includes/faces.inc

+3 −3
Changes for includes/faces.inc: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -122,14 +122,14 @@ if (!class_exists('FacesExtendable', FALSE)) { 
          // We always pass the object reference and the name of the method.

          $arguments[] = $this;

          $arguments[] = $name;

          return call_user_func_array($method[0], $arguments);

          return call_user_func_array($method[0], array_values($arguments));

        }

        // Call the method on the extender object, but don't use extender()

        // for performance reasons.

        if (!isset($this->facesClassInstances[$method[1]])) {

          $this->facesClassInstances[$method[1]] = new $method[1]($this);

        }

        return call_user_func_array(array($this->facesClassInstances[$method[1]], $name), $arguments);

        return call_user_func_array(array($this->facesClassInstances[$method[1]], $name), array_values($arguments));

      }

      $class = check_plain(get_class($this));

      throw new FacesExtendableException("There is no method $name for this instance of the class $class.");
@@ -313,7 +313,7 @@ if (!class_exists('FacesExtendable', FALSE)) { 
     */

    public function call($name, array $args = array()) {

      if (method_exists($this, $name)) {

        return call_user_func_array(array($this, $name), $args);

        return call_user_func_array(array($this, $name), array_values($args));

      }

      return $this->__call($name, $args);

    }