Get rid of identical Make child classes

CrazyTapok-bit · Mar 31, 2024 · b3a27f4 · b3a27f4
1 parent 913ab5b
commit b3a27f4
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 55 deletions.
diff --git a/src/Entities/InitData.php b/src/Entities/InitData.php
@@ -6,9 +6,9 @@
 use TgWebValid\Entities\InitData\Chat;
 use TgWebValid\Entities\InitData\Receiver;
 use TgWebValid\Entities\InitData\User;
-use TgWebValid\Make\InitData as MakeInitData;
+use TgWebValid\Make\Make;
 
-final class InitData extends MakeInitData
+final class InitData extends Make
 {
     /**
      * Optional. A unique identifier for the Web App session, required for sending messages via the answerWebAppQuery method.

diff --git a/src/Entities/LoginWidget.php b/src/Entities/LoginWidget.php
@@ -3,9 +3,9 @@
 namespace TgWebValid\Entities;
 
 use Carbon\CarbonInterface;
-use TgWebValid\Make\LoginWidget as MakeLoginWidget;
+use TgWebValid\Make\Make;
 
-final class LoginWidget extends MakeLoginWidget
+final class LoginWidget extends Make
 {
     /**
      * A unique identifier for the user or bot.

diff --git a/src/Make/InitData.php b/src/Make/InitData.php
diff --git a/src/Make/LoginWidget.php b/src/Make/LoginWidget.php
diff --git a/src/Make/Make.php b/src/Make/Make.php
@@ -2,6 +2,9 @@
 
 namespace TgWebValid\Make;
 
+use Carbon\Carbon;
+use ReflectionNamedType;
+use ReflectionProperty;
 use TgWebValid\Support\Arrayable;
 
 abstract class Make extends Arrayable
@@ -12,15 +15,34 @@ abstract class Make extends Arrayable
     public function __construct(array $props = [])
     {
         foreach ($props as $prop => $value) {
+            $value = match ($prop) {
+                'auth_date' => Carbon::createFromTimestamp((int) $value),
+                default     => $value
+            };
             $this->setProperty(camelize($prop), $value);
         }
     }
 
     protected function setProperty(string $property, mixed $value): void
     {
-        if (property_exists(get_class($this), $property)) {
+        if(!property_exists(get_class($this), $property)) {
+            return;
+        }
+
+        $reflection = new ReflectionProperty(get_class($this), $property);
+
+        $type = $reflection->getType();
+
+        if(!($type instanceof ReflectionNamedType) || $type->isBuiltin()) {
             $this->$property = $value;
+            return;
         }
+
+        $class = $type->getName();
+
+        $this->$property = is_subclass_of($class, self::class)
+            ? new $class($this->tryParseJSON($value))
+            : $value;
     }
 
     /**