From f878ffc9dda432144603d83ebb7dcfdbbfb2a0f5 Mon Sep 17 00:00:00 2001 From: Erik Gaal Date: Mon, 21 Mar 2022 17:10:45 +0100 Subject: [PATCH 1/3] Allow whitespace in @var type definition --- src/TypeReflectors/PropertyTypeReflector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TypeReflectors/PropertyTypeReflector.php b/src/TypeReflectors/PropertyTypeReflector.php index 8203fc5..9990a5c 100644 --- a/src/TypeReflectors/PropertyTypeReflector.php +++ b/src/TypeReflectors/PropertyTypeReflector.php @@ -26,7 +26,7 @@ protected function getDocblock(): string protected function docblockRegex(): string { - return '/@var ((?:(?:[\w?|\\\\<>,])+(?:\[])?)+)/'; + return '/@var ((?:\s?[\\w?|\\\\<>,]+(?:\[])?)+)/'; } protected function getReflectionType(): ?ReflectionType From 221edf629025e4d73b725a22ce38fa6bc90e34da Mon Sep 17 00:00:00 2001 From: Erik Gaal Date: Mon, 21 Mar 2022 17:13:03 +0100 Subject: [PATCH 2/3] Allow whitespace in return type definition --- src/TypeReflectors/MethodReturnTypeReflector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TypeReflectors/MethodReturnTypeReflector.php b/src/TypeReflectors/MethodReturnTypeReflector.php index 5fbe20a..823b5ef 100644 --- a/src/TypeReflectors/MethodReturnTypeReflector.php +++ b/src/TypeReflectors/MethodReturnTypeReflector.php @@ -26,7 +26,7 @@ protected function getDocblock(): string protected function docblockRegex(): string { - return '/@return ((?:(?:[\w?|\\\\<>,])+(?:\[])?)+)/'; + return '/@return ((?:\s?[\w?|\\\\<>,]+(?:\[])?)+)/'; } protected function getReflectionType(): ?ReflectionType From d2603f5c91f123ab90bf900980c263c1d1d42a1d Mon Sep 17 00:00:00 2001 From: Erik Gaal Date: Mon, 21 Mar 2022 17:17:33 +0100 Subject: [PATCH 3/3] Allow whitespace in parameter type definition --- src/TypeReflectors/MethodParameterTypeReflector.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TypeReflectors/MethodParameterTypeReflector.php b/src/TypeReflectors/MethodParameterTypeReflector.php index f5e7fd3..7b5c7bc 100644 --- a/src/TypeReflectors/MethodParameterTypeReflector.php +++ b/src/TypeReflectors/MethodParameterTypeReflector.php @@ -26,7 +26,7 @@ protected function getDocblock(): string protected function docblockRegex(): string { - return "/@param ((?:(?:[\\w?|\\\\<>,])+(?:\\[])?)+) \\\${$this->reflection->getName()}/"; + return "/@param ((?:\\s?[\\w?|\\\\<>,]+(?:\\[])?)+) \\\${$this->reflection->getName()}/"; } protected function getReflectionType(): ?ReflectionType