bug symfony#30437 [Debug] detect annotations before blank docblock lines (xabbuh)

fabpot · fabpot · commit 9d791132d98c · 2019-03-04T12:21:48.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Debug] detect annotations before blank docblock lines | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | This fixes the tests and a small issue after the CS changes made in df1d50d for symfony#29920. Commits ------- dedd526 detect annotations before blank docblock lines
diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -233,7 +233,7 @@ public function checkAnnotations(\ReflectionClass $refl, $class)
         // Detect annotations on the class
         if (false !== $doc = $refl->getDocComment()) {
             foreach (['final', 'deprecated', 'internal'] as $annotation) {
-                if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$)#s', $doc, $notice)) {
+                if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$|\r?\n)#s', $doc, $notice)) {
                     self::${$annotation}[$class] = isset($notice[1]) ? preg_replace('#\.?\r?\n( \*)? *(?= |\r?\n|$)#', '', $notice[1]) : '';
                 }
             }
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/FinalClasses.php b/src/Symfony/Component/Debug/Tests/Fixtures/FinalClasses.php
@@ -64,7 +64,6 @@ class FinalClass6
  * @author John Doe
  *
  * @final another
- *
  *        multiline comment...
  *
  * @return string

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public function checkAnnotations(\ReflectionClass $refl, $class)`
`233`	`233`	`// Detect annotations on the class`
`234`	`234`	`if (false !== $doc = $refl->getDocComment()) {`
`235`	`235`	`foreach (['final', 'deprecated', 'internal'] as $annotation) {`
`236`		`- if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @\|/$)#s', $doc, $notice)) {`
	`236`	`+ if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @\|/$\|\r?\n)#s', $doc, $notice)) {`
`237`	`237`	`self::${$annotation}[$class] = isset($notice[1]) ? preg_replace('#\.?\r?\n( \)? (?= \|\r?\n\|$)#', '', $notice[1]) : '';`
`238`	`238`	`}`
`239`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@ class FinalClass6`
`64`	`64`	`* @author John Doe`
`65`	`65`	`*`
`66`	`66`	`* @final another`
`67`		`- *`
`68`	`67`	`* multiline comment...`
`69`	`68`	`*`
`70`	`69`	`* @return string`