Merge branch hotfix/v2.3.28

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2023 Ambroise Maupate
+Copyright © 2024 Ambroise Maupate
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

composer.json

@@ -5,8 +5,8 @@
     "require": {
         "php": ">=8.1",
         "roadiz/nodetype-contracts": "~1.1.2",
-        "symfony/translation": "5.4.*",
-        "symfony/http-foundation": "5.4.*"
+        "symfony/translation": "6.4.*",
+        "symfony/http-foundation": "6.4.*"
     },
     "license": "MIT",
     "authors": [
@@ -28,8 +28,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.2.x-dev",
-            "dev-develop": "2.3.x-dev"
+            "dev-main": "2.3.x-dev",
+            "dev-develop": "2.4.x-dev"
         }
     }
 }

phpstan.neon

@@ -1,7 +1,8 @@
 parameters:
-    level: max
+    level: 7
     paths:
         - src
     reportUnmatchedIgnoredErrors: false
-    checkGenericClassInNonGenericObjectType: false
-    checkMissingIterableValueType: false
+    ignoreErrors:
+        - identifier: missingType.iterableValue
+        - identifier: missingType.generics

src/Generators/MarkdownGeneratorFactory.php

@@ -11,17 +11,10 @@
 
 final class MarkdownGeneratorFactory
 {
-    private ParameterBag $nodeTypesBag;
-    private TranslatorInterface $translator;
-
-    /**
-     * @param ParameterBag $nodeTypesBag
-     * @param TranslatorInterface $translator
-     */
-    public function __construct(ParameterBag $nodeTypesBag, TranslatorInterface $translator)
-    {
-        $this->nodeTypesBag = $nodeTypesBag;
-        $this->translator = $translator;
+    public function __construct(
+        private readonly ParameterBag $nodeTypesBag,
+        private readonly TranslatorInterface $translator
+    ) {
     }
 
     public function getHumanBool(bool $bool): string
@@ -50,16 +43,11 @@ public function createForNodeType(NodeTypeInterface $nodeType): NodeTypeGenerato
      */
     public function createForNodeTypeField(NodeTypeFieldInterface $field): AbstractFieldGenerator
     {
-        switch (true) {
-            case $field->isNodes():
-                return new NodeReferencesFieldGenerator($this, $field, $this->nodeTypesBag, $this->translator);
-            case $field->isChildrenNodes():
-                return new ChildrenNodeFieldGenerator($this, $field, $this->nodeTypesBag, $this->translator);
-            case $field->isMultiple():
-            case $field->isEnum():
-                return new DefaultValuedFieldGenerator($this, $field, $this->nodeTypesBag, $this->translator);
-            default:
-                return new CommonFieldGenerator($this, $field, $this->nodeTypesBag, $this->translator);
-        }
+        return match (true) {
+            $field->isNodes() => new NodeReferencesFieldGenerator($this, $field, $this->nodeTypesBag, $this->translator),
+            $field->isChildrenNodes() => new ChildrenNodeFieldGenerator($this, $field, $this->nodeTypesBag, $this->translator),
+            $field->isMultiple(), $field->isEnum() => new DefaultValuedFieldGenerator($this, $field, $this->nodeTypesBag, $this->translator),
+            default => new CommonFieldGenerator($this, $field, $this->nodeTypesBag, $this->translator),
+        };
     }
 }