diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php index 43fab03ca37da..21ede17aabea5 100644 --- 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 index a5786d2f82f6c..f63d85a615a2f 100644 --- 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 index 50d8b44d2a742..0ea9b9aad47fc 100644 --- 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 index 7a7aba0d69148..ce9fee7251d8a 100644 --- 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 index 216d9c92f10ed..29267116eee97 100644 --- 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 index 1bf2beeed5d1c..a9006165ad096 100644 --- 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 index 673f8199f9a2a..014154149fb2c 100644 --- 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 index 938d3ddabf256..e06f1b3976c4d 100644 --- 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 index 5456de33d2b6a..0aefed8f94899 100644 --- 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 index 97632a2bc420c..902e0a42a9b19 100644 --- 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 index a576a6dd6b152..15089d3c1dc03 100644 --- 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 index ab56f22a1efd6..2dbc4ec42aaaf 100644 --- 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 */ 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 index 5827640d5bd0d..eace52329e669 100644 --- 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 index c94912e35f683..863df15606735 100644 --- 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 index b48be3aae0163..227157335c6ee 100644 --- 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 index 49df52cff7e58..ba56d1275baa5 100644 --- 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 index ba5758f3f1bfc..bf8b81bd61d90 100644 --- 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 index 11eca517c5d69..9eeb305aee36c 100644 --- 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 index b50130ccbc5a9..0fcc9b3fd51f5 100644 --- 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 index d07e6e1c9dc9f..ff5568e021581 100644 --- 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 index d5b6d14c139a0..25d87353fd550 100644 --- 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 index e72335a5ececd..a327e94b3321e 100644 --- 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 index 9b736da23c44e..5c3ac6ca1b4f1 100644 --- a/src/Symfony/Bridge/Twig/Node/DumpNode.php +++ b/src/Symfony/Bridge/Twig/Node/DumpNode.php @@ -21,10 +21,12 @@ #[YieldReady] final class DumpNode extends Node { - private string $varPrefix; - - public function __construct(string $varPrefix, ?Node $values, int $lineno, ?string $tag = null) - { + public function __construct( + private string $varPrefix, + ?Node $values, + int $lineno, + ?string $tag = null, + ) { $nodes = []; if (null !== $values) { $nodes['values'] = $values; diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php index 66904b09b5303..4914506fd15ee 100644 --- a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php +++ b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php @@ -16,13 +16,12 @@ */ class Scope { - private ?self $parent; private array $data = []; private bool $left = false; - public function __construct(?self $parent = null) - { - $this->parent = $parent; + public function __construct( + private ?self $parent = null, + ) { } /** diff --git a/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php index b332485d02577..810e7c27232cc 100644 --- a/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php +++ b/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php @@ -24,11 +24,9 @@ */ final class StopwatchTokenParser extends AbstractTokenParser { - private bool $stopwatchIsAvailable; - - public function __construct(bool $stopwatchIsAvailable) - { - $this->stopwatchIsAvailable = $stopwatchIsAvailable; + public function __construct( + private bool $stopwatchIsAvailable, + ) { } public function parse(Token $token): Node diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php index 8a911ea03cfe9..a4b4bbe50ddab 100644 --- a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php +++ b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php @@ -38,11 +38,9 @@ class TwigExtractor extends AbstractFileExtractor implements ExtractorInterface */ private string $prefix = ''; - private Environment $twig; - - public function __construct(Environment $twig) - { - $this->twig = $twig; + public function __construct( + private Environment $twig, + ) { } public function extract($resource, MessageCatalogue $catalogue): void