[Debug][DebugClassLoader] Detect annotations before blank docblock lines on final and internal methods

fancyweb · fancyweb · commit e97ea77af5e6 · 2019-03-06T15:53:23.000+01:00
diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -307,7 +307,7 @@ public function checkAnnotations(\ReflectionClass $refl, $class)
             }
 
             foreach (['final', '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)) {
                     $message = isset($notice[1]) ? preg_replace('#\.?\r?\n( \*)? *(?= |\r?\n|$)#', '', $notice[1]) : '';
                     self::${$annotation.'Methods'}[$class][$method->name] = [$class, $message];
                 }
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/FinalMethod.php b/src/Symfony/Component/Debug/Tests/Fixtures/FinalMethod.php
@@ -13,6 +13,8 @@ public function finalMethod()
 
     /**
      * @final
+     *
+     * @return int
      */
     public function finalMethod2()
     {

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ public function checkAnnotations(\ReflectionClass $refl, $class)`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`foreach (['final', 'internal'] as $annotation) {`
`310`		`- if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @\|/$)#s', $doc, $notice)) {`
	`310`	`+ if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @\|/$\|\r?\n)#s', $doc, $notice)) {`
`311`	`311`	`$message = isset($notice[1]) ? preg_replace('#\.?\r?\n( \)? (?= \|\r?\n\|$)#', '', $notice[1]) : '';`
`312`	`312`	`self::${$annotation.'Methods'}[$class][$method->name] = [$class, $message];`
`313`	`313`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ public function finalMethod()`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* @final`
	`16`	`+ *`
	`17`	`+ * @return int`
`16`	`18`	`*/`
`17`	`19`	`public function finalMethod2()`
`18`	`20`	`{`