From 9a23562cbd43398b0c3d0c7f247ee8350f00fb35 Mon Sep 17 00:00:00 2001
From: Alex Komarichev <komari4ev@gmail.com>
Date: Tue, 25 Mar 2025 18:36:13 +0300
Subject: [PATCH 1/2] Use CommonFields in MembersRequest

---
 src/Bot/Model/Request/MembersRequest.php | 51 +-----------------------
 1 file changed, 1 insertion(+), 50 deletions(-)

diff --git a/src/Bot/Model/Request/MembersRequest.php b/src/Bot/Model/Request/MembersRequest.php
index 8b41872..b5546ce 100644
--- a/src/Bot/Model/Request/MembersRequest.php
+++ b/src/Bot/Model/Request/MembersRequest.php
@@ -22,6 +22,7 @@ use RetailCrm\Mg\Bot\Model\ModelInterface;
  */
 class MembersRequest implements ModelInterface
 {
+    use CommonFields;
     use PageLimit;
 
     /**
@@ -51,24 +52,6 @@ class MembersRequest implements ModelInterface
      */
     private $state;
 
-    /**
-     * @var string $since
-     *
-     * @Type("string")
-     * @Accessor(getter="getSince",setter="setSince")
-     * @SkipWhenEmpty
-     */
-    private $since;
-
-    /**
-     * @var string $until
-     *
-     * @Type("string")
-     * @Accessor(getter="getUntil",setter="setUntil")
-     * @SkipWhenEmpty
-     */
-    private $until;
-
     /**
      * @return int
      */
@@ -116,36 +99,4 @@ class MembersRequest implements ModelInterface
     {
         $this->state = $state;
     }
-
-    /**
-     * @return string
-     */
-    public function getSince()
-    {
-        return $this->since;
-    }
-
-    /**
-     * @param string $since
-     */
-    public function setSince(string $since)
-    {
-        $this->since = $since;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUntil()
-    {
-        return $this->until;
-    }
-
-    /**
-     * @param string $until
-     */
-    public function setUntil(string $until)
-    {
-        $this->until = $until;
-    }
 }

From f65dcac9f589fa5af42d52063c7eef2b96ba0fbf Mon Sep 17 00:00:00 2001
From: Alex Komarichev <komari4ev@gmail.com>
Date: Wed, 26 Mar 2025 11:33:11 +0300
Subject: [PATCH 2/2] ignore phpstan setID type error

---
 phpstan-baseline.neon | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 012848f..24f8cc0 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1355,6 +1355,11 @@ parameters:
 			count: 1
 			path: src/Bot/Model/Request/MembersRequest.php
 
+		-
+			message: "#^Method RetailCrm\\\\Mg\\\\Bot\\\\Model\\\\Request\\\\MembersRequest\\:\\:setId\\(\\) has no return typehint specified\\.$#"
+			count: 1
+			path: src/Bot/Model/Request/MembersRequest.php
+
 		-
 			message: "#^Method RetailCrm\\\\Mg\\\\Bot\\\\Model\\\\Request\\\\MembersRequest\\:\\:setSince\\(\\) has no return typehint specified\\.$#"
 			count: 1