Merge pull request #52 from picamator/development

Release 5.4.4

Author: picamator

AGENTS.md

@@ -100,7 +100,8 @@ Code Style
 
 ### Tests
 
-- all tests classes should be a `final`
+- tests classes should be a `final`
+- tests should have at least one test group
 
 Module Structure
 ----------------

README.md

@@ -115,11 +115,12 @@ Usage Tests
 Definition Files and Transfer Object generators have been tested against the following APIs:
 
 * [NASA Open Api](https://api.nasa.gov/neo/rest/v1/neo/2465633?api_key=DEMO_KEY)
-* [OpenWeather](https://openweathermap.org/current#example_JSON)
-* [Content API for Shopping](https://developers.google.com/shopping-content/guides/products/products-api?hl=en)
-* [Frankfurter is a free, open-source currency data API](https://api.frankfurter.dev/v1/latest)
+* [OpenWeather](https://openweathermap.org/current?collection=current_forecast#example_JSON)
+* [Google Content API for Shopping](https://developers.google.com/shopping-content/guides/products/products-api?hl=en)
+* [Frankfurter - open-source currency data API](https://api.frankfurter.dev/v1/latest)
 * [Tagesschau API](https://tagesschau.api.bund.dev)
 * [Statistisches Bundesamt (Destatis)](https://www-genesis.destatis.de/genesisWS/swagger-ui/index.html#/find/findPost)
+* [Wero - Digital Payment Wallet](https://developerhub.ppro.com/global-api/docs/wero)
 
 ### Scenario
 

composer.lock

@@ -84,8 +84,14 @@ case $1 in
     docker compose stop
     ;;
   cli)
-    if [ -n "$2" ]; then
-      $DOCKER_EXEC php -f $2
+    if [ -n "$5" ]; then
+      $DOCKER_EXEC php "$2" "$3" "$4" "$5"
+    elif [ -n "$4" ]; then
+      $DOCKER_EXEC php "$2" "$3" "$4"
+    elif [ -n "$3" ]; then
+      $DOCKER_EXEC php "$2" "$3"
+    elif [ -n "$2" ]; then
+      $DOCKER_EXEC php $2
     else
       $DOCKER_EXEC bash
     fi

docker/sdk

@@ -122,27 +122,22 @@ private function generateTransfers(SymfonyStyle $io, string $configPath): bool
             }
 
             $this->writelnErrorMessages($io, $generatorTransfer);
-            $this->writelnDebugMessages($io, $generatorTransfer);
+            if ($this->isDebugMessages($io, $generatorTransfer)) {
+                $lastFileName ??= $generatorTransfer->fileName;
+                $this->writelnDebugMessages($io, $generatorTransfer, $lastFileName);
+            }
         }
 
         return $generatorFiber->getReturn();
     }
 
-    private function writelnDebugMessages(SymfonyStyle $io, TransferGeneratorTransfer $generatorTransfer): void
-    {
-        if (
-            !$io->isVerbose()
-            || $generatorTransfer->validator->isValid === false
-            || $generatorTransfer->fileName === null
-            || $generatorTransfer->className === null
-        ) {
-            return;
-        }
-
-        static $fileName = $generatorTransfer->fileName;
-
-        if ($fileName !== $generatorTransfer->fileName) {
-            $fileName = $generatorTransfer->fileName;
+    private function writelnDebugMessages(
+        SymfonyStyle $io,
+        TransferGeneratorTransfer $generatorTransfer,
+        ?string &$lastFileName,
+    ): void {
+        if ($lastFileName !== $generatorTransfer->fileName) {
+            $lastFileName = $generatorTransfer->fileName;
 
             $io->newLine();
         }
@@ -156,6 +151,14 @@ private function writelnDebugMessages(SymfonyStyle $io, TransferGeneratorTransfe
         );
     }
 
+    private function isDebugMessages(SymfonyStyle $io, TransferGeneratorTransfer $generatorTransfer): bool
+    {
+        return $io->isVerbose()
+            && $generatorTransfer->validator->isValid === true
+            && $generatorTransfer->fileName !== null
+            && $generatorTransfer->className !== null;
+    }
+
     private function writelnErrorMessages(SymfonyStyle $io, TransferGeneratorTransfer $generatorTransfer): void
     {
         if ($generatorTransfer->validator->isValid === true) {

src/Command/TransferGeneratorCommand.php

@@ -132,17 +132,13 @@ private function createDateTimePropertyTransfer(string $propertyName): Definitio
 
     private function createPropertyTransfer(string $propertyName, string $builtInType): DefinitionPropertyTransfer
     {
-        $tapeWithDocBlock = $this->parseTypeWithDocBlock($builtInType) ?? [];
+        $typeDocBlock = $this->parseTypeWithDocBlock($builtInType);
 
-        /** @var string $type */
-        $type = array_key_first($tapeWithDocBlock);
-        $type = BuiltInTypeEnum::from($type);
-
-        $docBlock = array_first($tapeWithDocBlock);
+        $type = BuiltInTypeEnum::from($typeDocBlock->type);
 
         $builtInTypeTransfer = new DefinitionBuiltInTypeTransfer();
         $builtInTypeTransfer->name = $type;
-        $builtInTypeTransfer->docBlock = $docBlock;
+        $builtInTypeTransfer->docBlock = $typeDocBlock->docBlock;
 
         $propertyTransfer = new DefinitionPropertyTransfer();
         $propertyTransfer->propertyName = $propertyName;

src/DefinitionGenerator/Content/Expander/BuiltInTypeBuilderExpander.php

@@ -20,7 +20,7 @@ public function appendToFile(string $filename, string $content): void
 
         if ($writeResult === false) {
             throw new FileAppenderException(
-                sprintf('Failed to write content into the file "%s".', $filename),
+                sprintf('Failed to write content to file "%s".', $filename),
             );
         }
     }
@@ -35,7 +35,7 @@ public function closeFile(string $filename): void
         $isClosed = $this->fclose($file);
         if ($isClosed === false) {
             throw new FileAppenderException(
-                sprintf('Failed to close the file "%s".', $filename),
+                sprintf('Failed to close file "%s".', $filename),
             );
         }
 

src/Shared/Filesystem/FileAppender.php

@@ -61,7 +61,7 @@ private function assertEndOfFile($file, string $filename, int $fileLine): void
         $this->fclose($file);
 
         throw new FileReaderException(
-            sprintf('Failed to read file "%s" line "%d".', $filename, $fileLine),
+            sprintf('Failed to read file "%s" at line "%d".', $filename, $fileLine),
         );
     }
 

src/Shared/Filesystem/FileReader.php

@@ -6,24 +6,17 @@
 
 trait DocBlockParserTrait
 {
-    private const string TYPE_KEY = 'type';
+    private const string DOCK_BLOCK_REGEX = '#^(?<type>[^<> ]+)\s*(?<docBlock><.+>)$#';
 
-    private const string DOC_BLOCK_KEY = 'docBlock';
-
-    private const string TYPE_REGEX = '#(?<type>[^<>]*)(?<docBlock>.*)#';
-
-    /**
-     * @return array<string,string|null>|null
-     */
-    final protected function parseTypeWithDocBlock(string $type): ?array
+    final protected function parseTypeWithDocBlock(string $type): TypeDocBlock
     {
-        if (preg_match(self::TYPE_REGEX, $type, $matches) === false) {
-            return null;
+        if (!str_contains($type, '<') || preg_match(self::DOCK_BLOCK_REGEX, $type, $matches) !== 1) {
+            return new TypeDocBlock(type: $type);
         }
 
-        $type = $matches[self::TYPE_KEY] ?? '';
-        $docBlock = $matches[self::DOC_BLOCK_KEY] ?? null;
-
-        return [$type => $docBlock];
+        return new TypeDocBlock(
+            type: $matches['type'],
+            docBlock: $matches['docBlock'],
+        );
     }
 }

src/Shared/Parser/DocBlockParserTrait.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Picamator\TransferObject\Shared\Parser;
+
+readonly class TypeDocBlock
+{
+    public function __construct(
+        public string $type,
+        public ?string $docBlock = null,
+    ) {
+    }
+}