mirrors/barryvdh_ReflectionDocBlock
1
0
Fork 0
mirror of https://github.com/barryvdh/ReflectionDocBlock.git synced 2026-08-18 01:57:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed parsing of string literals and array shapes (#27)

Browse Source
This commit is contained in:
Nereo Berardozzi
2025-01-18 20:26:32 +01:00
committed by GitHub
parent ffb733ef78
commit b6ff9f9360
5 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Barryvdh/Reflection/DocBlock/Tag/ParamTag.php
+7 -8
View File
@@ -54,16 +54,15 @@ class ParamTag extends ReturnTag
for($pos = 0, $stacks = []; $pos < strlen($rest); $pos++) {
$char = $rest[$pos];
if($char === '<') {
if(in_array($char, ['<', '(', '[', '{'])) {
array_unshift($stacks, $char);
}
if($char === '(') {
array_unshift($stacks, $char);
}
if($char === '>' && isset($stacks[0]) && $stacks[0] === '<') {
array_shift($stacks);
}
if($char === ')' && isset($stacks[0]) && $stacks[0] === '(') {
if(
($char === '>' && isset($stacks[0]) && $stacks[0] === '<')
|| ($char === ')' && isset($stacks[0]) && $stacks[0] === '(')
|| ($char === ']' && isset($stacks[0]) && $stacks[0] === '[')
|| ($char === '}' && isset($stacks[0]) && $stacks[0] === '{')
) {
array_shift($stacks);
}
src/Barryvdh/Reflection/DocBlock/Type/Collection.php
+9 -3
View File
@@ -161,9 +161,9 @@ class Collection extends \ArrayObject
$type_parts[] = $curr_type;
$curr_type = '';
} else {
if ($char === '<' || $char === '(') {
if (in_array($char, ['<', '(', '[', '{'])) {
$nest_level++;
} else if ($char === '>' || $char === ')') {
} else if (in_array($char, ['>', ')', ']', '}'])) {
$nest_level--;
}
@@ -201,7 +201,8 @@ class Collection extends \ArrayObject
return '';
}
if (preg_match('/^[\w-]+<.*>$/', $type)) {
// Check for generics values and array shapes
if (preg_match('/^[\w-]+(<.+>|\[.+\]|{.+})$/', $type)) {
return $type;
}
@@ -214,6 +215,11 @@ class Collection extends \ArrayObject
return $type;
}
// Literal strings
if ($type[0] === '"' || $type[0] === "'") {
return $type;
}
if ($this->isTypeAnArray($type)) {
return $this->expand(substr($type, 0, -2)) . self::OPERATOR_ARRAY;
}