.github/workflows/ci.yml

@@ -15,14 +15,14 @@ jobs:
       matrix:
         php-version: ['7.3', '7.4', '8.0', '8.1']
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - name: Setup PHP ${{ matrix.php-version }}
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
           tools: composer:v1
       - name: Composer cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ${{ env.HOME }}/.composer/cache
           key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

phpstan-baseline.neon

@@ -1355,11 +1355,6 @@ 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

src/Bot/Model/Constants.php

@@ -38,7 +38,6 @@ class Constants
 
     const BOT_ROLE_DISTRIBUTOR = "distributor";
     const BOT_ROLE_RESPONSIBLE = "responsible";
-    const BOT_ROLE_HIDDEN = "hidden";
 
     const MESSAGE_SCOPE_PUBLIC  = "public";
     const MESSAGE_SCOPE_PRIVATE = "private";

src/Bot/Model/Entity/Dialog.php

@@ -119,15 +119,6 @@ class Dialog implements ModelInterface
      */
     private $isActive;
 
-    /**
-     * @var Utm $utm
-     *
-     * @Type("RetailCrm\Mg\Bot\Model\Entity\Utm")
-     * @Accessor(getter="getUtm",setter="setUtm")
-     * @SkipWhenEmpty()
-     */
-    private $utm;
-
     /**
      * @return string|null
      */
@@ -303,21 +294,4 @@ class Dialog implements ModelInterface
     {
         $this->isActive = $isActive;
     }
-
-    /**
-     * @return Utm|null
-     */
-    public function getUtm(): ?Utm
-    {
-        return $this->utm;
-    }
-
-    /**
-     * @param Utm $utm
-     * @return void
-     */
-    public function setUtm(Utm $utm): void
-    {
-        $this->utm = $utm;
-    }
 }

src/Bot/Model/Request/MembersRequest.php

@@ -22,7 +22,6 @@ use RetailCrm\Mg\Bot\Model\ModelInterface;
  */
 class MembersRequest implements ModelInterface
 {
-    use CommonFields;
     use PageLimit;
 
     /**
@@ -52,6 +51,24 @@ 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
      */
@@ -99,4 +116,36 @@ 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;
+    }
 }