Skip to content

Commit dbc093d

Browse files
ondrejmirtesondrejmirtes
committed
Fix BC break vs. 1.0.0
1 parent d26926e commit dbc093d

File tree

3 files changed

+10
-27
lines changed

3 files changed

+10
-27
lines changed

‎src/Ast/PhpDoc/ParamTagValueNode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ParamTagValueNode implements PhpDocTagValueNode
2525
/** @var string (may be empty) */
2626
public $description;
2727

28-
public function __construct(TypeNode $type, bool $isReference, bool $isVariadic, string $parameterName, string $description)
28+
public function __construct(TypeNode $type, bool $isVariadic, string $parameterName, string $description, bool $isReference = false)
2929
{
3030
$this->type = $type;
3131
$this->isReference = $isReference;

‎src/Parser/PhpDocParser.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ private function parseParamTagValue(TokenIterator $tokens): Ast\PhpDoc\ParamTagV
224224
$isVariadic = $tokens->tryConsumeTokenType(Lexer::TOKEN_VARIADIC);
225225
$parameterName = $this->parseRequiredVariableName($tokens);
226226
$description = $this->parseOptionalDescription($tokens);
227-
return new Ast\PhpDoc\ParamTagValueNode($type, $isReference, $isVariadic, $parameterName, $description);
227+
return new Ast\PhpDoc\ParamTagValueNode($type, $isVariadic, $parameterName, $description, $isReference);
228228
}
229229

230230

‎tests/PHPStan/Parser/PhpDocParserTest.php‎

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ public function provideParamTagsData(): \Iterator
9999
new ParamTagValueNode(
100100
new IdentifierTypeNode('Foo'),
101101
false,
102-
false,
103102
'$foo',
104103
''
105104
)
@@ -116,7 +115,6 @@ public function provideParamTagsData(): \Iterator
116115
new ParamTagValueNode(
117116
new IdentifierTypeNode('Foo'),
118117
false,
119-
false,
120118
'$foo',
121119
'optional description'
122120
)
@@ -132,7 +130,6 @@ public function provideParamTagsData(): \Iterator
132130
'@param',
133131
new ParamTagValueNode(
134132
new IdentifierTypeNode('Foo'),
135-
false,
136133
true,
137134
'$foo',
138135
''
@@ -149,7 +146,6 @@ public function provideParamTagsData(): \Iterator
149146
'@param',
150147
new ParamTagValueNode(
151148
new IdentifierTypeNode('Foo'),
152-
false,
153149
true,
154150
'$foo',
155151
'optional description'
@@ -166,10 +162,10 @@ public function provideParamTagsData(): \Iterator
166162
'@param',
167163
new ParamTagValueNode(
168164
new IdentifierTypeNode('Foo'),
169-
true,
170165
false,
171166
'$foo',
172-
''
167+
'',
168+
true
173169
)
174170
),
175171
]),
@@ -183,10 +179,10 @@ public function provideParamTagsData(): \Iterator
183179
'@param',
184180
new ParamTagValueNode(
185181
new IdentifierTypeNode('Foo'),
186-
true,
187182
false,
188183
'$foo',
189-
'optional description'
184+
'optional description',
185+
true
190186
)
191187
),
192188
]),
@@ -201,9 +197,9 @@ public function provideParamTagsData(): \Iterator
201197
new ParamTagValueNode(
202198
new IdentifierTypeNode('Foo'),
203199
true,
204-
true,
205200
'$foo',
206-
''
201+
'',
202+
true
207203
)
208204
),
209205
]),
@@ -218,9 +214,9 @@ public function provideParamTagsData(): \Iterator
218214
new ParamTagValueNode(
219215
new IdentifierTypeNode('Foo'),
220216
true,
221-
true,
222217
'$foo',
223-
'optional description'
218+
'optional description',
219+
true
224220
)
225221
),
226222
]),
@@ -235,7 +231,6 @@ public function provideParamTagsData(): \Iterator
235231
new ParamTagValueNode(
236232
new ConstTypeNode(new ConstFetchNode('self', '*')),
237233
false,
238-
false,
239234
'$foo',
240235
'optional description'
241236
)
@@ -1945,7 +1940,6 @@ public function provideMultiLinePhpDocData(): array
19451940
new ParamTagValueNode(
19461941
new IdentifierTypeNode('Foo'),
19471942
false,
1948-
false,
19491943
'$foo',
19501944
'1st multi world description'
19511945
)
@@ -1955,7 +1949,6 @@ public function provideMultiLinePhpDocData(): array
19551949
new ParamTagValueNode(
19561950
new IdentifierTypeNode('Bar'),
19571951
false,
1958-
false,
19591952
'$bar',
19601953
'2nd multi world description'
19611954
)
@@ -1975,7 +1968,6 @@ public function provideMultiLinePhpDocData(): array
19751968
new ParamTagValueNode(
19761969
new IdentifierTypeNode('Foo'),
19771970
false,
1978-
false,
19791971
'$foo',
19801972
'1st multi world description
19811973
some text in the middle'
@@ -1986,7 +1978,6 @@ public function provideMultiLinePhpDocData(): array
19861978
new ParamTagValueNode(
19871979
new IdentifierTypeNode('Bar'),
19881980
false,
1989-
false,
19901981
'$bar',
19911982
'2nd multi world description'
19921983
)
@@ -2017,7 +2008,6 @@ public function provideMultiLinePhpDocData(): array
20172008
new ParamTagValueNode(
20182009
new IdentifierTypeNode('Foo'),
20192010
false,
2020-
false,
20212011
'$foo',
20222012
'1st multi world description with empty lines'
20232013
)
@@ -2032,7 +2022,6 @@ public function provideMultiLinePhpDocData(): array
20322022
new ParamTagValueNode(
20332023
new IdentifierTypeNode('Bar'),
20342024
false,
2035-
false,
20362025
'$bar',
20372026
'2nd multi world description with empty lines'
20382027
)
@@ -2066,7 +2055,6 @@ public function provideMultiLinePhpDocData(): array
20662055
new ParamTagValueNode(
20672056
new IdentifierTypeNode('int'),
20682057
false,
2069-
false,
20702058
'$foo',
20712059
'@param string $bar'
20722060
)
@@ -2982,7 +2970,6 @@ public function provideExtendsTagsData(): \Iterator
29822970
new ParamTagValueNode(
29832971
new IdentifierTypeNode('class-string'),
29842972
false,
2985-
false,
29862973
'$test',
29872974
''
29882975
)
@@ -2999,7 +2986,6 @@ public function provideExtendsTagsData(): \Iterator
29992986
new ParamTagValueNode(
30002987
new IdentifierTypeNode('class-string'),
30012988
false,
3002-
false,
30032989
'$test',
30042990
'some description'
30052991
)
@@ -3293,7 +3279,6 @@ public function provideRealWorldExampleData(): \Iterator
32933279
new ParamTagValueNode(
32943280
new IdentifierTypeNode('\Drupal\Core\Field\FieldStorageDefinitionInterface'),
32953281
false,
3296-
false,
32973282
'$field_definition',
32983283
''
32993284
)
@@ -3371,7 +3356,6 @@ public function provideRealWorldExampleData(): \Iterator
33713356
new ParamTagValueNode(
33723357
new IdentifierTypeNode('Request'),
33733358
false,
3374-
false,
33753359
'$request',
33763360
'- The request object'
33773361
)
@@ -3592,7 +3576,6 @@ public function dataParseTagValue(): array
35923576
new ParamTagValueNode(
35933577
new ConstTypeNode(new ConstFetchNode('DateTimeImmutable', 'ATOM')),
35943578
false,
3595-
false,
35963579
'$a',
35973580
''
35983581
),

0 commit comments

Comments
 (0)