Actualize to 7.4 (#474)

* Actualized Types: Chat User Added missed Types: ArrayOfReactionType MessageOriginChannel ReactionType ReactionTypeCustomEmoji ReactionTypeEmoji Added some tests * Actualized Types * Actualized Types * Actualized Types * Actualized Types * rm tracker * rm tracker * upd Chat classes * php cs-fixer * upd MessageOriginChannel * fix BotApiTest * added types to User
TelegramBot · Jun 30, 2024 · d11cf3a · d11cf3a
1 parent fcc0241
commit d11cf3a
Show file tree

Hide file tree

Showing 140 changed files with 13,145 additions and 2,431 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -13,14 +13,6 @@ jobs:
                 os:
                     - ubuntu-latest
                 php:
-                    - "5.5"
-                    - "5.6"
-                    - "7.0"
-                    - "7.1"
-                    - "7.2"
-                    - "7.3"
-                    - "7.4"
-                    - "8.0"
                     - "8.1"
                     - "8.2"
         steps:

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php" : ">=5.5.0",
+        "php" : ">=8.1",
         "ext-curl": "*",
         "ext-json": "*"
     },

diff --git a/psalm.xml b/psalm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="2"
-    phpVersion="5.5"
+    phpVersion="8.1"
     findUnusedBaselineEntry="false"
     findUnusedCode="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

diff --git a/src/BotApi.php b/src/BotApi.php
@@ -167,42 +167,18 @@ class BotApi
      */
     private $fileEndpoint;
 
-    /**
-     * @deprecated
-     *
-     * Botan tracker
-     *
-     * @var Botan|null
-     */
-    protected $tracker;
-
-    /**
-     * @deprecated
-     *
-     * list of event ids
-     *
-     * @var array
-     */
-    protected $trackedEvents = [];
-
     /**
      * @param string $token Telegram Bot API token
-     * @param string|null $trackerToken Yandex AppMetrica application api_key
      * @param HttpClientInterface|null $httpClient
      * @param string|null $endpoint
      */
-    public function __construct($token, $trackerToken = null, HttpClientInterface $httpClient = null, $endpoint = null)
+    public function __construct($token, HttpClientInterface $httpClient = null, $endpoint = null)
     {
         $this->token = $token;
         $this->endpoint = ($endpoint ?: self::URL_PREFIX) . $token;
         $this->fileEndpoint = $endpoint ? null : (self::FILE_URL_PREFIX . $token);
 
         $this->httpClient = $httpClient ?: new CurlHttpClient();
-
-        if ($trackerToken) {
-            @trigger_error(sprintf('Passing $trackerToken to %s is deprecated', self::class), \E_USER_DEPRECATED);
-            $this->tracker = new Botan($trackerToken);
-        }
     }
 
     /**
@@ -643,12 +619,6 @@ public function getUpdates($offset = 0, $limit = 100, $timeout = 0)
             'timeout' => $timeout,
         ]));
 
-        if ($this->tracker instanceof Botan) {
-            foreach ($updates as $update) {
-                $this->trackUpdate($update);
-            }
-        }
-
         return $updates;
     }
 
@@ -1804,56 +1774,6 @@ public function deleteMessage($chatId, $messageId)
         ]);
     }
 
-    /**
-     * @deprecated
-     *
-     * @param Update $update
-     * @param string $eventName
-     *
-     * @throws Exception
-     *
-     * @return void
-     */
-    public function trackUpdate(Update $update, $eventName = 'Message')
-    {
-        @trigger_error(sprintf('Method "%s::%s" is deprecated', __CLASS__, __METHOD__), \E_USER_DEPRECATED);
-
-        if (!in_array($update->getUpdateId(), $this->trackedEvents)) {
-            $message = $update->getMessage();
-            if (!$message) {
-                return;
-            }
-            $this->trackedEvents[] = $update->getUpdateId();
-
-            $this->track($message, $eventName);
-
-            if (count($this->trackedEvents) > self::MAX_TRACKED_EVENTS) {
-                $this->trackedEvents = array_slice($this->trackedEvents, (int) round(self::MAX_TRACKED_EVENTS / 4));
-            }
-        }
-    }
-
-    /**
-     * @deprecated
-     *
-     * Wrapper for tracker
-     *
-     * @param Message $message
-     * @param string $eventName
-     *
-     * @throws Exception
-     *
-     * @return void
-     */
-    public function track(Message $message, $eventName = 'Message')
-    {
-        @trigger_error(sprintf('Method "%s::%s" is deprecated', __CLASS__, __METHOD__), \E_USER_DEPRECATED);
-
-        if ($this->tracker instanceof Botan) {
-            $this->tracker->track($message, $eventName);
-        }
-    }
-
     /**
      * Use this method to send invoices. On success, the sent Message is returned.
      *

diff --git a/src/Botan.php b/src/Botan.php
diff --git a/src/Client.php b/src/Client.php
@@ -40,17 +40,13 @@ class Client
      * Client constructor
      *
      * @param string $token Telegram Bot API token
-     * @param string|null $trackerToken Yandex AppMetrica application api_key
      * @param HttpClientInterface|null $httpClient
      * @param string|null $endpoint
      */
-    public function __construct($token, $trackerToken = null, HttpClientInterface $httpClient = null, $endpoint = null)
+    public function __construct($token, HttpClientInterface $httpClient = null, $endpoint = null)
     {
-        if ($trackerToken) {
-            @trigger_error(sprintf('Passing $trackerToken to %s is deprecated', self::class), \E_USER_DEPRECATED);
-        }
-        $this->api = new BotApi($token, $trackerToken, $httpClient, $endpoint);
-        $this->events = new EventCollection($trackerToken);
+        $this->api = new BotApi($token, $httpClient, $endpoint);
+        $this->events = new EventCollection();
     }
 
     /**

diff --git a/src/Events/EventCollection.php b/src/Events/EventCollection.php
@@ -3,8 +3,6 @@
 namespace TelegramBot\Api\Events;
 
 use Closure;
-use ReflectionFunction;
-use TelegramBot\Api\Botan;
 use TelegramBot\Api\Types\Update;
 
 class EventCollection
@@ -14,28 +12,7 @@ class EventCollection
      *
      * @var array
      */
-    protected $events;
-
-    /**
-     * Botan tracker
-     *
-     * @var \TelegramBot\Api\Botan|null
-     */
-    protected $tracker;
-
-    /**
-     * EventCollection constructor.
-     *
-     * @param string $trackerToken
-     */
-    public function __construct($trackerToken = null)
-    {
-        $this->events = [];
-        if ($trackerToken) {
-            @trigger_error(sprintf('Passing $trackerToken to %s is deprecated', self::class), \E_USER_DEPRECATED);
-            $this->tracker = new Botan($trackerToken);
-        }
-    }
+    protected $events = [];
 
     /**
      * Add new event to collection
@@ -62,10 +39,6 @@ public function handle(Update $update)
             /* @var \TelegramBot\Api\Events\Event $event */
             if ($event->executeChecker($update) === true) {
                 if ($event->executeAction($update) === false) {
-                    if ($this->tracker && ($message = $update->getMessage())) {
-                        $checker = new ReflectionFunction($event->getChecker());
-                        $this->tracker->track($message, $checker->getStaticVariables()['name']);
-                    }
                     break;
                 }
             }