Merge branch '3.4' into 4.2

* 3.4: [TwigBridge] remove deprecation triggered when using Twig 2.7
[TwigBridge] remove deprecation triggered when using Twig 2.7
2026-03-25 01:32:09 +01:00 · 2019-03-10 18:09:50 +01:00 · 2019-03-10 18:07:42 +01:00 · 2019-03-10 11:08:12 +01:00 · 2019-03-06 15:53:23 +01:00 · 2019-03-04 12:23:00 +01:00
3 changed files with 7 additions and 4 deletions
--- a/DebugClassLoader.php
+++ b/DebugClassLoader.php
@@ -232,7 +232,7 @@ class DebugClassLoader
        // 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]) : '';
                }
            }
@@ -257,7 +257,7 @@ class DebugClassLoader
            if (!isset(self::$checkedClasses[$use])) {
                $this->checkClass($use);
            }
-            if (isset(self::$deprecated[$use]) && \strncmp($ns, \str_replace('_', '\\', $use), $len)) {
+            if (isset(self::$deprecated[$use]) && \strncmp($ns, \str_replace('_', '\\', $use), $len) && !isset(self::$deprecated[$class])) {
                $type = class_exists($class, false) ? 'class' : (interface_exists($class, false) ? 'interface' : 'trait');
                $verb = class_exists($use, false) || interface_exists($class, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses');

@@ -324,7 +324,7 @@ class DebugClassLoader
            $finalOrInternal = false;

            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];
                    $finalOrInternal = true;
--- a/Tests/Fixtures/FinalClasses.php
+++ b/Tests/Fixtures/FinalClasses.php
@@ -30,6 +30,7 @@ class FinalClass3

 /**
 * @final
+ *
 * @author John Doe
 */
 class FinalClass4
@@ -63,7 +64,6 @@ class FinalClass6
 * @author John Doe
 *
 * @final another
- *
 *        multiline comment...
 *
 * @return string
@@ -76,6 +76,7 @@ class FinalClass7
 /**
 * @author John Doe
 * @final
+ *
 * @return string
 */
 class FinalClass8
--- a/Tests/Fixtures/FinalMethod.php
+++ b/Tests/Fixtures/FinalMethod.php
@@ -13,6 +13,8 @@ class FinalMethod

    /**
     * @final
+     *
+     * @return int
     */
    public function finalMethod2()
    {
Author	SHA1	Message	Date
Nicolas Grekas	43ce8ab34c	Merge branch '3.4' into 4.2 * 3.4: [TwigBridge] remove deprecation triggered when using Twig 2.7	2019-03-10 18:09:50 +01:00
Nicolas Grekas	adbdd5d663	[TwigBridge] remove deprecation triggered when using Twig 2.7	2019-03-10 18:07:42 +01:00
Nicolas Grekas	94eda15aa1	Merge branch '3.4' into 4.2 * 3.4: cs fix cs fix [PHPUnit-Bridge] override some environment variables [TwigBridge] Remove use spaceless tag [translation] Update defaut format from yml to yaml Change default log level for output streams update docblock to match the actual behavior compatibility with phpunit8 [Debug][DebugClassLoader] Detect annotations before blank docblock lines on final and internal methods Added translations for chineese language.	2019-03-10 11:08:12 +01:00
Thomas Calvet	a5961253fa	[Debug][DebugClassLoader] Detect annotations before blank docblock lines on final and internal methods	2019-03-06 15:53:23 +01:00
Fabien Potencier	26bccc04be	Merge branch '3.4' into 4.2 * 3.4: detect annotations before blank docblock lines	2019-03-04 12:23:00 +01:00
Christian Flothmann	878d05a2eb	detect annotations before blank docblock lines	2019-03-04 11:54:25 +01:00
Fabien Potencier	83e5508e9d	Merge branch '3.4' into 4.2 * 3.4: fixed CS removed suggestion [PropertyAccess] Fixed PropertyPathBuilder remove that fails to reset internal indexes bumped Symfony version to 3.4.24 updated VERSION for 3.4.23 update CONTRIBUTORS for 3.4.23 updated CHANGELOG for 3.4.23 [Routing][ServiceRouterLoader] Remove an outdated comment	2019-03-04 10:16:25 +01:00
Fabien Potencier	d5f9980171	fixed CS	2019-03-04 10:11:50 +01:00