support deserialization of objects with promoted properties

Author: ilvalerione

composer.json

@@ -30,7 +30,7 @@
         "elasticsearch/elasticsearch": "^8.0",
         "friendsofphp/php-cs-fixer": "^3.75",
         "html2text/html2text": "^4.3",
-        "illuminate/database": "^10.0",
+        "illuminate/database": "^10.0|^11.0|^12.0",
         "phpstan/phpstan": "^2.1",
         "phpunit/phpunit": "^9.0",
         "rector/rector": "^2.0",

src/Chat/History/EloquentChatHistory.php

@@ -26,10 +26,12 @@ protected function load(): void
         /** @var Model $model */
         $model = new $this->modelClass();
 
+        /** @var array<string, mixed> $messages */
         $messages = $model->newQuery()
             ->where('thread_id', $this->threadId)
             ->orderBy('id')
             ->get()
+            // @phpstan-ignore-next-line
             ->map($this->recordToArray(...))
             ->all();
 

tests/ChatHistory/EloquentChatHistoryTest.php

@@ -248,6 +248,11 @@ public function test_serializes_message_meta_correctly(): void
 
 /**
  * Mock Eloquent Model for testing
+ *
+ * @property string $thread_id
+ * @property string $role
+ * @property string $content
+ * @property array $meta
  */
 class ChatMessage extends Model
 {

tests/DeserializerTest.php

@@ -9,6 +9,7 @@
 use NeuronAI\StructuredOutput\SchemaProperty;
 use NeuronAI\Tests\Stubs\DummyEnum;
 use NeuronAI\Tests\Stubs\IntEnum;
+use NeuronAI\Tests\Stubs\StructuredOutput\ColorWithDefaults;
 use NeuronAI\Tests\Stubs\StructuredOutput\Person;
 use NeuronAI\Tests\Stubs\StructuredOutput\Tag;
 use NeuronAI\Tests\Stubs\StringEnum;
@@ -38,17 +39,6 @@ public function test_person_with_address(): void
         $this->assertEquals('Rome', $obj->address->city);
     }
 
-    public function test_constructor_as_new_instance(): void
-    {
-        // Check we can manually instantiate the class with values
-        $greenObj = new ColorWithDefaults(0, 255, 0);
-
-        $this->assertInstanceOf(ColorWithDefaults::class, $greenObj);
-        $this->assertEquals(0, $greenObj->r);
-        $this->assertEquals(255, $greenObj->g);
-        $this->assertEquals(0, $greenObj->b);
-    }
-
     public function test_constructor_deserialize_with_default_values(): void
     {
         // Create a new instance from json deserialization, where all properties are optional and have default values (will be black)
@@ -57,22 +47,23 @@ public function test_constructor_deserialize_with_default_values(): void
         $obj = Deserializer::make()->fromJson($json, ColorWithDefaults::class);
 
         $this->assertInstanceOf(ColorWithDefaults::class, $obj);
-        $this->assertEquals(0, $obj->r);
-        $this->assertEquals(0, $obj->g);
-        $this->assertEquals(0, $obj->b);
+        $this->assertEquals(100, $obj->r);
+        $this->assertEquals(100, $obj->g);
+        $this->assertEquals(100, $obj->b);
     }
 
     public function test_constructor_deserialize_with_provided_values(): void
     {
         // Create a new instance, where properties are being provided for a "green" color
-        $json = '{"r": 0, "g": 255, "b": 0}';
+        $json = '{"r": 255, "g": 0, "b": 0, "transparency": 100}';
 
         $obj = Deserializer::make()->fromJson($json, ColorWithDefaults::class);
 
         $this->assertInstanceOf(ColorWithDefaults::class, $obj);
-        $this->assertEquals(0, $obj->r);
-        $this->assertEquals(255, $obj->g);
+        $this->assertEquals(255, $obj->r);
+        $this->assertEquals(0, $obj->g);
         $this->assertEquals(0, $obj->b);
+        $this->assertEquals(100, $obj->transparency);
     }
 
     public function test_deserialize_array(): void

tests/Stubs/StructuredOutput/ColorWithDefaults.php

@@ -1,21 +1,24 @@
 <?php
 
-declare( strict_types=1 );
+declare(strict_types=1);
 
 namespace NeuronAI\Tests\Stubs\StructuredOutput;
 
 use NeuronAI\StructuredOutput\SchemaProperty;
 
 class ColorWithDefaults
 {
+    #[SchemaProperty(description: "The alpha value", required: false)]
+    public int $transparency;
 
     public function __construct(
-        #[SchemaProperty( description: "The RED", required: false )]
-        public int $r = 0,
-        #[SchemaProperty( description: "The GREEN", required: false )]
-        public int $g = 0,
-        #[SchemaProperty( description: "The BLUE", required: false )]
-        public int $b = 0,
-    ) {}
+        #[SchemaProperty(description: "The RED", required: false)]
+        public int $r = 100,
+        #[SchemaProperty(description: "The GREEN", required: false)]
+        public int $g = 100,
+        #[SchemaProperty(description: "The BLUE", required: false)]
+        public int $b = 100,
+    ) {
+    }
 
 }

tests/Traits/CheckOpenPort.php

@@ -6,7 +6,7 @@
 
 trait CheckOpenPort
 {
-    private function isPortOpen(string $host, int $port, int $timeout = 1): bool
+    private function isPortOpen(string $host, int $port, float $timeout = 0.5): bool
     {
         $connection = @\fsockopen($host, $port, $errno, $errstr, $timeout);
         if (\is_resource($connection)) {