PHP 8 syntax in bundles #1

Sylius · Feb 3, 2022 · cc311a0 · cc311a0
1 parent c21aa88
commit cc311a0
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 121 deletions.
diff --git a/Block/BlockEventListener.php b/Block/BlockEventListener.php
@@ -21,16 +21,12 @@
  */
 final class BlockEventListener
 {
-    private string $template;
-
-    public function __construct(string $template)
+    public function __construct(private string $template)
     {
         @trigger_error(
             sprintf('Using "%s" to add blocks to the templates is deprecated since Sylius 1.7 and will be removed in Sylius 2.0. Use "sylius_ui" configuration instead.', self::class),
             \E_USER_DEPRECATED
         );
-
-        $this->template = $template;
     }
 
     public function onBlockEvent(BlockEvent $event): void

diff --git a/Command/DebugTemplateEventCommand.php b/Command/DebugTemplateEventCommand.php
@@ -28,13 +28,9 @@ final class DebugTemplateEventCommand extends Command
 {
     protected static $defaultName = 'sylius:debug:template-event';
 
-    private TemplateBlockRegistryInterface $templateBlockRegistry;
-
-    public function __construct(TemplateBlockRegistryInterface $templateBlockRegistry)
+    public function __construct(private TemplateBlockRegistryInterface $templateBlockRegistry)
     {
         parent::__construct();
-
-        $this->templateBlockRegistry = $templateBlockRegistry;
     }
 
     protected function configure(): void

diff --git a/Controller/SecurityController.php b/Controller/SecurityController.php
@@ -26,32 +26,11 @@
 
 final class SecurityController
 {
-    private AuthenticationUtils $authenticationUtils;
-
-    private FormFactoryInterface $formFactory;
-
-    /** @var EngineInterface|Environment */
-    private $templatingEngine;
-
-    private AuthorizationCheckerInterface $authorizationChecker;
-
-    private RouterInterface $router;
-
     /**
      * @param EngineInterface|Environment $templatingEngine
      */
-    public function __construct(
-        AuthenticationUtils $authenticationUtils,
-        FormFactoryInterface $formFactory,
-        object $templatingEngine,
-        AuthorizationCheckerInterface $authorizationChecker,
-        RouterInterface $router
-    ) {
-        $this->authenticationUtils = $authenticationUtils;
-        $this->formFactory = $formFactory;
-        $this->templatingEngine = $templatingEngine;
-        $this->authorizationChecker = $authorizationChecker;
-        $this->router = $router;
+    public function __construct(private AuthenticationUtils $authenticationUtils, private FormFactoryInterface $formFactory, private object $templatingEngine, private AuthorizationCheckerInterface $authorizationChecker, private RouterInterface $router)
+    {
     }
 
     public function loginAction(Request $request): Response

diff --git a/DataCollector/TemplateBlockDataCollector.php b/DataCollector/TemplateBlockDataCollector.php
@@ -23,11 +23,8 @@
  */
 final class TemplateBlockDataCollector extends DataCollector
 {
-    private TemplateBlockRenderingHistory $templateBlockRenderingHistory;
-
-    public function __construct(TemplateBlockRenderingHistory $templateBlockRenderingHistory)
+    public function __construct(private TemplateBlockRenderingHistory $templateBlockRenderingHistory)
     {
-        $this->templateBlockRenderingHistory = $templateBlockRenderingHistory;
         $this->reset();
     }
 

diff --git a/DataCollector/TraceableTemplateBlockRenderer.php b/DataCollector/TraceableTemplateBlockRenderer.php
@@ -22,14 +22,8 @@
  */
 final class TraceableTemplateBlockRenderer implements TemplateBlockRendererInterface
 {
-    private TemplateBlockRendererInterface $templateBlockRenderer;
-
-    private TemplateBlockRenderingHistory $templateBlockRenderingHistory;
-
-    public function __construct(TemplateBlockRendererInterface $templateBlockRenderer, TemplateBlockRenderingHistory $templateBlockRenderingHistory)
+    public function __construct(private TemplateBlockRendererInterface $templateBlockRenderer, private TemplateBlockRenderingHistory $templateBlockRenderingHistory)
     {
-        $this->templateBlockRenderer = $templateBlockRenderer;
-        $this->templateBlockRenderingHistory = $templateBlockRenderingHistory;
     }
 
     public function render(TemplateBlock $templateBlock, array $context = []): string

diff --git a/DataCollector/TraceableTemplateEventRenderer.php b/DataCollector/TraceableTemplateEventRenderer.php
@@ -21,14 +21,8 @@
  */
 final class TraceableTemplateEventRenderer implements TemplateEventRendererInterface
 {
-    private TemplateEventRendererInterface $templateEventRenderer;
-
-    private TemplateBlockRenderingHistory $templateBlockRenderingHistory;
-
-    public function __construct(TemplateEventRendererInterface $templateEventRenderer, TemplateBlockRenderingHistory $templateBlockRenderingHistory)
+    public function __construct(private TemplateEventRendererInterface $templateEventRenderer, private TemplateBlockRenderingHistory $templateBlockRenderingHistory)
     {
-        $this->templateEventRenderer = $templateEventRenderer;
-        $this->templateBlockRenderingHistory = $templateBlockRenderingHistory;
     }
 
     public function render(array $eventNames, array $context = []): string

diff --git a/Menu/Event/MenuBuilderEvent.php b/Menu/Event/MenuBuilderEvent.php
@@ -19,14 +19,8 @@
 
 class MenuBuilderEvent extends Event
 {
-    private FactoryInterface $factory;
-
-    private ItemInterface $menu;
-
-    public function __construct(FactoryInterface $factory, ItemInterface $menu)
+    public function __construct(private FactoryInterface $factory, private ItemInterface $menu)
     {
-        $this->factory = $factory;
-        $this->menu = $menu;
     }
 
     public function getFactory(): FactoryInterface

diff --git a/Registry/TemplateBlock.php b/Registry/TemplateBlock.php
@@ -18,32 +18,8 @@
  */
 final class TemplateBlock
 {
-    private string $name;
-
-    private string $eventName;
-
-    private ?string $template;
-
-    private ?array $context;
-
-    private ?int $priority;
-
-    private ?bool $enabled;
-
-    public function __construct(
-        string $name,
-        string $eventName,
-        ?string $template,
-        ?array $context,
-        ?int $priority,
-        ?bool $enabled
-    ) {
-        $this->name = $name;
-        $this->eventName = $eventName;
-        $this->template = $template;
-        $this->context = $context;
-        $this->priority = $priority;
-        $this->enabled = $enabled;
+    public function __construct(private string $name, private string $eventName, private ?string $template, private ?array $context, private ?int $priority, private ?bool $enabled)
+    {
     }
 
     public function getName(): string

diff --git a/Renderer/DelegatingTemplateEventRenderer.php b/Renderer/DelegatingTemplateEventRenderer.php
@@ -20,14 +20,8 @@
  */
 final class DelegatingTemplateEventRenderer implements TemplateEventRendererInterface
 {
-    private TemplateBlockRegistryInterface $templateBlockRegistry;
-
-    private TemplateBlockRendererInterface $templateBlockRenderer;
-
-    public function __construct(TemplateBlockRegistryInterface $templateBlockRegistry, TemplateBlockRendererInterface $templateBlockRenderer)
+    public function __construct(private TemplateBlockRegistryInterface $templateBlockRegistry, private TemplateBlockRendererInterface $templateBlockRenderer)
     {
-        $this->templateBlockRegistry = $templateBlockRegistry;
-        $this->templateBlockRenderer = $templateBlockRenderer;
     }
 
     public function render(array $eventNames, array $context = []): string

diff --git a/Renderer/HtmlDebugTemplateBlockRenderer.php b/Renderer/HtmlDebugTemplateBlockRenderer.php
@@ -20,11 +20,8 @@
  */
 final class HtmlDebugTemplateBlockRenderer implements TemplateBlockRendererInterface
 {
-    private TemplateBlockRendererInterface $templateBlockRenderer;
-
-    public function __construct(TemplateBlockRendererInterface $templateBlockRenderer)
+    public function __construct(private TemplateBlockRendererInterface $templateBlockRenderer)
     {
-        $this->templateBlockRenderer = $templateBlockRenderer;
     }
 
     public function render(TemplateBlock $templateBlock, array $context = []): string

diff --git a/Renderer/HtmlDebugTemplateEventRenderer.php b/Renderer/HtmlDebugTemplateEventRenderer.php
@@ -21,14 +21,8 @@
  */
 final class HtmlDebugTemplateEventRenderer implements TemplateEventRendererInterface
 {
-    private TemplateEventRendererInterface $templateEventRenderer;
-
-    private TemplateBlockRegistryInterface $templateBlockRegistry;
-
-    public function __construct(TemplateEventRendererInterface $templateEventRenderer, TemplateBlockRegistryInterface $templateBlockRegistry)
+    public function __construct(private TemplateEventRendererInterface $templateEventRenderer, private TemplateBlockRegistryInterface $templateBlockRegistry)
     {
-        $this->templateEventRenderer = $templateEventRenderer;
-        $this->templateBlockRegistry = $templateBlockRegistry;
     }
 
     public function render(array $eventNames, array $context = []): string

diff --git a/Renderer/TwigTemplateBlockRenderer.php b/Renderer/TwigTemplateBlockRenderer.php
@@ -21,11 +21,8 @@
  */
 final class TwigTemplateBlockRenderer implements TemplateBlockRendererInterface
 {
-    private Environment $twig;
-
-    public function __construct(Environment $twig)
+    public function __construct(private Environment $twig)
     {
-        $this->twig = $twig;
     }
 
     public function render(TemplateBlock $templateBlock, array $context = []): string

diff --git a/Twig/TemplateEventExtension.php b/Twig/TemplateEventExtension.php
@@ -22,11 +22,8 @@
  */
 final class TemplateEventExtension extends AbstractExtension
 {
-    private TemplateEventRendererInterface $templateEventRenderer;
-
-    public function __construct(TemplateEventRendererInterface $templateEventRenderer)
+    public function __construct(private TemplateEventRendererInterface $templateEventRenderer)
     {
-        $this->templateEventRenderer = $templateEventRenderer;
     }
 
     public function getFunctions(): array
@@ -39,7 +36,7 @@ public function getFunctions(): array
     /**
      * @param string|string[] $eventName
      */
-    public function render($eventName, array $context = []): string
+    public function render(string|array $eventName, array $context = []): string
     {
         return $this->templateEventRenderer->render((array) $eventName, $context);
     }

diff --git a/Twig/TestFormAttributeExtension.php b/Twig/TestFormAttributeExtension.php
@@ -18,11 +18,8 @@
 
 final class TestFormAttributeExtension extends AbstractExtension
 {
-    private string $environment;
-
-    public function __construct(string $environment)
+    public function __construct(private string $environment)
     {
-        $this->environment = $environment;
     }
 
     /**
@@ -34,7 +31,7 @@ public function getFunctions(): array
             new TwigFunction(
                 'sylius_test_form_attribute',
                 function (string $name, ?string $value = null): array {
-                    if (strpos($this->environment, 'test') === 0) {
+                    if (str_starts_with($this->environment, 'test')) {
                         return ['attr' => ['data-test-' . $name => (string) $value]];
                     }
 

diff --git a/Twig/TestHtmlAttributeExtension.php b/Twig/TestHtmlAttributeExtension.php
@@ -18,11 +18,8 @@
 
 final class TestHtmlAttributeExtension extends AbstractExtension
 {
-    private string $env;
-
-    public function __construct(string $env)
+    public function __construct(private string $env)
     {
-        $this->env = $env;
     }
 
     /**
@@ -34,7 +31,7 @@ public function getFunctions(): array
             new TwigFunction(
                 'sylius_test_html_attribute',
                 function (string $name, ?string $value = null): string {
-                    if (strpos($this->env, 'test') === 0) {
+                    if (str_starts_with($this->env, 'test')) {
                         return sprintf('data-test-%s="%s"', $name, (string) $value);
                     }