Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit f51b0b842c2e · 2023-11-07T13:59:59.000+01:00
* 6.4:
  [TwigBridge] Fix `@internal` annotation
  the debug log processor must be a callable
diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
@@ -23,7 +23,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @internal
+ * @internal since Symfony 6.4
  */
 final class CodeExtension extends AbstractExtension
 {
diff --git a/src/Symfony/Component/HttpKernel/Log/DebugLoggerConfigurator.php b/src/Symfony/Component/HttpKernel/Log/DebugLoggerConfigurator.php
@@ -18,12 +18,12 @@
  */
 class DebugLoggerConfigurator
 {
-    private ?DebugLoggerInterface $processor = null;
+    private ?\Closure $processor = null;
 
-    public function __construct(DebugLoggerInterface $processor, bool $enable = null)
+    public function __construct(callable $processor, bool $enable = null)
     {
         if ($enable ?? !\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
-            $this->processor = $processor;
+            $this->processor = $processor(...);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*`
`24`	`24`	`* @author Fabien Potencier <fabien@symfony.com>`
`25`	`25`	`*`
`26`		`- * @internal`
	`26`	`+ * @internal since Symfony 6.4`
`27`	`27`	`*/`
`28`	`28`	`final class CodeExtension extends AbstractExtension`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@`
`18`	`18`	`*/`
`19`	`19`	`class DebugLoggerConfigurator`
`20`	`20`	`{`
`21`		`- private ?DebugLoggerInterface $processor = null;`
	`21`	`+ private ?\Closure $processor = null;`
`22`	`22`
`23`		`- public function __construct(DebugLoggerInterface $processor, bool $enable = null)`
	`23`	`+ public function __construct(callable $processor, bool $enable = null)`
`24`	`24`	`{`
`25`	`25`	`if ($enable ?? !\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {`
`26`		`- $this->processor = $processor;`
	`26`	`+ $this->processor = $processor(...);`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`