Merge tag v2.4.0 into develop

roadiz · Dec 6, 2024 · 5c82d40 · 5c82d40
1 parent 36a8b7f
commit 5c82d40
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -25,8 +25,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.3.x-dev",
-            "dev-develop": "2.4.x-dev"
+            "dev-master": "2.4.x-dev",
+            "dev-develop": "2.5.x-dev"
         }
     }
 }
diff --git a/src/DeclarationGeneratorFactory.php b/src/DeclarationGeneratorFactory.php
@@ -15,9 +15,9 @@
 use RZ\Roadiz\Typescript\Declaration\Generators\ScalarFieldGenerator;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
-final class DeclarationGeneratorFactory
+final readonly class DeclarationGeneratorFactory
 {
-    public function __construct(private readonly ParameterBag $nodeTypesBag)
+    public function __construct(private ParameterBag $nodeTypesBag)
     {
     }
 

diff --git a/src/Generators/AbstractFieldGenerator.php b/src/Generators/AbstractFieldGenerator.php
@@ -12,15 +12,10 @@ abstract class AbstractFieldGenerator
     // Four spaces
     public const INDENTATION_MARK = '    ';
 
-    protected NodeTypeFieldInterface $field;
-    protected ParameterBag $nodeTypesBag;
-
     public function __construct(
-        NodeTypeFieldInterface $field,
-        ParameterBag $nodeTypesBag,
+        protected readonly NodeTypeFieldInterface $field,
+        protected readonly ParameterBag $nodeTypesBag,
     ) {
-        $this->field = $field;
-        $this->nodeTypesBag = $nodeTypesBag;
     }
 
     protected function getNullableAssertion(): string