Skip to content
Permalink
Browse files

bug #30437 [Debug] detect annotations before blank docblock lines (xa…

…bbuh)

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 #29920.

Commits
-------

dedd526 detect annotations before blank docblock lines
  • Loading branch information...
fabpot committed Mar 4, 2019
2 parents e3c0878 + dedd526 commit 9d791132d98c38ed87bc326d11eb9612ca2c2b49
@@ -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]) : '';
}
}
@@ -64,7 +64,6 @@ class FinalClass6
* @author John Doe
*
* @final another
*
* multiline comment...
*
* @return string

0 comments on commit 9d79113

Please sign in to comment.
You can’t perform that action at this time.