8000 Update root-composer (major) by renovate[bot] · Pull Request #176 · phpstan/phpdoc-parser · GitHub
[go: up one dir, main page]
Skip to content

Update root-composer (major) #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: 1.9.x
Choose a base branch
from
Open

Update root-composer (major) #176

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2a022b2
Un-extract variable
ondrejmirtes Apr 28, 2023
68d46b9
Extract creating PhpDocParser to setUp
ondrejmirtes Apr 28, 2023
f5a5145
Test Printer::print()
ondrejmirtes Apr 28, 2023
2ebed2c
Open 1.20.x
ondrejmirtes May 2, 2023
16b30bb
Merge branch '1.20.x' into 1.21.x
ondrejmirtes May 2, 2023
e9514dc
Open 1.21.x
ondrejmirtes May 2, 2023
69bc46f
Update dependency slevomat/coding-standard to v8.11.1
renovate[bot] May 1, 2023
97d18ea
Fix build
ondrejmirtes May 2, 2023
d60fa73
CallableTypeNode - support object shape in return type
ondrejmirtes May 2, 2023
421d3f3
CallableTypeNode - support `$this` in return type
ondrejmirtes May 2, 2023
a7e9698
CallableTypeNode - support ConstTypeNode in return type
ondrejmirtes May 2, 2023
7d568c8
Simplify implementation
ondrejmirtes May 2, 2023
cc94635
Merge branch '1.20.x' into 1.21.x
ondrejmirtes May 2, 2023
ced520a
Micro optimize parseParamTagValue()
staabm May 16, 2023
bfdb616
Update root-composer
renovate[bot] May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CallableTypeNode - support object shape in return type
  • Loading branch information
@ondrejmirtes
ondrejmirtes committed May 2, 2023
commit d60fa73f5c3215d122391a13f9c89dce86f34a82
18 changes: 11 additions & 7 deletions src/Parser/TypeParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,13 +542,17 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo
)
);

} elseif (in_array($type->name, ['array', 'list'], true) && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {
$type = $this->parseArrayShape($tokens, $this->enrichWithAttributes(
$tokens,
$type,
$startLine,
$startIndex
), $type->name);
} elseif (in_array($type->name, ['array', 'list', 'object'], true) && $tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET) && !$tokens->isPrecededByHorizontalWhitespace()) {
if ($type->name === 'object') {
$type = $this->parseObjectShape($tokens);
} else {
$type = $this->parseArrayShape($tokens, $this->enrichWithAttributes(
$tokens,
$type,
$startLine,
$startIndex
), $type->name);
}
}
}

Expand Down
18 changes: 18 additions & 0 deletions tests/PHPStan/Parser/TypeParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1939,6 +1939,24 @@ public function provideParseData(): array
'callable(): ?int',
new CallableTypeNode(new IdentifierTypeNode('callable'), [], new NullableTypeNode(new IdentifierTypeNode('int'))),
],
[
'callable(): object{foo: int}',
new CallableTypeNode(new IdentifierTypeNode('callable'), [], new ObjectShapeNode([
new ObjectShapeItemNode(new IdentifierTypeNode('foo'), false, new IdentifierTypeNode('int')),
])),
],
[
'callable(): object{foo: int}[]',
new CallableTypeNode(
new IdentifierTypeNode('callable'),
[],
new ArrayTypeNode(
new ObjectShapeNode([
new ObjectShapeItemNode(new IdentifierTypeNode('foo'), false, new IdentifierTypeNode('int')),
])
)
),
],
];
}

Expand Down
0