Actualize to 7.4

.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:

composer.json

@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php" : ">=5.5.0",
+        "php" : ">=8.1",
         "ext-curl": "*",
         "ext-json": "*"
     },

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"

src/BotApi.php

@@ -167,42 +167,18 @@
      */
     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);
-        }
     }
 
     /**
@@ -217,7 +193,7 @@
         $sign = $data['hash'];
         unset($data['hash']);
 
         if ($authDateDiff && (time() - $data['auth_date'] > $authDateDiff)) {
             return false;
         }
 
@@ -287,10 +263,10 @@
     public function downloadFile($fileId)
     {
         $file = $this->getFile($fileId);
         if (!$path = $file->getFilePath()) {
             throw new Exception('Empty file_path property');
         }
         if (!$this->fileEndpoint) {
             return file_get_contents($path);
         }
 
@@ -313,12 +289,12 @@
     {
         @trigger_error(sprintf('Method "%s::%s" is deprecated', __CLASS__, __METHOD__), \E_USER_DEPRECATED);
 
         if ($response) {
             $json = json_decode($response, true) ?: [];
         } else {
             $json = [];
         }
         if (($httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE))
             && !in_array($httpCode, [self::DEFAULT_STATUS_CODE, self::NOT_MODIFIED_STATUS_CODE])
         ) {
             $errorDescription = array_key_exists('description', $json) ? $json['description'] : self::$codes[$httpCode];
@@ -643,12 +619,6 @@
             'timeout' => $timeout,
         ]));
 
-        if ($this->tracker instanceof Botan) {
-            foreach ($updates as $update) {
-                $this->trackUpdate($update);
-            }
-        }
-
         return $updates;
     }
 
@@ -1804,56 +1774,6 @@
         ]);
     }
 
-    /**
-     * @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.
      *

src/Client.php

@@ -40,17 +40,13 @@
      * 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();
     }
 
     /**
@@ -169,7 +165,7 @@
      */
     public function run()
     {
         if ($data = BotApi::jsonValidate((string) $this->getRawBody(), true)) {
             /** @var array $data */
             $this->handle([Update::fromResponse($data)]);
         }
@@ -369,7 +365,7 @@
                 return false;
             }
             $text = $message->getText();
             if (empty($text)) {
                 return false;
             }
 

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;
                 }
             }