From c780978158c5c80b17e6e7e63dd6e1a368e8bba2 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 6 Oct 2016 11:12:13 +0200 Subject: [PATCH] [HttpKernel] Clean ArgumentMetadataFactory::getType() --- .../ArgumentMetadataFactory.php | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php index ad6c395ee7..d1e7af2068 100644 --- a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php +++ b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php @@ -122,21 +122,8 @@ final class ArgumentMetadataFactory implements ArgumentMetadataFactoryInterface return $typeName; } - if ($parameter->isArray()) { - return 'array'; + if (preg_match('/^(?:[^ ]++ ){4}([a-zA-Z_\x7F-\xFF][^ ]++)/', $parameter, $info)) { + return $info[1]; } - - if ($parameter->isCallable()) { - return 'callable'; - } - - try { - $refClass = $parameter->getClass(); - } catch (\ReflectionException $e) { - // mandatory; extract it from the exception message - return str_replace(array('Class ', ' does not exist'), '', $e->getMessage()); - } - - return $refClass ? $refClass->getName() : null; } }