3.4.0

kirby/src/Cms/HasMethods.php

@@ -2,6 +2,8 @@
 
 namespace Kirby\Cms;
 
+use Kirby\Exception\BadMethodCallException;
+
 /**
  * HasMethods
  *
@@ -31,7 +33,13 @@ trait HasMethods
      */
     public function callMethod(string $method, array $args = [])
     {
-        return static::$methods[$method]->call($this, ...$args);
+        $closure = $this->getMethod($method);
+
+        if ($closure === null) {
+            throw new BadMethodCallException('The method ' . $method . ' does not exist');
+        }
+
+        return $closure->call($this, ...$args);
     }
 
     /**
@@ -43,6 +51,29 @@ trait HasMethods
      */
     public function hasMethod(string $method): bool
     {
-        return isset(static::$methods[$method]) === true;
+        return $this->getMethod($method) !== null;
+    }
+
+    /**
+     * Returns a registered method by name, either from
+     * the current class or from a parent class ordered by
+     * inheritance order (top to bottom)
+     *
+     * @param string $method
+     * @return Closure|null
+     */
+    protected function getMethod(string $method)
+    {
+        if (isset(static::$methods[$method]) === true) {
+            return static::$methods[$method];
+        }
+
+        foreach (class_parents($this) as $parent) {
+            if (isset($parent::$methods[$method]) === true) {
+                return $parent::$methods[$method];
+            }
+        }
+        
+        return null;
     }
 }