minor #54244 [TwigBridge] Use CPP (connorhu)

nicolas-grekas · nicolas-grekas · commit d508d5f3a91b · 2024-03-12T13:09:04.000+01:00
This PR was squashed before being merged into the 7.1 branch. Discussion ---------- [TwigBridge] Use CPP | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | N/A | License | MIT I can also help with this kind of thing. So here we are. Commits ------- d4f8f39 [TwigBridge] Use CPP
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -36,27 +36,19 @@
 #[AsCommand(name: 'debug:twig', description: 'Show a list of twig functions, filters, globals and tests')]
 class DebugCommand extends Command
 {
-    private Environment $twig;
-    private ?string $projectDir;
-    private array $bundlesMetadata;
-    private ?string $twigDefaultPath;
-
     /**
      * @var FilesystemLoader[]
      */
     private array $filesystemLoaders;
 
-    private ?FileLinkFormatter $fileLinkFormatter;
-
-    public function __construct(Environment $twig, ?string $projectDir = null, array $bundlesMetadata = [], ?string $twigDefaultPath = null, ?FileLinkFormatter $fileLinkFormatter = null)
-    {
+    public function __construct(
+        private Environment $twig,
+        private ?string $projectDir = null,
+        private array $bundlesMetadata = [],
+        private ?string $twigDefaultPath = null,
+        private ?FileLinkFormatter $fileLinkFormatter = null,
+    ) {
         parent::__construct();
-
-        $this->twig = $twig;
-        $this->projectDir = $projectDir;
-        $this->bundlesMetadata = $bundlesMetadata;
-        $this->twigDefaultPath = $twigDefaultPath;
-        $this->fileLinkFormatter = $fileLinkFormatter;
     }
 
     protected function configure(): void
diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
@@ -28,14 +28,12 @@
  */
 class TwigDataCollector extends DataCollector implements LateDataCollectorInterface
 {
-    private Profile $profile;
-    private ?Environment $twig;
     private array $computed;
 
-    public function __construct(Profile $profile, ?Environment $twig = null)
-    {
-        $this->profile = $profile;
-        $this->twig = $twig;
+    public function __construct(
+        private Profile $profile,
+        private ?Environment $twig = null,
+    ) {
     }
 
     public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
diff --git a/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php b/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php
@@ -25,16 +25,17 @@
  */
 class TwigErrorRenderer implements ErrorRendererInterface
 {
-    private Environment $twig;
     private HtmlErrorRenderer $fallbackErrorRenderer;
     private \Closure|bool $debug;
 
     /**
      * @param bool|callable $debug The debugging mode as a boolean or a callable that should return it
      */
-    public function __construct(Environment $twig, ?HtmlErrorRenderer $fallbackErrorRenderer = null, bool|callable $debug = false)
-    {
-        $this->twig = $twig;
+    public function __construct(
+        private Environment $twig,
+        ?HtmlErrorRenderer $fallbackErrorRenderer = null,
+        bool|callable $debug = false,
+    ) {
         $this->fallbackErrorRenderer = $fallbackErrorRenderer ?? new HtmlErrorRenderer();
         $this->debug = \is_bool($debug) ? $debug : $debug(...);
     }
diff --git a/src/Symfony/Bridge/Twig/Extension/AssetExtension.php b/src/Symfony/Bridge/Twig/Extension/AssetExtension.php
@@ -22,11 +22,9 @@
  */
 final class AssetExtension extends AbstractExtension
 {
-    private Packages $packages;
-
-    public function __construct(Packages $packages)
-    {
-        $this->packages = $packages;
+    public function __construct(
+        private Packages $packages,
+    ) {
     }
 
     public function getFunctions(): array
diff --git a/src/Symfony/Bridge/Twig/Extension/CsrfRuntime.php b/src/Symfony/Bridge/Twig/Extension/CsrfRuntime.php
@@ -19,11 +19,9 @@
  */
 final class CsrfRuntime
 {
-    private CsrfTokenManagerInterface $csrfTokenManager;
-
-    public function __construct(CsrfTokenManagerInterface $csrfTokenManager)
-    {
-        $this->csrfTokenManager = $csrfTokenManager;
+    public function __construct(
+        private CsrfTokenManagerInterface $csrfTokenManager,
+    ) {
     }
 
     public function getCsrfToken(string $tokenId): string
diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php
@@ -26,13 +26,10 @@
  */
 final class DumpExtension extends AbstractExtension
 {
-    private ClonerInterface $cloner;
-    private ?HtmlDumper $dumper;
-
-    public function __construct(ClonerInterface $cloner, ?HtmlDumper $dumper = null)
-    {
-        $this->cloner = $cloner;
-        $this->dumper = $dumper;
+    public function __construct(
+        private ClonerInterface $cloner,
+        private ?HtmlDumper $dumper = null,
+    ) {
     }
 
     public function getFunctions(): array
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -33,11 +33,9 @@
  */
 final class FormExtension extends AbstractExtension
 {
-    private ?TranslatorInterface $translator;
-
-    public function __construct(?TranslatorInterface $translator = null)
-    {
-        $this->translator = $translator;
+    public function __construct(
+        private ?TranslatorInterface $translator = null,
+    ) {
     }
 
     public function getTokenParsers(): array
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
@@ -23,11 +23,9 @@
  */
 final class HttpFoundationExtension extends AbstractExtension
 {
-    private UrlHelper $urlHelper;
-
-    public function __construct(UrlHelper $urlHelper)
-    {
-        $this->urlHelper = $urlHelper;
+    public function __construct(
+        private UrlHelper $urlHelper,
+    ) {
     }
 
     public function getFunctions(): array
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php
@@ -22,13 +22,10 @@
  */
 final class HttpKernelRuntime
 {
-    private FragmentHandler $handler;
-    private ?FragmentUriGeneratorInterface $fragmentUriGenerator;
-
-    public function __construct(FragmentHandler $handler, ?FragmentUriGeneratorInterface $fragmentUriGenerator = null)
-    {
-        $this->handler = $handler;
-        $this->fragmentUriGenerator = $fragmentUriGenerator;
+    public function __construct(
+        private FragmentHandler $handler,
+        private ?FragmentUriGeneratorInterface $fragmentUriGenerator = null,
+    ) {
     }
 
     /**
diff --git a/src/Symfony/Bridge/Twig/Extension/ImportMapRuntime.php b/src/Symfony/Bridge/Twig/Extension/ImportMapRuntime.php
@@ -18,8 +18,9 @@
  */
 class ImportMapRuntime
 {
-    public function __construct(private readonly ImportMapRenderer $importMapRenderer)
-    {
+    public function __construct(
+        private readonly ImportMapRenderer $importMapRenderer,
+    ) {
     }
 
     public function importmap(string|array $entryPoint = 'app', array $attributes = []): string
diff --git a/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php b/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php
@@ -22,11 +22,9 @@
  */
 final class LogoutUrlExtension extends AbstractExtension
 {
-    private LogoutUrlGenerator $generator;
-
-    public function __construct(LogoutUrlGenerator $generator)
-    {
-        $this->generator = $generator;
+    public function __construct(
+        private LogoutUrlGenerator $generator,
+    ) {
     }
 
     public function getFunctions(): array
diff --git a/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php b/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php
@@ -21,18 +21,17 @@
  */
 final class ProfilerExtension extends BaseProfilerExtension
 {
-    private ?Stopwatch $stopwatch;
-
     /**
      * @var \SplObjectStorage<Profile, StopwatchEvent>
      */
     private \SplObjectStorage $events;
 
-    public function __construct(Profile $profile, ?Stopwatch $stopwatch = null)
-    {
+    public function __construct(
+        Profile $profile,
+        private ?Stopwatch $stopwatch = null,
+    ) {
         parent::__construct($profile);
 
-        $this->stopwatch = $stopwatch;
         $this->events = new \SplObjectStorage();
     }
 
diff --git a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
@@ -25,11 +25,9 @@
  */
 final class RoutingExtension extends AbstractExtension
 {
-    private UrlGeneratorInterface $generator;
-
-    public function __construct(UrlGeneratorInterface $generator)
-    {
-        $this->generator = $generator;
+    public function __construct(
+        private UrlGeneratorInterface $generator,
+    ) {
     }
 
     public function getFunctions(): array
diff --git a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php
@@ -25,13 +25,10 @@
  */
 final class SecurityExtension extends AbstractExtension
 {
-    private ?AuthorizationCheckerInterface $securityChecker;
-    private ?ImpersonateUrlGenerator $impersonateUrlGenerator;
-
-    public function __construct(?AuthorizationCheckerInterface $securityChecker = null, ?ImpersonateUrlGenerator $impersonateUrlGenerator = null)
-    {
-        $this->securityChecker = $securityChecker;
-        $this->impersonateUrlGenerator = $impersonateUrlGenerator;
+    public function __construct(
+        private ?AuthorizationCheckerInterface $securityChecker = null,
+        private ?ImpersonateUrlGenerator $impersonateUrlGenerator = null,
+    ) {
     }
 
     public function isGranted(mixed $role, mixed $object = null, ?string $field = null): bool
diff --git a/src/Symfony/Bridge/Twig/Extension/SerializerRuntime.php b/src/Symfony/Bridge/Twig/Extension/SerializerRuntime.php
@@ -19,11 +19,9 @@
  */
 final class SerializerRuntime implements RuntimeExtensionInterface
 {
-    private SerializerInterface $serializer;
-
-    public function __construct(SerializerInterface $serializer)
-    {
-        $this->serializer = $serializer;
+    public function __construct(
+        private SerializerInterface $serializer,
+    ) {
     }
 
     public function serialize(mixed $data, string $format = 'json', array $context = []): string
diff --git a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php
@@ -23,13 +23,10 @@
  */
 final class StopwatchExtension extends AbstractExtension
 {
-    private ?Stopwatch $stopwatch;
-    private bool $enabled;
-
-    public function __construct(?Stopwatch $stopwatch = null, bool $enabled = true)
-    {
-        $this->stopwatch = $stopwatch;
-        $this->enabled = $enabled;
+    public function __construct(
+        private ?Stopwatch $stopwatch = null,
+        private bool $enabled = true,
+    ) {
     }
 
     public function getStopwatch(): Stopwatch
diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -34,13 +34,10 @@ class_exists(TranslatorTrait::class);
  */
 final class TranslationExtension extends AbstractExtension
 {
-    private ?TranslatorInterface $translator;
-    private ?TranslationNodeVisitor $translationNodeVisitor;
-
-    public function __construct(?TranslatorInterface $translator = null, ?TranslationNodeVisitor $translationNodeVisitor = null)
-    {
-        $this->translator = $translator;
-        $this->translationNodeVisitor = $translationNodeVisitor;
+    public function __construct(
+        private ?TranslatorInterface $translator = null,
+        private ?TranslationNodeVisitor $translationNodeVisitor = null,
+    ) {
     }
 
     public function getTranslator(): TranslatorInterface
diff --git a/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php b/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php
@@ -24,11 +24,9 @@
  */
 final class WebLinkExtension extends AbstractExtension
 {
-    private RequestStack $requestStack;
-
-    public function __construct(RequestStack $requestStack)
-    {
-        $this->requestStack = $requestStack;
+    public function __construct(
+        private RequestStack $requestStack,
+    ) {
     }
 
     public function getFunctions(): array
diff --git a/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php b/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php
@@ -25,11 +25,9 @@
  */
 final class WorkflowExtension extends AbstractExtension
 {
-    private Registry $workflowRegistry;
-
-    public function __construct(Registry $workflowRegistry)
-    {
-        $this->workflowRegistry = $workflowRegistry;
+    public function __construct(
+        private Registry $workflowRegistry,
+    ) {
     }
 
     public function getFunctions(): array
diff --git a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
@@ -21,13 +21,13 @@
  */
 class TwigRendererEngine extends AbstractRendererEngine
 {
-    private Environment $environment;
     private Template $template;
 
-    public function __construct(array $defaultThemes, Environment $environment)
-    {
+    public function __construct(
+        array $defaultThemes,
+        private Environment $environment,
+    ) {
         parent::__construct($defaultThemes);
-        $this->environment = $environment;
     }
 
     public function renderBlock(FormView $view, mixed $resource, string $blockName, array $variables = []): string
diff --git a/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php b/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php
@@ -26,17 +26,15 @@
  */
 final class BodyRenderer implements BodyRendererInterface
 {
-    private Environment $twig;
-    private array $context;
     private HtmlToTextConverterInterface $converter;
-    private ?LocaleSwitcher $localeSwitcher = null;
 
-    public function __construct(Environment $twig, array $context = [], ?HtmlToTextConverterInterface $converter = null, ?LocaleSwitcher $localeSwitcher = null)
-    {
-        $this->twig = $twig;
-        $this->context = $context;
+    public function __construct(
+        private Environment $twig,
+        private array $context = [],
+        ?HtmlToTextConverterInterface $converter = null,
+        private ?LocaleSwitcher $localeSwitcher = null,
+    ) {
         $this->converter = $converter ?: (interface_exists(HtmlConverterInterface::class) ? new LeagueHtmlToMarkdownConverter() : new DefaultHtmlToTextConverter());
-        $this->localeSwitcher = $localeSwitcher;
     }
 
     public function render(Message $message): void
diff --git a/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php b/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php
@@ -23,13 +23,10 @@
  */
 final class WrappedTemplatedEmail
 {
-    private Environment $twig;
-    private TemplatedEmail $message;
-
-    public function __construct(Environment $twig, TemplatedEmail $message)
-    {
-        $this->twig = $twig;
-        $this->message = $message;
+    public function __construct(
+        private Environment $twig,
+        private TemplatedEmail $message,
+    ) {
     }
 
     public function toName(): string
diff --git a/src/Symfony/Bridge/Twig/Node/DumpNode.php b/src/Symfony/Bridge/Twig/Node/DumpNode.php
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
diff --git a/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php
diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,9 @@`
`22`	`22`	`*/`
`23`	`23`	`final class AssetExtension extends AbstractExtension`
`24`	`24`	`{`
`25`		`- private Packages $packages;`
`26`		`-`
`27`		`- public function __construct(Packages $packages)`
`28`		`- {`
`29`		`- $this->packages = $packages;`
	`25`	`+ public function __construct(`
	`26`	`+ private Packages $packages,`
	`27`	`+ ) {`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`public function getFunctions(): array`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,9 @@`
`19`	`19`	`*/`
`20`	`20`	`final class CsrfRuntime`
`21`	`21`	`{`
`22`		`- private CsrfTokenManagerInterface $csrfTokenManager;`
`23`		`-`
`24`		`- public function __construct(CsrfTokenManagerInterface $csrfTokenManager)`
`25`		`- {`
`26`		`- $this->csrfTokenManager = $csrfTokenManager;`
	`22`	`+ public function __construct(`
	`23`	`+ private CsrfTokenManagerInterface $csrfTokenManager,`
	`24`	`+ ) {`
`27`	`25`	`}`
`28`	`26`
`29`	`27`	`public function getCsrfToken(string $tokenId): string`
Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,9 @@`
`33`	`33`	`*/`
`34`	`34`	`final class FormExtension extends AbstractExtension`
`35`	`35`	`{`
`36`		`- private ?TranslatorInterface $translator;`
`37`		`-`
`38`		`- public function __construct(?TranslatorInterface $translator = null)`
`39`		`- {`
`40`		`- $this->translator = $translator;`
	`36`	`+ public function __construct(`
	`37`	`+ private ?TranslatorInterface $translator = null,`
	`38`	`+ ) {`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`public function getTokenParsers(): array`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,9 @@`
`23`	`23`	`*/`
`24`	`24`	`final class HttpFoundationExtension extends AbstractExtension`
`25`	`25`	`{`
`26`		`- private UrlHelper $urlHelper;`
`27`		`-`
`28`		`- public function __construct(UrlHelper $urlHelper)`
`29`		`- {`
`30`		`- $this->urlHelper = $urlHelper;`
	`26`	`+ public function __construct(`
	`27`	`+ private UrlHelper $urlHelper,`
	`28`	`+ ) {`
`31`	`29`	`}`
`32`	`30`
`33`	`31`	`public function getFunctions(): array`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,9 @@`
`18`	`18`	`*/`
`19`	`19`	`class ImportMapRuntime`
`20`	`20`	`{`
`21`		`- public function __construct(private readonly ImportMapRenderer $importMapRenderer)`
`22`		`- {`
	`21`	`+ public function __construct(`
	`22`	`+ private readonly ImportMapRenderer $importMapRenderer,`
	`23`	`+ ) {`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`public function importmap(string\|array $entryPoint = 'app', array $attributes = []): string`