Merge remote-tracking branch 'origin/master' into featrue/open-api

Author: astral-data

.github/workflows/phpstan.yml

@@ -0,0 +1,28 @@
+name: PHPStan
+
+on:
+  push:
+    paths:
+      - '**.php'
+  pull_request:
+    paths:
+      - '**.php'
+jobs:
+  phpstan:
+    name: phpstan
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.4'
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer update --prefer-dist --no-interaction --no-suggest
+
+      - name: Run PHPStan
+        run: ./vendor/bin/phpstan --error-format=github

.github/workflows/test.yml

@@ -0,0 +1,43 @@
+name: Run Tests
+
+on: ['push', 'pull_request']
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: [ 8.1, 8.2, 8.3, 8.4 ]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: PHP ${{ matrix.php-version }}
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-version }}
+        extensions: mbstring, intl, pdo_mysql
+        coverage: none
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate --strict
+
+    - name: Cache Composer packages
+      uses: actions/cache@v3
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php-${{ hashFiles('composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php-
+
+    - name: Install dependencies
+      run: composer install --prefer-dist --no-progress
+
+    - name: Run Pest tests
+      run: vendor/bin/pest
+
+    - name: Run benchmarks
+      run: vendor/bin/phpbench run benchmarks/ --bootstrap=vendor/autoload.php

README.md

@@ -1,4 +1,6 @@
-[![Packagist Downloads](https://img.shields.io/packagist/dm/astral/php-serialize)](https://packagist.org/packages/astral/php-serialize)
+[![Total Downloads](https://img.shields.io/packagist/dt/astral/php-serialize.svg?style=flat-square)](https://packagist.org/packages/astral/php-serialize)
+[![Tests](https://github.com/astral-data/php-serialize/actions/workflows/test.yml/badge.svg)](https://github.com/astral-data/php-serialize/actions/workflows/test.yml)
+[![PHPStan](https://github.com/astral-data/php-serialize/actions/workflows/phpstan.yml/badge.svg)](https://github.com/astral-data/php-serialize/actions/workflows/phpstan.yml)
 
 # Languages
 

benchmarks/SerializeBench.php

@@ -83,7 +83,7 @@ public function setupObject(): void
         Revs(500),
         Iterations(5),
         BeforeMethods([ 'setupObjectCreation']),
-        Assert('mode(variant.time.avg) < 90 microseconds +/- 5%')
+        Assert('mode(variant.time.avg) < 140 microseconds +/- 5%')
     ]
     public function benchObjectCreation(): void
     {
@@ -94,7 +94,7 @@ public function benchObjectCreation(): void
         Revs(5000),
         Iterations(5),
         BeforeMethods([ 'setupObjectCreation']),
-        Assert('mode(variant.time.avg) < 250 microseconds +/- 5%')
+        Assert('mode(variant.time.avg) < 350 microseconds +/- 5%')
     ]
     public function benchObjectCreationWithoutCache(): void
     {
@@ -106,7 +106,7 @@ public function benchObjectCreationWithoutCache(): void
         Revs(500),
         Iterations(5),
         BeforeMethods(['setupObject']),
-        Assert('mode(variant.time.avg) < 25 microseconds +/- 5%')
+        Assert('mode(variant.time.avg) < 80 microseconds +/- 5%')
     ]
     public function benchObjectToArray(): void
     {
@@ -117,7 +117,7 @@ public function benchObjectToArray(): void
         Revs(5000),
         Iterations(5),
         BeforeMethods(['setupObject']),
-        Assert('mode(variant.time.avg) < 150 microseconds +/- 5%')
+        Assert('mode(variant.time.avg) < 270 microseconds +/- 5%')
     ]
     public function benchObjectToArrayWithoutCache(): void
     {

composer.json

@@ -1,5 +1,6 @@
 {
     "name": "astral/php-serialize",
+    "description": "An advanced PHP serialization tool leveraging attributes for flexible object-to-array and JSON conversion. Supports property aliases, type conversions, and nested object handling. Ideal for APIs, data persistence, and configuration management.",
     "type": "library",
     "keywords" : [
         "php-serialize",
@@ -24,7 +25,7 @@
         "psr/simple-cache": "^3.0"
     },
     "require-dev" : {
-      "phpstan/phpstan": "^2.0.2",
+        "phpstan/phpstan": "^2.0.2",
         "friendsofphp/php-cs-fixer": "^3.0",
         "mockery/mockery": "^1.6",
         "phpbench/phpbench": "^1.2",

phpstan.neon

@@ -1,8 +1,5 @@
 parameters:
     level: 5
-    mockery:
-        class: DataCollection
-        mockClass: Mockery\MockInterface
     treatPhpDocTypesAsCertain: false
     paths:
         - src

src/Annotations/Faker/FakerMethod.php

@@ -10,7 +10,9 @@
 use ReflectionClass;
 use ReflectionException;
 use ReflectionMethod;
+use ReflectionNamedType;
 use ReflectionParameter;
+use RuntimeException;
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
 class FakerMethod implements FakerCastInterface
@@ -30,11 +32,11 @@ public function __construct(
     public function resolve(DataCollection $collection): mixed
     {
         if (!class_exists($this->className)) {
-            throw new Exception("Class $this->className not found");
+            throw new RuntimeException("Class $this->className not found");
         }
 
         if (!method_exists($this->className, $this->methodName)) {
-            throw new Exception("Method $this->methodName not found from class $this->className");
+            throw new RuntimeException("Method $this->methodName not found from class $this->className");
         }
 
         $instance         = $this->createInstanceWithResolvedConstructor($this->className);
@@ -65,7 +67,7 @@ private function createInstanceWithResolvedConstructor(string $className, array
     {
         if (in_array($className, $dependencyChain, true)) {
             $chain = implode(' -> ', array_merge($dependencyChain, [$className]));
-            throw new Exception("Circular dependency detected: $chain");
+            throw new RuntimeException("Circular dependency detected: $chain");
         }
 
         $dependencyChain[] = $className;
@@ -79,14 +81,20 @@ private function createInstanceWithResolvedConstructor(string $className, array
 
         return $reflectionClass->newInstanceArgs(array_map(function ($param) use ($dependencyChain) {
             $paramType = $param->getType();
-            $name      =  $paramType->getName();
+
+            if(!$paramType instanceof ReflectionNamedType){
+                throw new \http\Exception\RuntimeException("$paramType is not ReflectionNamedType");
+            }
+
+            $typeName  = $paramType->getName();
+
             return match(true) {
-                !$paramType->isBuiltin() && class_exists($name) => $this->createInstanceWithResolvedConstructor($name, $dependencyChain),
+                !$paramType->isBuiltin() && class_exists($typeName) => $this->createInstanceWithResolvedConstructor($typeName, $dependencyChain),
                 $param->isDefaultValueAvailable()               => $param->getDefaultValue(),
                 default                                         => null,
             };
 
-        }, $constructor->getParameters()));
+        }, $constructor?->getParameters()));
     }
 
     /**
@@ -103,7 +111,12 @@ private function resolveMethodParameters(ReflectionMethod $method): array
 
         return array_map(function (ReflectionParameter $param) {
             $paramType = $param->getType();
-            $name      =  $param->getName();
+
+            if(!$paramType instanceof ReflectionNamedType){
+                throw new \http\Exception\RuntimeException("$paramType is not ReflectionNamedType");
+            }
+
+            $name      = $param->getName();
             $typeName  = $paramType->getName();
 
             return match(true) {
@@ -134,7 +147,7 @@ private function extractNestedValue(mixed $result, string $path): mixed
             } elseif (is_object($result) && property_exists($result, $key)) {
                 $result = $result->$key;
             } else {
-                throw new Exception("Unable to extract path '$path' from result");
+                throw new RuntimeException("Unable to extract path '$path' from result");
             }
         }
         return $result;

src/Annotations/Input/InputDateFormat.php

@@ -10,6 +10,7 @@
 use Attribute;
 use DateInvalidTimeZoneException;
 use DateTime;
+use DateTimeImmutable;
 use DateTimeInterface;
 use DateTimeZone;
 
@@ -34,16 +35,20 @@ public function match(mixed $value, DataCollection $collection, InputValueContex
      */
     public function resolve(mixed $value, DataCollection $collection, InputValueContext $context): string|DateTime
     {
+
         $timezone = $this->timezone ? new DateTimeZone($this->timezone) : null;
+        $className = current($collection->getTypes())->className;
 
         if (!$this->outFormat
+            && is_subclass_of($className, DateTimeInterface::class)
+            && method_exists($className, 'createFromFormat')
             && count($collection->getTypes()) === 1
-            && is_subclass_of(current($collection->getTypes())?->className, DateTimeInterface::class)
         ) {
-            return  (current($collection->getTypes())?->className)::createFromFormat($this->inputFormat, (string)$value, $timezone);
+            return $className::createFromFormat($this->inputFormat, (string)$value, $timezone);
         }
 
         $dateTime = DateTime::createFromFormat($this->inputFormat, (string)$value, $timezone);
         return $dateTime !== false ? $dateTime->format($this->outFormat) : (string)$value;
+
     }
 }

src/Casts/InputValue/InputValueEnumCast.php

@@ -8,6 +8,7 @@
 use Astral\Serialize\Enums\TypeKindEnum;
 use Astral\Serialize\Exceptions\ValueCastError;
 use Astral\Serialize\Support\Collections\DataCollection;
+use Astral\Serialize\Support\Collections\TypeCollection;
 use Astral\Serialize\Support\Context\InputValueContext;
 use BackedEnum;
 use UnitEnum;
@@ -24,7 +25,6 @@ public function match(mixed $value, DataCollection $collection, InputValueContex
      */
     public function resolve(mixed $value, DataCollection $collection, InputValueContext $context): UnitEnum|string
     {
-
         $types = $collection->getTypes();
         foreach ($types as $type) {
             if ($type->kind !== TypeKindEnum::ENUM) {
@@ -41,7 +41,7 @@ public function resolve(mixed $value, DataCollection $collection, InputValueCont
                 sprintf(
                     'Enum value "%s" not found in EnumClass: %s',
                     $value,
-                    current($types)?->className
+                    current($types)->className
                 )
             );
         }

src/Enums/TypeKindEnum.php

@@ -2,6 +2,8 @@
 
 namespace Astral\Serialize\Enums;
 
+use http\Exception\RuntimeException;
+
 enum TypeKindEnum
 {
     case MIXED;
@@ -63,6 +65,7 @@ public static function getNameTo(string $type, ?string $className = null): self
             'array'  => self::ARRAY,
             'object' => self::OBJECT,
             'mixed'  => self::MIXED,
+            default  => throw new RuntimeException("not found type $type"),
         };
     }
 }