use deprecation catching error handler only when parsing Twig templates

xabbuh · xabbuh · commit 7bee0a81c6ab · 2025-04-30T12:53:06.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Validator/Constraints/TwigValidator.php b/src/Symfony/Bridge/Twig/Validator/Constraints/TwigValidator.php
@@ -45,37 +45,43 @@ public function validate(mixed $value, Constraint $constraint): void
 
         $value = (string) $value;
 
-        if (!$constraint->skipDeprecations) {
-            $prevErrorHandler = set_error_handler(static function ($level, $message, $file, $line) use (&$prevErrorHandler) {
-                if (\E_USER_DEPRECATED !== $level) {
-                    return $prevErrorHandler ? $prevErrorHandler($level, $message, $file, $line) : false;
-                }
-
-                $templateLine = 0;
-                if (preg_match('/ at line (\d+)[ .]/', $message, $matches)) {
-                    $templateLine = $matches[1];
-                }
-
-                throw new Error($message, $templateLine);
-            });
-        }
-
         $realLoader = $this->twig->getLoader();
         try {
             $temporaryLoader = new ArrayLoader([$value]);
             $this->twig->setLoader($temporaryLoader);
+
+            if (!$constraint->skipDeprecations) {
+                $prevErrorHandler = set_error_handler(static function ($level, $message, $file, $line) use (&$prevErrorHandler) {
+                    if (\E_USER_DEPRECATED !== $level) {
+                        return $prevErrorHandler ? $prevErrorHandler($level, $message, $file, $line) : false;
+                    }
+
+                    $templateLine = 0;
+                    if (preg_match('/ at line (\d+)[ .]/', $message, $matches)) {
+                        $templateLine = $matches[1];
+                    }
+
+                    throw new Error($message, $templateLine);
+                });
+            }
+
             $this->twig->parse($this->twig->tokenize(new Source($value, '')));
+
+            if (!$constraint->skipDeprecations) {
+                restore_error_handler();
+            }
         } catch (Error $e) {
+            if (!$constraint->skipDeprecations) {
+                restore_error_handler();
+            }
+
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ error }}', $e->getMessage())
                 ->setParameter('{{ line }}', $e->getTemplateLine())
                 ->setCode(Twig::INVALID_TWIG_ERROR)
                 ->addViolation();
         } finally {
             $this->twig->setLoader($realLoader);
-            if (!$constraint->skipDeprecations) {
-                restore_error_handler();
-            }
         }
     }
 }
