BUGFIX: Fix rendering of enums and objects in proxied methods attributes

This is done by using the method Compiler::renderAttribute instead of a local implementation

Author: mficzel

Neos.Flow/Classes/ObjectManagement/Proxy/ProxyMethodGenerator.php

@@ -14,7 +14,6 @@
 use Laminas\Code\Generator\DocBlockGenerator;
 use Laminas\Code\Generator\MethodGenerator;
 use Laminas\Code\Generator\ParameterGenerator;
-use Neos\Flow\ObjectManagement\Exception\UnsupportedAttributeException;
 
 /**
  * Class ProxyMethodGenerator
@@ -260,77 +259,9 @@ protected function buildAttributesCode(\ReflectionMethod $reflectionMethod): str
         $attributesCode = "";
 
         foreach ($reflectionMethod->getAttributes() as $attribute) {
-            $attributeName = "\\" . ltrim($attribute->getName(), '\\');
-            $argumentsString = $this->formatAttributesArguments($attribute->getArguments(), $reflectionMethod->name);
-            $attributesCode .= "{$indent}#[{$attributeName}({$argumentsString})]" . self::LINE_FEED;
+            $attributesCode .= $indent . Compiler::renderAttribute($attribute) . self::LINE_FEED;
         }
 
         return $attributesCode;
     }
-
-    /**
-     * Formats the arguments of attributes into a string.
-     *
-     * @param array $arguments An array of arguments for attributes.
-     * @param string $methodName The current method name the proxy code is built for.
-     * @return string The formatted arguments as a string.
-     * @throws UnsupportedAttributeException
-     */
-    private function formatAttributesArguments(array $arguments, string $methodName): string
-    {
-        $formattedArguments = [];
-
-        foreach ($arguments as $key => $value) {
-            if (is_int($key)) {
-                $formattedArguments[] = $this->formatAttributeValue($value, $methodName);
-            } else {
-                $formattedArguments[] = "{$key}: " . $this->formatAttributeValue($value, $methodName);
-            }
-        }
-
-        return implode(', ', $formattedArguments);
-    }
-
-    /**
-     * Formats the given attribute value.
-     *
-     * @param mixed $value The value to be formatted.
-     * @param string $methodName The current method name the proxy code is built for.
-     * @return string The formatted attribute value.
-     */
-    private function formatAttributeValue(mixed $value, string $methodName): string
-    {
-        if (is_string($value)) {
-            return "\"$value\"";
-        }
-        if (is_bool($value)) {
-            return $value ? 'true' : 'false';
-        }
-        if (is_int($value)) {
-            return (string)$value;
-        }
-        if (is_float($value)) {
-            return (string)$value;
-        }
-        if ($value === null) {
-            return 'null';
-        }
-        if (is_array($value)) {
-            $formattedArrayElements = implode(', ', array_map(function ($key, $value) use ($methodName) {
-                return is_int($key)
-                    ? $this->formatAttributeValue($value, $methodName)
-                    : "\"{$key}\" => " . $this->formatAttributeValue($value, $methodName);
-            }, array_keys($value), $value));
-            return "[{$formattedArrayElements}]";
-        }
-        throw new UnsupportedAttributeException(
-            sprintf(
-                'Failed rendering proxy method %s::%s because an attribute contained an unsupported value type (%s)',
-                $this->getFullOriginalClassName(),
-                $methodName,
-                get_debug_type($value)
-            ),
-            1705501433
-        );
-    }
 }