Merge pull request #9 from Micro-PHP/1.6.1

1.6.1

Author: tchudeska

composer.json

@@ -26,17 +26,17 @@
         "ext-libxml": "*",
         "nette/php-generator": "^4",
         "psr/log": "^1 || ^2 || ^3",
-        "symfony/intl": "^5 || ^6",
-        "symfony/property-access": "^5 || ^6",
-        "symfony/validator": "^5 || ^6"
+        "symfony/intl": "^5.4 || ^6",
+        "symfony/property-access": "^5.4 || ^6",
+        "symfony/validator": "^5.4.15 || ^6"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.29",
         "friendsofphp/php-cs-fixer": "^3.13",
         "phpstan/phpstan": "^1.9",
         "phpunit/php-code-coverage": "^9.2",
         "phpunit/phpunit": "^9.5",
-        "symfony/var-dumper": "^5 || ^6",
+        "symfony/var-dumper": "^5.4 || ^6",
         "vimeo/psalm": "^5.2"
     },
     "autoload": {

src/Preparation/Processor/Property/Assert/UuidStrategy.php

@@ -17,15 +17,22 @@
 
 class UuidStrategy extends AbstractConstraintStrategy
 {
-    public const ALLOWED_VERSIONS = [
-        Uuid::V1_MAC,
-        Uuid::V2_DCE,
-        Uuid::V3_MD5,
-        Uuid::V4_RANDOM,
-        Uuid::V5_SHA1,
-        Uuid::V6_SORTABLE,
-        Uuid::V7_MONOTONIC,
-    ];
+    /**
+     * @return array<int>
+     */
+    public function getAvailableVersions(): array
+    {
+        // Supports 5.4 version
+        $constants = [
+            'V1_MAC', 'V2_DCE', 'V3_MD5', 'V4_RANDOM', 'V5_SHA1', 'V6_SORTABLE', 'V7_MONOTONIC',
+        ];
+
+        return array_filter(array_map(function (string $constName) {
+            $cName = sprintf('%s::%s', Uuid::class, $constName);
+
+            return \defined($cName) ? \constant($cName) : null;
+        }, $constants));
+    }
 
     protected function generateArguments(array $config): array
     {
@@ -54,8 +61,9 @@ protected function getAttributeClassName(): string
      */
     private function parseVersions(array|string $original): array
     {
+        $availableVersions = $this->getAvailableVersions();
         if ('' === $original) {
-            return self::ALLOWED_VERSIONS;
+            return $availableVersions;
         }
 
         $versions = $original;
@@ -64,11 +72,11 @@ private function parseVersions(array|string $original): array
         }
 
         $versions = array_map('intval', $versions);
-        $isValid = !array_diff($versions, self::ALLOWED_VERSIONS);
+        $isValid = !array_diff($versions, $availableVersions);
         if ($isValid) {
             return $versions;
         }
 
-        throw new \InvalidArgumentException(sprintf('UUID versions is not allowed. Actual: `%s`, Available: `%s`', \is_array($original) ? implode(', ', $original) : $original, implode(',', self::ALLOWED_VERSIONS)));
+        throw new \InvalidArgumentException(sprintf('UUID versions is not allowed. Actual: `%s`, Available: `%s`', \is_array($original) ? implode(', ', $original) : $original, implode(',', $availableVersions)));
     }
 }

src/Reader/XmlReader.php

@@ -17,7 +17,6 @@
 
 /**
  * @TODO: Temporary solution. MVP
- *
  * @TODO: Get XSD api version
  */
 class XmlReader implements ReaderInterface

src/Validator/ValidatorInterface.php

@@ -21,8 +21,6 @@ interface ValidatorInterface
     /**
      * @param AbstractDto     $dto
      * @param string[]|string $groups
-     *
-     * @return ConstraintViolationListInterface
      */
     public function validate(AbstractDto $dto, array|string $groups = 'Default'): ConstraintViolationListInterface;
 }

tests/Unit/Out/Simple/SimpleUserTransfer.php

@@ -44,7 +44,7 @@ final class SimpleUserTransfer extends \Micro\Library\DTO\Object\AbstractDto
     protected string|null $json = null;
 
     #[\Symfony\Component\Validator\Constraints\NotBlank(groups: ['Default'], allowNull: false)]
-    #[\Symfony\Component\Validator\Constraints\Uuid(groups: ['Default'], versions: [1, 2, 3, 4, 5, 6, 7], strict: true)]
+    #[\Symfony\Component\Validator\Constraints\Uuid(groups: ['Default'], versions: [1, 2, 3, 4, 5, 6], strict: true)]
     protected string|null $uuid = null;
 
     #[\Symfony\Component\Validator\Constraints\DateTime(groups: ['Default'], format: 'Y-m-d H:i:s')]

tests/Unit/libraryTest.php

@@ -65,6 +65,7 @@ public function testSchemaFileNotFount(): void
     public function testValidateSuccessDto(): void
     {
         $validatorFacade = new ValidatorFacadeDefault();
+
         $this->assertEquals(0, \count($validatorFacade->validate($this->createValidDto())));
     }
 
@@ -89,21 +90,6 @@ public function testSerializeValid(): void
         $this->testSerialize($this->createValidDto(), $json);
     }
 
-    protected function testSerialize(AbstractDto $dtoTransfer, string $exceptedJson): void
-    {
-        $serializer = new SerializerFacadeDefault();
-
-        $json = $serializer->toJsonTransfer($dtoTransfer);
-        $arrayTransfer = $serializer->toArrayTransfer($dtoTransfer);
-
-        $this->assertEquals($dtoTransfer, $serializer->fromArrayTransfer($arrayTransfer));
-
-        $simpleJson = $serializer->toJson($dtoTransfer);
-        $this->assertEquals($exceptedJson, $simpleJson);
-
-        $this->assertEquals($dtoTransfer, $serializer->fromJsonTransfer($json));
-    }
-
     public function testIterableDto(): void
     {
         $simpleUser = new SimpleUserTransfer();
@@ -127,6 +113,21 @@ public function testIterableDto(): void
         $simpleUser[$invalidProperty];
     }
 
+    protected function testSerialize(AbstractDto $dtoTransfer, string $exceptedJson): void
+    {
+        $serializer = new SerializerFacadeDefault();
+
+        $json = $serializer->toJsonTransfer($dtoTransfer);
+        $arrayTransfer = $serializer->toArrayTransfer($dtoTransfer);
+
+        $this->assertEquals($dtoTransfer, $serializer->fromArrayTransfer($arrayTransfer));
+
+        $simpleJson = $serializer->toJson($dtoTransfer);
+        $this->assertEquals($exceptedJson, $simpleJson);
+
+        $this->assertEquals($dtoTransfer, $serializer->fromJsonTransfer($json));
+    }
+
     protected function createEmptyDto(): SimpleUserTransfer
     {
         return new SimpleUserTransfer();