Merge tag v2.3.19 into develop

roadiz · Jul 12, 2024 · 30a2aa9 · 30a2aa9
1 parent 0c99593
commit 30a2aa9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/src/Controller/FontFaceController.php b/src/Controller/FontFaceController.php
@@ -15,18 +15,11 @@
 
 final class FontFaceController
 {
-    private ManagerRegistry $managerRegistry;
-    private Environment $templating;
-    private FilesystemOperator $fontStorage;
-
     public function __construct(
-        FilesystemOperator $fontStorage,
-        ManagerRegistry $managerRegistry,
-        Environment $templating,
+        private readonly FilesystemOperator $fontStorage,
+        private readonly ManagerRegistry $managerRegistry,
+        private readonly Environment $templating,
     ) {
-        $this->managerRegistry = $managerRegistry;
-        $this->templating = $templating;
-        $this->fontStorage = $fontStorage;
     }
 
     private function getFontData(Font $font, string $extension): ?array

diff --git a/src/EventSubscriber/UpdateFontSubscriber.php b/src/EventSubscriber/UpdateFontSubscriber.php
@@ -16,11 +16,8 @@
  */
 final class UpdateFontSubscriber implements EventSubscriberInterface
 {
-    private FontLifeCycleSubscriber $fontSubscriber;
-
-    public function __construct(FontLifeCycleSubscriber $fontSubscriber)
+    public function __construct(private readonly FontLifeCycleSubscriber $fontSubscriber)
     {
-        $this->fontSubscriber = $fontSubscriber;
     }
 
     /**