Skip to content

Commit bfa5991

Browse files
committed
single-line comments only
1 parent 1c3f514 commit bfa5991

File tree

4 files changed

+9
-352
lines changed

4 files changed

+9
-352
lines changed

src/Lexer/Lexer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private function generateRegexp(): string
163163
self::TOKEN_CLOSE_CURLY_BRACKET => '\\}',
164164

165165
self::TOKEN_COMMA => ',',
166-
self::TOKEN_COMMENT => '((?<![:/])\/\/[^\n]*|\/\*(?!\*)[^*]*\*+([^\/][^*]*\*+)*\/)',
166+
self::TOKEN_COMMENT => '((?<![:/])\/\/[^\n]*)',
167167
self::TOKEN_VARIADIC => '\\.\\.\\.',
168168
self::TOKEN_DOUBLE_COLON => '::',
169169
self::TOKEN_DOUBLE_ARROW => '=>',

tests/PHPStan/Parser/TypeParserTest.php

-63
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,6 @@ public function provideParseData(): array
148148
),
149149
]),
150150
],
151-
[
152-
'array{
153-
/* a is for apple */ /* and also for aardvark */
154-
a: int,
155-
}',
156-
new ArrayShapeNode([
157-
new ArrayShapeItemNode(
158-
new IdentifierTypeNode('a'),
159-
false,
160-
new IdentifierTypeNode('int')
161-
),
162-
]),
163-
],
164151
[
165152
'array{
166153
// a is for apple
@@ -175,35 +162,6 @@ public function provideParseData(): array
175162
),
176163
]),
177164
],
178-
[
179-
'array{
180-
/* a is also for aardvark */
181-
a: int,
182-
}',
183-
new ArrayShapeNode([
184-
new ArrayShapeItemNode(
185-
new IdentifierTypeNode('a'),
186-
false,
187-
new IdentifierTypeNode('int')
188-
),
189-
]),
190-
],
191-
[
192-
'array{
193-
/*
194-
* a is also for aardvark, and
195-
* armadillo, among other things
196-
*/
197-
a: int,
198-
}',
199-
new ArrayShapeNode([
200-
new ArrayShapeItemNode(
201-
new IdentifierTypeNode('a'),
202-
false,
203-
new IdentifierTypeNode('int')
204-
),
205-
]),
206-
],
207165
[
208166
'string',
209167
new IdentifierTypeNode('string'),
@@ -1981,27 +1939,6 @@ public function provideParseData(): array
19811939
),
19821940
]),
19831941
],
1984-
[
1985-
'object{
1986-
a: int,
1987-
/*
1988-
* b is for banana
1989-
*/
1990-
b: string,
1991-
}',
1992-
new ObjectShapeNode([
1993-
new ObjectShapeItemNode(
1994-
new IdentifierTypeNode('a'),
1995-
false,
1996-
new IdentifierTypeNode('int')
1997-
),
1998-
new ObjectShapeItemNode(
1999-
new IdentifierTypeNode('b'),
2000-
false,
2001-
new IdentifierTypeNode('string')
2002-
),
2003-
]),
2004-
],
20051942
[
20061943
'object{
20071944
a: int

tests/PHPStan/Printer/PrintArrayShapeWithBlockCommentTest.php

-267
This file was deleted.

0 commit comments

Comments
 (0)