chore: Bumped

Author: roadiz-ci

.github/workflows/run-test.yml

@@ -20,7 +20,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.1', '8.2', '8.3']
+                php-version: ['8.2', '8.3']
         steps:
             - uses: shivammathur/setup-php@v2
               with:
@@ -36,7 +36,5 @@ jobs:
                       ${{ runner.os }}-php-${{ matrix.php-version }}-
             - name: Install Dependencies
               run: composer install --no-scripts --no-ansi --no-interaction --no-progress
-            - name: Run PHP Code Sniffer
-              run: vendor/bin/phpcs -p ./src
             - name: Run PHPStan
               run: vendor/bin/phpstan analyse --no-progress -c phpstan.neon

Makefile

@@ -8,7 +8,7 @@
     },
     "require-dev": {
         "phpstan/phpstan": "^1.5.3",
-        "squizlabs/php_codesniffer": "^3.5"
+        "phpstan/phpdoc-parser": "<2"
     },
     "license": "MIT",
     "authors": [
@@ -26,8 +26,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"
         }
     }
 }

composer.json

@@ -15,15 +15,12 @@
 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)
     {
     }
 
-    /**
-     * @return ParameterBag
-     */
     public function getNodeTypesBag(): ParameterBag
     {
         return $this->nodeTypesBag;
@@ -34,11 +31,6 @@ public function getHumanBool(bool $bool): string
         return $bool ? 'true' : 'false';
     }
 
-    /**
-     * @param NodeTypeInterface $nodeType
-     *
-     * @return NodeTypeGenerator
-     */
     public function createForNodeType(NodeTypeInterface $nodeType): NodeTypeGenerator
     {
         return new NodeTypeGenerator(
@@ -47,11 +39,6 @@ public function createForNodeType(NodeTypeInterface $nodeType): NodeTypeGenerato
         );
     }
 
-    /**
-     * @param NodeTypeFieldInterface $field
-     *
-     * @return AbstractFieldGenerator
-     */
     public function createForNodeTypeField(NodeTypeFieldInterface $field): AbstractFieldGenerator
     {
         return match (true) {

phpcs.xml.dist

@@ -12,19 +12,10 @@ abstract class AbstractFieldGenerator
     // Four spaces
     public const INDENTATION_MARK = '    ';
 
-    protected NodeTypeFieldInterface $field;
-    protected ParameterBag $nodeTypesBag;
-
-    /**
-     * @param NodeTypeFieldInterface $field
-     * @param 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
@@ -36,18 +27,18 @@ abstract protected function getType(): string;
 
     private function getDeclaration(): string
     {
-        return static::INDENTATION_MARK .
-            $this->field->getVarName() .
-            $this->getNullableAssertion() . ': ' .
+        return static::INDENTATION_MARK.
+            $this->field->getVarName().
+            $this->getNullableAssertion().': '.
             $this->getType();
     }
 
     public function getContents(): string
     {
         return implode(PHP_EOL, [
-                $this->getIntroduction(),
-                $this->getDeclaration()
-            ]);
+            $this->getIntroduction(),
+            $this->getDeclaration(),
+        ]);
     }
 
     protected function getIntroductionLines(): array
@@ -60,19 +51,16 @@ protected function getIntroductionLines(): array
         }
 
         if (!empty($this->field->getGroupName())) {
-            $lines[] = 'Group: ' . $this->field->getGroupName();
+            $lines[] = 'Group: '.$this->field->getGroupName();
         }
 
         return $lines;
     }
 
-    /**
-     * @return string
-     */
     public function getIntroduction(): string
     {
         return implode(PHP_EOL, array_map(function (string $line) {
-            return static::INDENTATION_MARK . '// ' . $line;
+            return static::INDENTATION_MARK.'// '.$line;
         }, $this->getIntroductionLines()));
     }
 }

src/DeclarationGeneratorFactory.php

@@ -12,14 +12,16 @@ public function getContents(): string
             $this->getIntroduction(),
         ]);
     }
+
     protected function getIntroductionLines(): array
     {
         $lines = [
-            'This node-type uses "blocks" which are available through parent RoadizNodesSources.blocks'
+            'This node-type uses "blocks" which are available through parent RoadizNodesSources.blocks',
         ];
         if (!empty($this->field->getDefaultValues())) {
-            $lines[] = 'Possible block node-types: ' . $this->field->getDefaultValues();
+            $lines[] = 'Possible block node-types: '.$this->field->getDefaultValues();
         }
+
         return $lines;
     }
 

src/Generators/AbstractFieldGenerator.php

@@ -15,12 +15,11 @@ final class DeclarationGenerator
     private array $nodeTypes;
 
     /**
-     * @param DeclarationGeneratorFactory $generatorFactory
      * @param NodeTypeInterface[] $nodeTypes
      */
     public function __construct(
         private readonly DeclarationGeneratorFactory $generatorFactory,
-        array $nodeTypes = []
+        array $nodeTypes = [],
     ) {
         if (empty($nodeTypes)) {
             $this->nodeTypes = array_unique($this->generatorFactory->getNodeTypesBag()->all());
@@ -41,7 +40,7 @@ public function getContents(): string
 
         $blocks[] = $this->getAllTypesInterface();
 
-        return implode(PHP_EOL . PHP_EOL, $blocks);
+        return implode(PHP_EOL.PHP_EOL, $blocks);
     }
 
     private function getAllTypesInterface(): string

src/Generators/ChildrenNodeFieldGenerator.php

@@ -19,11 +19,13 @@ protected function getType(): string
                     );
                     if (count($defaultValues) > 0) {
                         $defaultValues = array_map(function (string $value) {
-                            return '\'' . $value . '\'';
+                            return '\''.$value.'\'';
                         }, $defaultValues);
-                        return implode(' | ', $defaultValues) . ' | null';
+
+                        return implode(' | ', $defaultValues).' | null';
                     }
                 }
+
                 return 'string';
             case $this->field->isMultiple():
                 return 'Array<string>';
@@ -36,8 +38,9 @@ protected function getIntroductionLines(): array
     {
         $lines = parent::getIntroductionLines();
         if (!empty($this->field->getDefaultValues())) {
-            $lines[] = 'Possible values: ' . $this->field->getDefaultValues();
+            $lines[] = 'Possible values: '.$this->field->getDefaultValues();
         }
+
         return $lines;
     }
 }

src/Generators/DeclarationGenerator.php

@@ -15,7 +15,7 @@ protected function getNullableAssertion(): string
 
     protected function getType(): string
     {
-        return 'Array<' . $this->getUnionType() . '>';
+        return 'Array<'.$this->getUnionType().'>';
     }
 
     /**
@@ -27,8 +27,10 @@ private function getLinkedNodeTypes(): array
             return [];
         }
         $nodeTypeNames = explode(',', $this->field->getDefaultValues());
+
         return array_values(array_filter(array_map(function (string $name) {
             $nodeType = $this->nodeTypesBag->get(trim($name));
+
             return $nodeType instanceof NodeTypeInterface ? $nodeType : null;
         }, $nodeTypeNames)));
     }
@@ -50,8 +52,9 @@ protected function getIntroductionLines(): array
     {
         $lines = parent::getIntroductionLines();
         if (!empty($this->field->getDefaultValues())) {
-            $lines[] = 'Possible values: ' . $this->field->getDefaultValues();
+            $lines[] = 'Possible values: '.$this->field->getDefaultValues();
         }
+
         return $lines;
     }
 }