Merge pull request #14 from CrazyTapok-bit/dev-master

Single form of filling entities with data has been

src/Entities/InitData.php

@@ -5,8 +5,9 @@
 use TgWebValid\Entities\InitData\Chat;
 use TgWebValid\Entities\InitData\Receiver;
 use TgWebValid\Entities\InitData\User;
+use TgWebValid\Entities\Make\InitDataMake;
 
-class InitData extends Make
+class InitData extends InitDataMake
 {
     /**
      * Optional. A unique identifier for the Web App session, required for sending messages via the answerWebAppQuery method.

src/Entities/InitData/Chat.php

@@ -2,7 +2,7 @@
 
 namespace TgWebValid\Entities\InitData;
 
-use TgWebValid\Entities\Make;
+use TgWebValid\Entities\Make\Make;
 
 class Chat extends Make
 {

src/Entities/InitData/Receiver.php

@@ -2,7 +2,7 @@
 
 namespace TgWebValid\Entities\InitData;
 
-use TgWebValid\Entities\Make;
+use TgWebValid\Entities\Make\Make;
 
 class Receiver extends Make
 {

src/Entities/InitData/User.php

@@ -2,7 +2,7 @@
 
 namespace TgWebValid\Entities\InitData;
 
-use TgWebValid\Entities\Make;
+use TgWebValid\Entities\Make\Make;
 
 class User extends Make
 {

src/Entities/User.php → src/Entities/LoginWidget.php

@@ -2,7 +2,9 @@
 
 namespace TgWebValid\Entities;
 
-class User extends Make
+use TgWebValid\Entities\Make\Make;
+
+class LoginWidget extends Make
 {
     /**
      * A unique identifier for the user or bot.

src/Entities/Make/InitDataMake.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace TgWebValid\Entities\Make;
+
+use TgWebValid\Entities\InitData\Chat;
+use TgWebValid\Entities\InitData\Receiver;
+use TgWebValid\Entities\InitData\User;
+
+class InitDataMake extends Make
+{
+    public function __construct(array $props)
+    {
+        foreach ($props as $prop => $value) {
+            $props[$prop] = match ($prop) {
+                'user'     => new User(json_decode($value, true)),
+                'receiver' => new Receiver(json_decode($value, true)),
+                'chat'     => new Chat(json_decode($value, true)),
+                default    => $value
+            };
+        }
+        parent::__construct($props);
+    }
+}

src/Entities/Make.php → src/Entities/Make/Make.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace TgWebValid\Entities;
+namespace TgWebValid\Entities\Make;
 
 class Make
 {

src/TgWebValid.php

@@ -3,13 +3,13 @@
 namespace TgWebValid;
 
 use TgWebValid\Entities\InitData;
-use TgWebValid\Entities\User;
+use TgWebValid\Entities\LoginWidget;
 
 class TgWebValid
 {
     public ?InitData $initData;
 
-    public ?User $user;
+    public ?LoginWidget $user;
 
     public function __construct(
         private string $token
@@ -21,12 +21,23 @@ public function isValid(string $initData)
     {
         $rawData = explode('&', rawurldecode($initData));
 
-        sort($rawData);
-
-        $this->initData = new InitData(array_merge(...array_map(
-            fn ($item) => (new Field(...explode('=', $item)))->toArray(),
+        $rawData = array_merge(...array_map(
+            function($item) {
+                [$prop, $value] = explode('=', $item);
+                return [$prop => $value];
+            },
             $rawData
-        )));
+        ));
+
+        $this->initData = new InitData($rawData);
+
+        $rawData = array_map(
+            fn($value, $key)  => $key . '=' . $value,
+            $rawData,
+            array_keys($rawData)
+        );
+
+        sort($rawData);
 
         $data = implode("\n", $this->ridHash($rawData));
 
@@ -38,7 +49,7 @@ public function isValid(string $initData)
 
     public function isLoginValid(array $user)
     {
-        $this->user = new User($user);
+        $this->user = new LoginWidget($user);
 
         $rawData = array_map(
             fn($value, $key)  => $key . '=' . $value,