Improved annotations parsing

slevomat · Jan 28, 2018 · 872ecd4 · 872ecd4
1 parent 2189ea4
commit 872ecd4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/SlevomatCodingStandard/Helpers/AnnotationHelper.php b/SlevomatCodingStandard/Helpers/AnnotationHelper.php
@@ -66,7 +66,7 @@ public static function getAnnotations(\PHP_CodeSniffer\Files\File $codeSnifferFi
 				$annotationName = $tokens[$i]['content'];
 				$annotationParameters = null;
 				$annotationContent = null;
-				if (preg_match('~^(@[a-zA-Z\\\\]+)(?:\(([^)]*)\))?(?:\\s+(.+))?($)~s', $annotationCode, $matches)) {
+				if (preg_match('~^(@[a-zA-Z\\\\]+)(?:\((.*?)\))?(?:\\s+(.+))?($)~s', $annotationCode, $matches)) {
 					$annotationName = $matches[1];
 					$annotationParameters = trim($matches[2]);
 					if ($annotationParameters === '') {

diff --git a/tests/Helpers/AnnotationHelperTest.php b/tests/Helpers/AnnotationHelperTest.php
@@ -70,6 +70,14 @@ public function testFunctionWithParametrizedAnnotation(): void
 		$this->assertNull($annotations[0]->getContent());
 	}
 
+	public function testFunctionWithParametrizedAnnotationContainingParenthesis(): void
+	{
+		$annotations = AnnotationHelper::getAnnotationsByName($this->getTestedCodeSnifferFile(), $this->findFunctionPointerByName($this->getTestedCodeSnifferFile(), 'withParametrizedAnnotationContainingParenthesis'), '@Security');
+		$this->assertCount(1, $annotations);
+		$this->assertSame('"is_granted(\'ROLE_ADMIN\')"', $annotations[0]->getParameters());
+		$this->assertNull($annotations[0]->getContent());
+	}
+
 	public function testFunctionWithMultilineParametrizedAnnotation(): void
 	{
 		$annotations = AnnotationHelper::getAnnotationsByName($this->getTestedCodeSnifferFile(), $this->findFunctionPointerByName($this->getTestedCodeSnifferFile(), 'withMultilineParametrizedAnnotation'), '@Route');

diff --git a/tests/Helpers/data/annotation.php b/tests/Helpers/data/annotation.php
@@ -36,6 +36,11 @@ public function withAnnotation($b, $c);
 	 */
 	public function withParametrizedAnnotation();
 
+	/**
+	 * @Security("is_granted('ROLE_ADMIN')")
+	 */
+	public function withParametrizedAnnotationContainingParenthesis();
+
 	/**
 	 * @Assert\Callback()
 	 */

diff --git a/tests/Sniffs/TypeHints/TypeHintDeclarationSniffTest.php b/tests/Sniffs/TypeHints/TypeHintDeclarationSniffTest.php
@@ -22,6 +22,7 @@ public function testNoErrors(): void
 				'@see',
 				'@Assert\Callback',
 				'@Something\\',
+				'@Security',
 			],
 		]));
 	}

diff --git a/tests/Sniffs/TypeHints/data/typeHintDeclarationNoErrors.php b/tests/Sniffs/TypeHints/data/typeHintDeclarationNoErrors.php
@@ -654,4 +654,12 @@ public function parameterHasDescriptionContainingVariable(bool $foo, int $bar) :
 	{
 	}
 
+	/**
+	 * @Security("is_granted('ROLE_ADMIN')")
+	 */
+	public function usefullSymfonySecurityAnnotation()
+	{
+
+	}
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ public function testNoErrors(): void @@
     				'@see',
     				'@Assert\Callback',
     				'@Something\\',
+    				'@Security',
     			],
     		]));
     	}
@@ Expand Down @@