refactoring

labi-le · Sep 1, 2021 · 32211a7 · 32211a7
1 parent 5bf3694
commit 32211a7
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 23 deletions.
diff --git a/src/DataFetcher.php b/src/DataFetcher.php
@@ -21,7 +21,6 @@ class DataFetcher
     private string $type;
     private int $group_id;
     private string $event_id;
-    protected \Closure $callable_sort;
 
 
     /**
@@ -58,25 +57,6 @@ public function getEventId(): string
 
     public function __construct(private ?object $data = null)
     {
-        $this->callable_sort = fn($data) => array_walk($data, function ($value, $property) {
-            if (property_exists($this, $property)) {
-
-                if ($property === "peer_id" && $value - 2000000000 > 0) {
-                    $this->chat_id = $value - 2000000000;
-                }
-
-                if ($property === "payload") {
-                    $this->payload = match (gettype($value)) {
-                        "object" => (array) $value,
-                        "string" => @json_decode($value, true),
-                        "array" => $value,
-                    };
-                } else {
-                    $this->$property = $value;
-                }
-            }
-        });
-
         if ($data?->type === "message_new") {
             $this->client_info = $data?->object->client_info;
         }

diff --git a/src/Events/MessageEvent.php b/src/Events/MessageEvent.php
@@ -10,6 +10,7 @@
 namespace Astaroth\DataFetcher\Events;
 
 use Astaroth\DataFetcher\DataFetcher;
+use Astaroth\DataFetcher\Sort;
 
 /**
  * Class MessageEvent
@@ -18,6 +19,8 @@
  */
 final class MessageEvent extends DataFetcher
 {
+    use Sort;
+
     private int $peer_id;
     private int $user_id;
     private int $conversation_message_id;
@@ -29,7 +32,7 @@ final class MessageEvent extends DataFetcher
     public function __construct(?object $data = null)
     {
         parent::__construct($data);
-        ($this->callable_sort)($data?->object);
+        $this->sort($data?->object);
     }
 
     /**

diff --git a/src/Events/MessageNew.php b/src/Events/MessageNew.php
@@ -10,6 +10,7 @@
 
 
 use Astaroth\DataFetcher\DataFetcher;
+use Astaroth\DataFetcher\Sort;
 
 /**
  * Class MessageNew
@@ -19,6 +20,8 @@
  */
 final class MessageNew extends DataFetcher
 {
+    use Sort;
+
     private int $id;
     private int $out;
     private int $date;
@@ -51,7 +54,7 @@ final class MessageNew extends DataFetcher
     public function __construct(?object $data = null)
     {
         parent::__construct($data);
-        ($this->callable_sort)($data?->object->message);
+        $this->sort($data?->object->message);
     }
 
     /**

diff --git a/src/Events/WallPostNew.php b/src/Events/WallPostNew.php
@@ -8,13 +8,16 @@
 namespace Astaroth\DataFetcher\Events;
 
 use Astaroth\DataFetcher\DataFetcher;
+use Astaroth\DataFetcher\Sort;
 
 /**
  * Class WallPostNew
  * @package Astaroth\DataFetcher\Events
  */
 final class WallPostNew extends DataFetcher
 {
+    use Sort;
+
     private int $id;
     private int $from_id;
     private int $owner_id;
@@ -33,7 +36,7 @@ final class WallPostNew extends DataFetcher
     public function __construct(?object $data = null)
     {
         parent::__construct($data);
-        ($this->callable_sort)($data?->object->message);
+        $this->sort($data?->object);
     }
 
     /**

diff --git a/src/Sort.php b/src/Sort.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Astaroth\DataFetcher;
+
+trait Sort
+{
+    private function sort($data): void
+    {
+        array_walk($data, function ($value, $property) {
+            if (property_exists($this, $property)) {
+
+                if ($property === "peer_id" && $value - 2000000000 > 0) {
+                    $this->chat_id = $value - 2000000000;
+                }
+
+                if ($property === "payload") {
+                    $this->payload = match (gettype($value)) {
+                        "object" => (array)$value,
+                        "string" => @json_decode($value, true),
+                        "array" => $value,
+                    };
+                } else {
+                    $this->$property = $value;
+                }
+            }
+        });
+    }
+}