Update phpdoc-parser to 1.6.0

phpstan · Jun 9, 2022 · ef8c7c3 · ef8c7c3
1 parent 0b5253d
commit ef8c7c3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
 		"ondram/ci-detector": "^3.4.0",
 		"ondrejmirtes/better-reflection": "5.3.0.16",
 		"phpstan/php-8-stubs": "0.3.14",
-		"phpstan/phpdoc-parser": "1.5.1",
+		"phpstan/phpdoc-parser": "1.6.0",
 		"react/child-process": "^0.6.4",
 		"react/event-loop": "^1.2",
 		"react/http": "^1.1",

diff --git a/composer.lock b/composer.lock
diff --git a/conf/bleedingEdge.neon b/conf/bleedingEdge.neon
@@ -14,3 +14,4 @@ parameters:
 		consistentConstructor: true
 		checkUnresolvableParameterTypes: true
 		readOnlyByPhpDoc: true
+		phpDocParserRequireWhitespaceBeforeDescription: true
diff --git a/conf/config.neon b/conf/config.neon
@@ -39,6 +39,7 @@ parameters:
 		consistentConstructor: false
 		checkUnresolvableParameterTypes: false
 		readOnlyByPhpDoc: false
+		phpDocParserRequireWhitespaceBeforeDescription: false
 	fileExtensions:
 		- php
 	checkAdvancedIsset: false
@@ -239,6 +240,7 @@ parametersSchema:
 		consistentConstructor: bool()
 		checkUnresolvableParameterTypes: bool()
 		readOnlyByPhpDoc: bool()
+		phpDocParserRequireWhitespaceBeforeDescription: bool()
 	])
 	fileExtensions: listOf(string())
 	checkAdvancedIsset: bool()
@@ -453,6 +455,8 @@ services:
 
 	-
 		class: PHPStan\PhpDocParser\Parser\PhpDocParser
+		arguments:
+			requireWhitespaceBeforeDescription: %featureToggles.phpDocParserRequireWhitespaceBeforeDescription%
 
 	-
 		class: PHPStan\PhpDoc\PhpDocInheritanceResolver

diff --git a/tests/PHPStan/Rules/PhpDoc/InvalidPhpDocTagValueRuleTest.php b/tests/PHPStan/Rules/PhpDoc/InvalidPhpDocTagValueRuleTest.php
@@ -28,14 +28,6 @@ public function testRule(): void
 				'PHPDoc tag @param has invalid value (): Unexpected token "\n * ", expected type at offset 13',
 				25,
 			],
-			[
-				'PHPDoc tag @param has invalid value ($invalid): Unexpected token "$invalid", expected type at offset 24',
-				25,
-			],
-			[
-				'PHPDoc tag @param has invalid value ($invalid Foo): Unexpected token "$invalid", expected type at offset 43',
-				25,
-			],
 			[
 				'PHPDoc tag @param has invalid value (A & B | C $paramNameA): Unexpected token "|", expected variable at offset 72',
 				25,
@@ -76,10 +68,10 @@ public function testRule(): void
 				'PHPDoc tag @var has invalid value (\\\Foo|\Bar $test): Unexpected token "\\\\\\\Foo|\\\Bar", expected type at offset 9',
 				29,
 			],
-			/*[
-				'PHPDoc tag @var has invalid value ...',
+			[
+				'PHPDoc tag @var has invalid value (callable(int)): Unexpected token "(", expected TOKEN_HORIZONTAL_WS at offset 17',
 				59,
-			],*/
+			],
 			[
 				'PHPDoc tag @var has invalid value ((Foo|Bar): Unexpected token "*/", expected \')\' at offset 18',
 				62,