Merge pull request #23 from picamator/development

Release 2.1.1

Author: picamator

README.md

@@ -68,7 +68,7 @@ Key Features
   * implements standard interfaces: `IteratorAggregate`, `JsonSerializable`, and `Countable`
   * supports embedded, collections Transfer Objects
   * supports PHP primitive data types
-  * supports `BackedEnum`, `DateTime`, `DateTimeImmutable`, and `BcMath\\Number`
+  * supports `BackedEnum`, `DateTime`, `DateTimeImmutable`, and `BcMath\Number`
   * supports asymmetric property visibility
   * integrates external Transfer Objects
 

composer.json

@@ -39,7 +39,6 @@
     },
     "require": {
         "php": ">=8.4",
-        "ext-bcmath": "*",
         "composer-runtime-api": "^2.2",
         "psr/container": "^2.0",
         "symfony/console": "^7.0",
@@ -53,6 +52,9 @@
         "phpunit/phpunit": "^12.0",
         "squizlabs/php_codesniffer": "^3.11"
     },
+    "suggest": {
+        "ext-bcmath": "Required for supporting the `numberType` in Transfer Object Definition Files."
+    },
     "bin": [
         "bin/transfer-generate",
         "bin/definition-generate"

composer.lock

@@ -25,7 +25,7 @@ wrap_in_green "======================================"
 wrap_in_yellow "XDEBUG: $XDEBUG_MODE, PHP: $PHP_VERSION"
 
 # style prompt
-PS1="$(color_blue "\w")$ "
+PS1="$(color_blue "\W")$ "
 
 # function to display "Bay" when the shell is terminated
 function say_goodbye() {

docker/php/bash/.bashrc

@@ -5,7 +5,6 @@
 namespace Picamator\TransferObject\Shared\Exception;
 
 use Exception;
-use Picamator\TransferObject\Shared\Exception\TransferExceptionInterface;
 
 class FileAppenderException extends Exception implements TransferExceptionInterface
 {

src/Shared/Exception/FileAppenderException.php

@@ -5,7 +5,6 @@
 namespace Picamator\TransferObject\Shared\Exception;
 
 use Exception;
-use Picamator\TransferObject\Shared\Exception\TransferExceptionInterface;
 
 class JsonReaderException extends Exception implements TransferExceptionInterface
 {

src/Shared/Exception/JsonReaderException.php

@@ -26,11 +26,6 @@ abstract class AbstractTransfer implements TransferInterface
 
     private const string DATA_INDEX_SUFFIX = '_DATA_INDEX';
 
-    /**
-     * @var array<string, \Picamator\TransferObject\Transfer\Attribute\PropertyTypeAttributeInterface|null>
-     */
-    private array $_attributeCache = [];
-
     /**
      * @var \SplFixedArray<mixed>
      */
@@ -149,10 +144,6 @@ final protected function setData(int $index, mixed $value): mixed
 
     private function getConstantAttribute(string $constantName): ?PropertyTypeAttributeInterface
     {
-        if (array_key_exists($constantName, $this->_attributeCache)) {
-            return $this->_attributeCache[$constantName];
-        }
-
         $reflection = new ReflectionClassConstant($this, $constantName);
         $attributeReflections = $reflection->getAttributes(
             name: PropertyTypeAttributeInterface::class,
@@ -161,7 +152,7 @@ private function getConstantAttribute(string $constantName): ?PropertyTypeAttrib
 
         $attributeReflection = $attributeReflections[0] ?? null;
 
-        return $this->_attributeCache[$constantName] = $attributeReflection?->newInstance();
+        return $attributeReflection?->newInstance();
     }
 
     private function initData(): void

src/Transfer/AbstractTransfer.php

@@ -71,13 +71,13 @@ public function toArray(): array
 
                 $value instanceof ArrayObject => $value->getArrayCopy(),
 
-                $value instanceof DateTimeInterface => $value->format(static::DATE_TIME_FORMAT),
+                $value instanceof BackedEnum => $value->value,
 
-                $value instanceof Number => (string)$value,
+                $value instanceof DateTimeInterface => $value->format(static::DATE_TIME_FORMAT),
 
                 $value instanceof stdClass => (array)$value,
 
-                $value instanceof BackedEnum => $value->value,
+                $this->isBcMathLoaded() && $value instanceof Number => (string)$value,
 
                 default => $value,
             };
@@ -119,35 +119,35 @@ public function fromArray(array $data): static
             $isStringOrInt = $isString || is_int($value);
 
             $this->$name = match (true) {
-                is_subclass_of($type, AbstractTransfer::class) && $isArray
+                $isArray && is_subclass_of($type, AbstractTransfer::class)
                     => new $type($value),
 
-                is_subclass_of($type, TransferInterface::class) && $isArray
+                $isArray && is_subclass_of($type, TransferInterface::class)
                     //  @phpstan-ignore argument.type
                     => new $type()->fromArray($value),
 
-                $type === ArrayObject::class && $isArray
+                $isArray && $type === ArrayObject::class
                     //  @phpstan-ignore argument.type
                     => new ArrayObject($value),
 
-                $type === DateTime::class && $isString
+                $isStringOrInt && is_subclass_of($type, BackedEnum::class)
                     //  @phpstan-ignore argument.type
-                    => new DateTime($value),
+                    => $type::tryFrom($value),
 
-                $type === DateTimeImmutable::class && $isString
+                $isString && $type === DateTime::class
                     //  @phpstan-ignore argument.type
-                    => new DateTimeImmutable($value),
+                    => new DateTime($value),
 
-                $type === Number::class && $isStringOrInt
+                $isString && $type === DateTimeImmutable::class
                     //  @phpstan-ignore argument.type
-                    => new Number($value),
+                    => new DateTimeImmutable($value),
 
-                $type === stdClass::class && $isArray
+                $isArray && $type === stdClass::class
                     => (object)$value,
 
-                is_subclass_of($type, BackedEnum::class) && $isStringOrInt
+                $isStringOrInt && $this->isBcMathLoaded() && $type === Number::class
                     //  @phpstan-ignore argument.type
-                    => $type::tryFrom($value),
+                    => new Number($value),
 
                 default => $value,
             };
@@ -187,4 +187,9 @@ private function getPublicProperties(): array
 
         return $this->_propertyCache = $reflection->getProperties(ReflectionProperty::IS_PUBLIC);
     }
+
+    private function isBcMathLoaded(): bool
+    {
+        return extension_loaded('bcmath');
+    }
 }

src/Transfer/TransferAdapterTrait.php

@@ -16,12 +16,24 @@
     private const string INVALID_NUMBER_TYPE_ERROR_MESSAGE_TEMPLATE
         = 'Property "%s" type "%s" is not a BcMath\Number.';
 
+    private const string EXTENSION_IS_NOT_LOADED_ERROR
+        = 'PHP extension BCMath was not loaded. Please install and load extension';
+
     public function isApplicable(DefinitionPropertyTransfer $propertyTransfer): bool
     {
         return $propertyTransfer->numberType !== null;
     }
 
     public function validate(DefinitionPropertyTransfer $propertyTransfer): ValidatorMessageTransfer
+    {
+        if (!$this->isBcMathLoaded()) {
+            return $this->createErrorMessageTransfer(self::EXTENSION_IS_NOT_LOADED_ERROR);
+        }
+
+        return $this->validateType($propertyTransfer);
+    }
+
+    private function validateType(DefinitionPropertyTransfer $propertyTransfer): ValidatorMessageTransfer
     {
         $numberClassName = $propertyTransfer->numberType?->namespace?->withoutAlias ?: '';
 
@@ -42,4 +54,9 @@ private function getErrorMessage(DefinitionPropertyTransfer $propertyTransfer):
             $propertyTransfer->numberType?->namespace->withoutAlias ?? '',
         );
     }
+
+    private function isBcMathLoaded(): bool
+    {
+        return extension_loaded('bcmath');
+    }
 }

src/TransferGenerator/Definition/Validator/Property/NumberTypePropertyValidator.php

@@ -16,7 +16,6 @@
 
     private const array RESERVED_PROPERTIES = [
         '_data',
-        '_attributeCache',
     ];
 
     public function isApplicable(DefinitionPropertyTransfer $propertyTransfer): true