FIX Don't use call_user_func in __call() (#11489)

These would cause problems if ViewLayerData hits them with a method that doesn't exist.
silverstripe · Dec 3, 2024 · 2fcf68a · 2fcf68a
1 parent 6cd38d2
commit 2fcf68a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Core/Injector/AopProxyService.php b/src/Core/Injector/AopProxyService.php
@@ -47,7 +47,7 @@ public function __call($method, $args)
             }
 
             if ($continue) {
-                $result = call_user_func_array([$this->proxied, $method], $args ?? []);
+                $result = $this->proxied->$method(...$args);
 
                 if (isset($this->afterCall[$method])) {
                     $methods = $this->afterCall[$method];

diff --git a/src/View/Parsers/HTMLValue.php b/src/View/Parsers/HTMLValue.php
@@ -160,7 +160,7 @@ public function __call($method, $arguments)
         $doc = $this->getDocument();
 
         if ($doc && method_exists($doc, $method ?? '')) {
-            return call_user_func_array([$doc, $method], $arguments ?? []);
+            return $doc->$method(...$arguments);
         } else {
             return parent::__call($method, $arguments);
         }