From 513bbc284f2551d4c701d247bf69efc7f6cdaf30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Mu=CC=88ller?= Date: Wed, 22 Oct 2025 10:04:27 +0200 Subject: [PATCH] TASK: More adjustments to correctly check parent class chains in proxies --- Neos.Flow/Classes/Aop/Builder/ProxyClassBuilder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Neos.Flow/Classes/Aop/Builder/ProxyClassBuilder.php b/Neos.Flow/Classes/Aop/Builder/ProxyClassBuilder.php index b0060e3c44..67b0563089 100644 --- a/Neos.Flow/Classes/Aop/Builder/ProxyClassBuilder.php +++ b/Neos.Flow/Classes/Aop/Builder/ProxyClassBuilder.php @@ -463,7 +463,7 @@ public function buildProxyClass(string $targetClassName, array &$aspectContainer $proxyClass->getMethod('__clone')->addPreParentCallCode($callBuildMethodsAndAdvicesArrayCode); if (!$this->reflectionService->hasMethod($targetClassName, '__wakeup')) { - $proxyClass->getMethod('__wakeup')->addPostParentCallCode(" if (method_exists(get_parent_class(\$this), '__wakeup') && is_callable([parent::class, '__wakeup'])) parent::__wakeup();\n"); + $proxyClass->getMethod('__wakeup')->addPostParentCallCode(" if (method_exists(parent::class, '__wakeup') && is_callable([parent::class, '__wakeup'])) parent::__wakeup();\n"); } $proxyClass->addTraits(['\\' . AdvicesTrait::class]); @@ -532,7 +532,7 @@ protected function addBuildMethodsAndAdvicesCodeToClass(string $className, Class return $treatedSubClasses; } - $callBuildMethodsAndAdvicesArrayCode = " if (method_exists(get_parent_class(\$this), 'Flow_Aop_Proxy_buildMethodsAndAdvicesArray') && is_callable([parent::class, 'Flow_Aop_Proxy_buildMethodsAndAdvicesArray'])) parent::Flow_Aop_Proxy_buildMethodsAndAdvicesArray();\n"; + $callBuildMethodsAndAdvicesArrayCode = " if (method_exists(parent::class, 'Flow_Aop_Proxy_buildMethodsAndAdvicesArray') && is_callable([parent::class, 'Flow_Aop_Proxy_buildMethodsAndAdvicesArray'])) parent::Flow_Aop_Proxy_buildMethodsAndAdvicesArray();\n"; $proxyClass->getConstructor()->addPreParentCallCode($callBuildMethodsAndAdvicesArrayCode); $proxyClass->getMethod('__wakeup')->addPreParentCallCode($callBuildMethodsAndAdvicesArrayCode);