From e97ea77af5e613ca11dd5e7bd66c27dbd41e2253 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Wed, 6 Mar 2019 15:53:23 +0100
Subject: [PATCH] [Debug][DebugClassLoader] Detect annotations before blank
 docblock lines on final and internal methods

---
 src/Symfony/Component/Debug/DebugClassLoader.php           | 2 +-
 src/Symfony/Component/Debug/Tests/Fixtures/FinalMethod.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
index e6ae0920736d..87071530c614 100644
--- 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
index 98a47524c43e..595dd0a887fb 100644
--- 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()
     {