Merge branch hotfix/v2.6.17

Author: roadiz-ci

.github/workflows/run-test.yml

@@ -20,7 +20,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.2', '8.3']
+                php-version: ['8.3', '8.4']
         steps:
             - uses: shivammathur/setup-php@v2
               with:

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2024 Ambroise Maupate
+Copyright © 2025 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

@@ -3,8 +3,8 @@
     "description": "Roadiz sub-package which generates Typescript interfaces skeleton based on your schema",
     "type": "library",
     "require": {
-        "roadiz/nodetype-contracts": "^2.0.0",
-        "symfony/http-foundation": "6.4.*"
+        "roadiz/nodetype-contracts": "^3.0.0",
+        "symfony/http-foundation": "7.3.*"
     },
     "require-dev": {
         "phpstan/phpstan": "^1.5.3",
@@ -26,8 +26,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5.x-dev",
-            "dev-develop": "2.6.x-dev"
+            "dev-master": "2.6.x-dev",
+            "dev-develop": "2.7.x-dev"
         }
     }
 }

src/Generators/AbstractFieldGenerator.php

@@ -59,8 +59,6 @@ protected function getIntroductionLines(): array
 
     public function getIntroduction(): string
     {
-        return implode(PHP_EOL, array_map(function (string $line) {
-            return static::INDENTATION_MARK.'// '.$line;
-        }, $this->getIntroductionLines()));
+        return implode(PHP_EOL, array_map(fn (string $line) => static::INDENTATION_MARK.'// '.$line, $this->getIntroductionLines()));
     }
 }

src/Generators/ChildrenNodeFieldGenerator.php

@@ -6,13 +6,15 @@
 
 final class ChildrenNodeFieldGenerator extends AbstractFieldGenerator
 {
+    #[\Override]
     public function getContents(): string
     {
         return implode(PHP_EOL, [
             $this->getIntroduction(),
         ]);
     }
 
+    #[\Override]
     protected function getIntroductionLines(): array
     {
         $lines = [
@@ -25,6 +27,7 @@ protected function getIntroductionLines(): array
         return $lines;
     }
 
+    #[\Override]
     protected function getType(): string
     {
         return '';

src/Generators/DeclarationGenerator.php

@@ -45,9 +45,7 @@ public function getContents(): string
 
     private function getAllTypesInterface(): string
     {
-        $nodeTypeNames = array_map(function (NodeTypeInterface $nodeType) {
-            return $nodeType->getSourceEntityClassName();
-        }, $this->nodeTypes);
+        $nodeTypeNames = array_map(fn (NodeTypeInterface $nodeType) => $nodeType->getSourceEntityClassName(), $this->nodeTypes);
 
         $nodeTypeNames = implode(' | ', $nodeTypeNames);
 

src/Generators/DocumentsFieldGenerator.php

@@ -6,11 +6,13 @@
 
 final class DocumentsFieldGenerator extends AbstractFieldGenerator
 {
+    #[\Override]
     protected function getNullableAssertion(): string
     {
         return ''; // always available even if empty
     }
 
+    #[\Override]
     protected function getType(): string
     {
         return 'Array<RoadizDocument>';

src/Generators/EnumFieldGenerator.php

@@ -6,15 +6,14 @@
 
 final class EnumFieldGenerator extends AbstractFieldGenerator
 {
+    #[\Override]
     protected function getType(): string
     {
         switch (true) {
             case $this->field->isEnum():
                 $defaultValues = $this->field->getDefaultValuesAsArray();
                 if (!empty($defaultValues) && count($defaultValues) > 0) {
-                    $defaultValues = array_map(function (string $value) {
-                        return '\''.$value.'\'';
-                    }, $defaultValues);
+                    $defaultValues = array_map(fn (string $value) => '\''.$value.'\'', $defaultValues);
 
                     return implode(' | ', $defaultValues).' | null';
                 }
@@ -27,6 +26,7 @@ protected function getType(): string
         }
     }
 
+    #[\Override]
     protected function getIntroductionLines(): array
     {
         $lines = parent::getIntroductionLines();

src/Generators/NodeReferencesFieldGenerator.php

@@ -8,11 +8,13 @@
 
 final class NodeReferencesFieldGenerator extends AbstractFieldGenerator
 {
+    #[\Override]
     protected function getNullableAssertion(): string
     {
         return ''; // always available even if empty
     }
 
+    #[\Override]
     protected function getType(): string
     {
         return 'Array<'.$this->getUnionType().'>';
@@ -44,11 +46,10 @@ private function getUnionType(): string
             return 'RoadizNodesSources';
         }
 
-        return implode(' | ', array_map(function (NodeTypeInterface $nodeType) {
-            return $nodeType->getSourceEntityClassName();
-        }, $nodeTypes));
+        return implode(' | ', array_map(fn (NodeTypeInterface $nodeType) => $nodeType->getSourceEntityClassName(), $nodeTypes));
     }
 
+    #[\Override]
     protected function getIntroductionLines(): array
     {
         $lines = parent::getIntroductionLines();

src/Generators/NodeTypeGenerator.php

@@ -77,15 +77,11 @@ protected function getIntroduction(): string
         $lines[] = 'Publishable: '.$this->generatorFactory->getHumanBool($this->nodeType->isPublishable());
         $lines[] = 'Visible: '.$this->generatorFactory->getHumanBool($this->nodeType->isVisible());
 
-        return implode(PHP_EOL, array_map(function (string $line) {
-            return '// '.$line;
-        }, $lines));
+        return implode(PHP_EOL, array_map(fn (string $line) => '// '.$line, $lines));
     }
 
     protected function getFieldsContents(): string
     {
-        return implode(PHP_EOL, array_map(function (AbstractFieldGenerator $abstractFieldGenerator) {
-            return $abstractFieldGenerator->getContents();
-        }, $this->fieldGenerators));
+        return implode(PHP_EOL, array_map(fn (AbstractFieldGenerator $abstractFieldGenerator) => $abstractFieldGenerator->getContents(), $this->fieldGenerators));
     }
 }