telegram-bot-php / core

src/lib/Telegram.php

Braces +9 added lines, -3 removed lines

@@ -258,7 +258,9 @@ 
 	public static function getUpdate(): Update|false
 	{
 		$input = self::getInput();
-		if (empty($input)) return false;
+		if (empty($input)) {
+		    return false;
+		}
 		return Telegram::processUpdate($input, self::getApiKey());
 	}
 
@@ -284,7 +286,9 @@ 
 	public function fetchWith(WebhookHandler $webhook_handler, ?Update $update = null): void
 	{
 		if (is_subclass_of($webhook_handler, WebhookHandler::class)) {
-			if ($update === null) $update = self::getUpdate();
+			if ($update === null) {
+			    $update = self::getUpdate();
+			}
 			$webhook_handler->resolve($update);
 		}
 	}
@@ -297,7 +301,9 @@ 
 	 */
 	protected function getTokenFromEnvFile(string $file): ?string
 	{
-		if (!file_exists($file)) return null;
+		if (!file_exists($file)) {
+		    return null;
+		}
 		return DotEnv::load($file)::get('TELEGRAM_API_KEY');
 	}
 

Indentation +318 added lines, -318 removed lines

@@ -18,323 +18,323 @@
 class Telegram
 {
 
-	/**
-	 * @var string
-	 */
-	private string $api_key;
-
-	/**
-	 * @var string
-	 */
-	public static string $VERSION = 'v1.0.0';
-
-	/**
-	 * Telegram constructor.
-	 *
-	 * @param string $api_key
-	 */
-	public function __construct(string $api_key = '')
-	{
-		if ($api_key === '') {
-			$env_file = $this->getEnvFilePath();
-			$api_key = DotEnv::load($env_file)->get('TELEGRAM_API_KEY');
-		}
-
-		if (empty($api_key) || !is_string($api_key)) {
-			throw new TelegramException('API Key is required');
-		}
-
-		DotEnv::put('TG_CURRENT_KEY', ($this->api_key = $api_key));
-		DotEnv::put('TELEGRAM_API_KEY', ($this->api_key = $api_key));
-	}
-
-	/**
-	 * Get env file path and return it
-	 *
-	 * @return string
-	 */
-	private function getEnvFilePath(): string
-	{
-		$defaultEnvPaths = [
-			$_SERVER['DOCUMENT_ROOT'] . '/.env',
-			getcwd() . '/../.env',
-			getcwd() . '/.env',
-		];
-
-		foreach ($defaultEnvPaths as $path) {
-			if (file_exists($path)) {
-				return $path;
-			}
-		}
-
-		return '';
-	}
-
-	/**
-	 * Get API key from temporary ENV variable
-	 *
-	 * @return ?string
-	 */
-	public static function getApiKey(): ?string
-	{
-		return DotEnv::get('TG_CURRENT_KEY');
-	}
-
-	/**
-	 * Get bot info from given API key
-	 *
-	 * @return Response
-	 * @throws TelegramException
-	 */
-	public function getInfo(): Response
-	{
-		$result = Request::getMe();
-
-		if (!$result->isOk()) {
-			throw new TelegramException($result->getErrorCode() . ': ' . $result->getDescription());
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Set Webhook for bot
-	 *
-	 * @param string $url
-	 * @param array $data Optional parameters.
-	 * @return Response
-	 * @throws TelegramException
-	 */
-	public function setWebhook(string $url, array $data = []): Response
-	{
-		if ($url === '') {
-			throw new TelegramException('Hook url is empty!');
-		}
-
-		if (!str_starts_with($url, 'https://')) {
-			throw new TelegramException('Hook url must start with https://');
-		}
-
-		$data = array_intersect_key($data, array_flip([
-			'certificate',
-			'ip_address',
-			'max_connections',
-			'allowed_updates',
-			'drop_pending_updates',
-		]));
-		$data['url'] = $url;
-
-		$result = Request::setWebhook($data);
-
-		if (!$result->isOk()) {
-			throw new TelegramException(
-				'Webhook was not set! Error: ' . $result->getErrorCode() . ' ' . $result->getDescription()
-			);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Delete any assigned webhook
-	 *
-	 * @param array $data
-	 * @return Response
-	 * @throws TelegramException
-	 */
-	public function deleteWebhook(array $data = []): Response
-	{
-		$result = Request::deleteWebhook($data);
-
-		if (!$result->isOk()) {
-			throw new TelegramException(
-				'Webhook was not deleted! Error: ' . $result->getErrorCode() . ' ' . $result->getDescription()
-			);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * This method sets the admin username. and will be used to send you a message if the bot is not working.
-	 *
-	 * @param int $chat_id
-	 * @return void
-	 */
-	public function setAdmin(int $chat_id): void
-	{
-		defined('TG_ADMIN_ID') or define('TG_ADMIN_ID', $chat_id);
-	}
-
-	/**
-	 * Get input from stdin and return it
-	 *
-	 * @return ?string
-	 */
-	public static function getInput(): ?string
-	{
-		return file_get_contents('php://input') ?? null;
-	}
-
-	/**
-	 * This method will convert a string to an update object
-	 *
-	 * @param string $input The input string
-	 * @param string $apiKey The API key
-	 * @return Update|false
-	 */
-	public static function processUpdate(string $input, string $apiKey): Update|false
-	{
-		if (empty($input)) {
-			throw new TelegramException(
-				'Input is empty! Please check your code and try again.'
-			);
-		}
-
-		if (!self::validateToken($apiKey)) {
-			throw new TelegramException(
-				'Invalid token! Please check your code and try again.'
-			);
-		}
-
-		if (self::validateWebData($apiKey, $input)) {
-			if (Common::isUrlEncode($input)) {
-				$web_data = Common::urlDecode($input);
-			}
-
-			if (Common::isJson($input)) {
-				$web_data = json_decode($input, true);
-			}
-
-			$input = json_encode([
-				'web_data' => $web_data,
-			]);
-		}
-
-		if (!Common::isJson($input)) {
-			throw new TelegramException(
-				'Input is not a valid JSON string! Please check your code and try again.'
-			);
-		}
-
-		$input = json_decode($input, true);
-
-		return new Update($input);
-	}
-
-	/**
-	 * Validate webapp data from is from Telegram
-	 *
-	 * @link https://core.telegram.org/bots/webapps#validating-data-received-via-the-web-app
-	 *
-	 * @param string $token The bot token
-	 * @param string $body The message body from getInput()
-	 * @return bool
-	 */
-	public static function validateWebData(string $token, string $body): bool
-	{
-		if (!Common::isJson($body)) {
-			$raw_data = rawurldecode(str_replace('_auth=', '', $body));
-			$data = Common::urlDecode($raw_data);
-
-			if (empty($data['user'])) {
-				return false;
-			}
-
-			$data['user'] = urldecode($data['user']);
-
-		} else {
-			$data = json_decode($body, true);
-
-			if (empty($data['user'])) {
-				return false;
-			}
-
-			$data['user'] = json_encode($data['user']);
-		}
-
-		$data_check_string = "auth_date={$data['auth_date']}\nquery_id={$data['query_id']}\nuser={$data['user']}";
-		$secret_key = hash_hmac('sha256', $token, "WebAppData", true);
-
-		return hash_hmac('sha256', $data_check_string, $secret_key) == $data['hash'];
-	}
-
-	/**
-	 * Get the update from input
-	 *
-	 * @return Update|false
-	 */
-	public static function getUpdate(): Update|false
-	{
-		$input = self::getInput();
-		if (empty($input)) return false;
-		return Telegram::processUpdate($input, self::getApiKey());
-	}
-
-	/**
-	 * Validate the token
-	 *
-	 * @param string $token (e.g. 123456789:ABC-DEF1234ghIkl-zyx57W2v1u123ew11) {digit}:{alphanumeric[34]}
-	 * @return bool
-	 */
-	public static function validateToken(string $token): bool
-	{
-		preg_match_all('/([0-9]+:[a-zA-Z0-9-_]+)/', $token, $matches);
-		return count($matches[0]) == 1;
-	}
-
-	/**
-	 * Pass the update to the given webhook handler
-	 *
-	 * @param WebhookHandler $webhook_handler The webhook handler
-	 * @param ?Update $update By default, it will get the update from input
-	 * @return void
-	 */
-	public function fetchWith(WebhookHandler $webhook_handler, ?Update $update = null): void
-	{
-		if (is_subclass_of($webhook_handler, WebhookHandler::class)) {
-			if ($update === null) $update = self::getUpdate();
-			$webhook_handler->resolve($update);
-		}
-	}
-
-	/**
-	 * Get token from env file.
-	 *
-	 * @param string $file
-	 * @return ?string
-	 */
-	protected function getTokenFromEnvFile(string $file): ?string
-	{
-		if (!file_exists($file)) return null;
-		return DotEnv::load($file)::get('TELEGRAM_API_KEY');
-	}
-
-	/**
-	 * Debug mode
-	 *
-	 * @param ?int $admin_id Fill this or use setAdmin()
-	 * @return void
-	 */
-	public static function setDebugMode(?int $admin_id = null): void
-	{
-		error_reporting(E_ALL);
-		ini_set('display_errors', 1);
-		defined('DEBUG_MODE') or define('DEBUG_MODE', true);
-		if ($admin_id) {
-			defined('TG_ADMIN_ID') or define('TG_ADMIN_ID', $admin_id);
-		}
-	}
-
-	/**
-	 * Just another echo
-	 *
-	 * @param string $text
-	 * @return void
-	 */
-	public static function echo(string $text): void
-	{
-		echo $text;
-	}
+    /**
+     * @var string
+     */
+    private string $api_key;
+
+    /**
+     * @var string
+     */
+    public static string $VERSION = 'v1.0.0';
+
+    /**
+     * Telegram constructor.
+     *
+     * @param string $api_key
+     */
+    public function __construct(string $api_key = '')
+    {
+        if ($api_key === '') {
+            $env_file = $this->getEnvFilePath();
+            $api_key = DotEnv::load($env_file)->get('TELEGRAM_API_KEY');
+        }
+
+        if (empty($api_key) || !is_string($api_key)) {
+            throw new TelegramException('API Key is required');
+        }
+
+        DotEnv::put('TG_CURRENT_KEY', ($this->api_key = $api_key));
+        DotEnv::put('TELEGRAM_API_KEY', ($this->api_key = $api_key));
+    }
+
+    /**
+     * Get env file path and return it
+     *
+     * @return string
+     */
+    private function getEnvFilePath(): string
+    {
+        $defaultEnvPaths = [
+            $_SERVER['DOCUMENT_ROOT'] . '/.env',
+            getcwd() . '/../.env',
+            getcwd() . '/.env',
+        ];
+
+        foreach ($defaultEnvPaths as $path) {
+            if (file_exists($path)) {
+                return $path;
+            }
+        }
+
+        return '';
+    }
+
+    /**
+     * Get API key from temporary ENV variable
+     *
+     * @return ?string
+     */
+    public static function getApiKey(): ?string
+    {
+        return DotEnv::get('TG_CURRENT_KEY');
+    }
+
+    /**
+     * Get bot info from given API key
+     *
+     * @return Response
+     * @throws TelegramException
+     */
+    public function getInfo(): Response
+    {
+        $result = Request::getMe();
+
+        if (!$result->isOk()) {
+            throw new TelegramException($result->getErrorCode() . ': ' . $result->getDescription());
+        }
+
+        return $result;
+    }
+
+    /**
+     * Set Webhook for bot
+     *
+     * @param string $url
+     * @param array $data Optional parameters.
+     * @return Response
+     * @throws TelegramException
+     */
+    public function setWebhook(string $url, array $data = []): Response
+    {
+        if ($url === '') {
+            throw new TelegramException('Hook url is empty!');
+        }
+
+        if (!str_starts_with($url, 'https://')) {
+            throw new TelegramException('Hook url must start with https://');
+        }
+
+        $data = array_intersect_key($data, array_flip([
+            'certificate',
+            'ip_address',
+            'max_connections',
+            'allowed_updates',
+            'drop_pending_updates',
+        ]));
+        $data['url'] = $url;
+
+        $result = Request::setWebhook($data);
+
+        if (!$result->isOk()) {
+            throw new TelegramException(
+                'Webhook was not set! Error: ' . $result->getErrorCode() . ' ' . $result->getDescription()
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Delete any assigned webhook
+     *
+     * @param array $data
+     * @return Response
+     * @throws TelegramException
+     */
+    public function deleteWebhook(array $data = []): Response
+    {
+        $result = Request::deleteWebhook($data);
+
+        if (!$result->isOk()) {
+            throw new TelegramException(
+                'Webhook was not deleted! Error: ' . $result->getErrorCode() . ' ' . $result->getDescription()
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * This method sets the admin username. and will be used to send you a message if the bot is not working.
+     *
+     * @param int $chat_id
+     * @return void
+     */
+    public function setAdmin(int $chat_id): void
+    {
+        defined('TG_ADMIN_ID') or define('TG_ADMIN_ID', $chat_id);
+    }
+
+    /**
+     * Get input from stdin and return it
+     *
+     * @return ?string
+     */
+    public static function getInput(): ?string
+    {
+        return file_get_contents('php://input') ?? null;
+    }
+
+    /**
+     * This method will convert a string to an update object
+     *
+     * @param string $input The input string
+     * @param string $apiKey The API key
+     * @return Update|false
+     */
+    public static function processUpdate(string $input, string $apiKey): Update|false
+    {
+        if (empty($input)) {
+            throw new TelegramException(
+                'Input is empty! Please check your code and try again.'
+            );
+        }
+
+        if (!self::validateToken($apiKey)) {
+            throw new TelegramException(
+                'Invalid token! Please check your code and try again.'
+            );
+        }
+
+        if (self::validateWebData($apiKey, $input)) {
+            if (Common::isUrlEncode($input)) {
+                $web_data = Common::urlDecode($input);
+            }
+
+            if (Common::isJson($input)) {
+                $web_data = json_decode($input, true);
+            }
+
+            $input = json_encode([
+                'web_data' => $web_data,
+            ]);
+        }
+
+        if (!Common::isJson($input)) {
+            throw new TelegramException(
+                'Input is not a valid JSON string! Please check your code and try again.'
+            );
+        }
+
+        $input = json_decode($input, true);
+
+        return new Update($input);
+    }
+
+    /**
+     * Validate webapp data from is from Telegram
+     *
+     * @link https://core.telegram.org/bots/webapps#validating-data-received-via-the-web-app
+     *
+     * @param string $token The bot token
+     * @param string $body The message body from getInput()
+     * @return bool
+     */
+    public static function validateWebData(string $token, string $body): bool
+    {
+        if (!Common::isJson($body)) {
+            $raw_data = rawurldecode(str_replace('_auth=', '', $body));
+            $data = Common::urlDecode($raw_data);
+
+            if (empty($data['user'])) {
+                return false;
+            }
+
+            $data['user'] = urldecode($data['user']);
+
+        } else {
+            $data = json_decode($body, true);
+
+            if (empty($data['user'])) {
+                return false;
+            }
+
+            $data['user'] = json_encode($data['user']);
+        }
+
+        $data_check_string = "auth_date={$data['auth_date']}\nquery_id={$data['query_id']}\nuser={$data['user']}";
+        $secret_key = hash_hmac('sha256', $token, "WebAppData", true);
+
+        return hash_hmac('sha256', $data_check_string, $secret_key) == $data['hash'];
+    }
+
+    /**
+     * Get the update from input
+     *
+     * @return Update|false
+     */
+    public static function getUpdate(): Update|false
+    {
+        $input = self::getInput();
+        if (empty($input)) return false;
+        return Telegram::processUpdate($input, self::getApiKey());
+    }
+
+    /**
+     * Validate the token
+     *
+     * @param string $token (e.g. 123456789:ABC-DEF1234ghIkl-zyx57W2v1u123ew11) {digit}:{alphanumeric[34]}
+     * @return bool
+     */
+    public static function validateToken(string $token): bool
+    {
+        preg_match_all('/([0-9]+:[a-zA-Z0-9-_]+)/', $token, $matches);
+        return count($matches[0]) == 1;
+    }
+
+    /**
+     * Pass the update to the given webhook handler
+     *
+     * @param WebhookHandler $webhook_handler The webhook handler
+     * @param ?Update $update By default, it will get the update from input
+     * @return void
+     */
+    public function fetchWith(WebhookHandler $webhook_handler, ?Update $update = null): void
+    {
+        if (is_subclass_of($webhook_handler, WebhookHandler::class)) {
+            if ($update === null) $update = self::getUpdate();
+            $webhook_handler->resolve($update);
+        }
+    }
+
+    /**
+     * Get token from env file.
+     *
+     * @param string $file
+     * @return ?string
+     */
+    protected function getTokenFromEnvFile(string $file): ?string
+    {
+        if (!file_exists($file)) return null;
+        return DotEnv::load($file)::get('TELEGRAM_API_KEY');
+    }
+
+    /**
+     * Debug mode
+     *
+     * @param ?int $admin_id Fill this or use setAdmin()
+     * @return void
+     */
+    public static function setDebugMode(?int $admin_id = null): void
+    {
+        error_reporting(E_ALL);
+        ini_set('display_errors', 1);
+        defined('DEBUG_MODE') or define('DEBUG_MODE', true);
+        if ($admin_id) {
+            defined('TG_ADMIN_ID') or define('TG_ADMIN_ID', $admin_id);
+        }
+    }
+
+    /**
+     * Just another echo
+     *
+     * @param string $text
+     * @return void
+     */
+    public static function echo(string $text): void
+    {
+        echo $text;
+    }
 
 }
\ No newline at end of file

src/lib/TelegramLog.php

Indentation +137 added lines, -137 removed lines

@@ -25,142 +25,142 @@
 class TelegramLog
 {
 
-	/**
-	 * Logger instance
-	 *
-	 * @var LoggerInterface
-	 */
-	protected static LoggerInterface $logger;
-
-	/**
-	 * Logger instance for update
-	 *
-	 * @var LoggerInterface
-	 */
-	protected static LoggerInterface $update_logger;
-
-	/**
-	 * Always log the request and response data to the debug log, also for successful requests
-	 *
-	 * @var bool
-	 */
-	public static bool $always_log_request_and_response = false;
-
-	/**
-	 * Temporary stream handle for debug log
-	 *
-	 * @var resource|null
-	 */
-	protected static $debug_log_temp_stream_handle;
-
-	/**
-	 * Remove bot token from debug stream
-	 *
-	 * @var bool
-	 */
-	public static bool $remove_bot_token = true;
-
-	/**
-	 * Initialise logging.
-	 *
-	 * @param LoggerInterface|null $logger
-	 * @param LoggerInterface|null $update_logger
-	 */
-	public static function initialize(LoggerInterface $logger = null, LoggerInterface $update_logger = null): void
-	{
-		self::$logger = $logger ?: new NullLogger();
-		self::$update_logger = $update_logger ?: new NullLogger();
-	}
-
-	/**
-	 * Get the stream handle of the temporary debug output
-	 *
-	 * @return mixed The stream if debug is active, else false
-	 */
-	public static function getDebugLogTempStream(): mixed
-	{
-		if ((self::$debug_log_temp_stream_handle === null) && $temp_stream_handle = fopen('php://temp', 'wb+')) {
-			self::$debug_log_temp_stream_handle = $temp_stream_handle;
-		}
-
-		return self::$debug_log_temp_stream_handle;
-	}
-
-	/**
-	 * Write the temporary debug stream to log and close the stream handle
-	 *
-	 * @param string $message Message (with placeholder) to write to the debug log
-	 */
-	public static function endDebugLogTempStream(string $message = '%s'): void
-	{
-		if (is_resource(self::$debug_log_temp_stream_handle)) {
-			rewind(self::$debug_log_temp_stream_handle);
-			$stream_contents = stream_get_contents(self::$debug_log_temp_stream_handle);
-
-			if (self::$remove_bot_token) {
-				$stream_contents = preg_replace('/\/bot(\d+):[\w\-]+\//', '/botBOT_TOKEN_REMOVED/', $stream_contents);
-			}
-
-			self::debug(sprintf($message, $stream_contents));
-			fclose(self::$debug_log_temp_stream_handle);
-			self::$debug_log_temp_stream_handle = null;
-		}
-	}
-
-	/**
-	 * Handle any logging method call.
-	 *
-	 * @param string $name
-	 * @param array $arguments
-	 */
-	public static function __callStatic(string $name, array $arguments)
-	{
-		// Get the correct logger instance.
-		$logger = null;
-		self::initialize();
-		if (in_array($name, ['emergency', 'alert', 'critical', 'error', 'warning', 'notice', 'info', 'debug',], true)) {
-			$logger = self::$logger;
-		} elseif ($name === 'update') {
-			$logger = self::$update_logger;
-			$name = 'info';
-		}
-
-		// Clearly we have no logging enabled.
-		if ($logger === null) {
-			return;
-		}
-
-		// Replace any placeholders from the passed context.
-		if (count($arguments) >= 2) {
-			$arguments[0] = self::interpolate($arguments[0], $arguments[1]);
-		}
-
-		call_user_func_array([$logger, $name], $arguments);
-	}
-
-	/**
-	 * Interpolates context values into the message placeholders.
-	 *
-	 * @see https://www.php-fig.org/psr/psr-3/#12-message
-	 *
-	 * @param string $message
-	 * @param array $context
-	 *
-	 * @return string
-	 */
-	protected static function interpolate(string $message, array $context = []): string
-	{
-		// Build a replacement array with braces around the context keys.
-		$replace = [];
-		foreach ($context as $key => $val) {
-			// check that the value can be cast to string
-			if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
-				$replace["{{$key}}"] = $val;
-			}
-		}
-
-		// Interpolate replacement values into the message and return.
-		return strtr($message, $replace);
-	}
+    /**
+     * Logger instance
+     *
+     * @var LoggerInterface
+     */
+    protected static LoggerInterface $logger;
+
+    /**
+     * Logger instance for update
+     *
+     * @var LoggerInterface
+     */
+    protected static LoggerInterface $update_logger;
+
+    /**
+     * Always log the request and response data to the debug log, also for successful requests
+     *
+     * @var bool
+     */
+    public static bool $always_log_request_and_response = false;
+
+    /**
+     * Temporary stream handle for debug log
+     *
+     * @var resource|null
+     */
+    protected static $debug_log_temp_stream_handle;
+
+    /**
+     * Remove bot token from debug stream
+     *
+     * @var bool
+     */
+    public static bool $remove_bot_token = true;
+
+    /**
+     * Initialise logging.
+     *
+     * @param LoggerInterface|null $logger
+     * @param LoggerInterface|null $update_logger
+     */
+    public static function initialize(LoggerInterface $logger = null, LoggerInterface $update_logger = null): void
+    {
+        self::$logger = $logger ?: new NullLogger();
+        self::$update_logger = $update_logger ?: new NullLogger();
+    }
+
+    /**
+     * Get the stream handle of the temporary debug output
+     *
+     * @return mixed The stream if debug is active, else false
+     */
+    public static function getDebugLogTempStream(): mixed
+    {
+        if ((self::$debug_log_temp_stream_handle === null) && $temp_stream_handle = fopen('php://temp', 'wb+')) {
+            self::$debug_log_temp_stream_handle = $temp_stream_handle;
+        }
+
+        return self::$debug_log_temp_stream_handle;
+    }
+
+    /**
+     * Write the temporary debug stream to log and close the stream handle
+     *
+     * @param string $message Message (with placeholder) to write to the debug log
+     */
+    public static function endDebugLogTempStream(string $message = '%s'): void
+    {
+        if (is_resource(self::$debug_log_temp_stream_handle)) {
+            rewind(self::$debug_log_temp_stream_handle);
+            $stream_contents = stream_get_contents(self::$debug_log_temp_stream_handle);
+
+            if (self::$remove_bot_token) {
+                $stream_contents = preg_replace('/\/bot(\d+):[\w\-]+\//', '/botBOT_TOKEN_REMOVED/', $stream_contents);
+            }
+
+            self::debug(sprintf($message, $stream_contents));
+            fclose(self::$debug_log_temp_stream_handle);
+            self::$debug_log_temp_stream_handle = null;
+        }
+    }
+
+    /**
+     * Handle any logging method call.
+     *
+     * @param string $name
+     * @param array $arguments
+     */
+    public static function __callStatic(string $name, array $arguments)
+    {
+        // Get the correct logger instance.
+        $logger = null;
+        self::initialize();
+        if (in_array($name, ['emergency', 'alert', 'critical', 'error', 'warning', 'notice', 'info', 'debug',], true)) {
+            $logger = self::$logger;
+        } elseif ($name === 'update') {
+            $logger = self::$update_logger;
+            $name = 'info';
+        }
+
+        // Clearly we have no logging enabled.
+        if ($logger === null) {
+            return;
+        }
+
+        // Replace any placeholders from the passed context.
+        if (count($arguments) >= 2) {
+            $arguments[0] = self::interpolate($arguments[0], $arguments[1]);
+        }
+
+        call_user_func_array([$logger, $name], $arguments);
+    }
+
+    /**
+     * Interpolates context values into the message placeholders.
+     *
+     * @see https://www.php-fig.org/psr/psr-3/#12-message
+     *
+     * @param string $message
+     * @param array $context
+     *
+     * @return string
+     */
+    protected static function interpolate(string $message, array $context = []): string
+    {
+        // Build a replacement array with braces around the context keys.
+        $replace = [];
+        foreach ($context as $key => $val) {
+            // check that the value can be cast to string
+            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
+                $replace["{{$key}}"] = $val;
+            }
+        }
+
+        // Interpolate replacement values into the message and return.
+        return strtr($message, $replace);
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
 		// Get the correct logger instance.
 		$logger = null;
 		self::initialize();
-		if (in_array($name, ['emergency', 'alert', 'critical', 'error', 'warning', 'notice', 'info', 'debug',], true)) {
+		if (in_array($name, ['emergency', 'alert', 'critical', 'error', 'warning', 'notice', 'info', 'debug', ], true)) {
 			$logger = self::$logger;
 		} elseif ($name === 'update') {
 			$logger = self::$update_logger;

src/lib/Factory.php

Indentation +19 added lines, -19 removed lines

@@ -12,26 +12,26 @@
 abstract class Factory
 {
 
-	/**
-	 * @param array $data
-	 * @return Entity
-	 */
-	abstract public static function make(array $data): Entity;
+    /**
+     * @param array $data
+     * @return Entity
+     */
+    abstract public static function make(array $data): Entity;
 
-	/**
-	 * This method is used to create a new instance of the entity.
-	 *
-	 * @param string $class
-	 * @param mixed $property
-	 * @return Entity
-	 */
-	public static function resolveEntityClass(string $class, mixed $property): Entity
-	{
-		if (is_subclass_of($class, Factory::class)) {
-			return $class::make($property);
-		}
+    /**
+     * This method is used to create a new instance of the entity.
+     *
+     * @param string $class
+     * @param mixed $property
+     * @return Entity
+     */
+    public static function resolveEntityClass(string $class, mixed $property): Entity
+    {
+        if (is_subclass_of($class, Factory::class)) {
+            return $class::make($property);
+        }
 
-		return new $class($property);
-	}
+        return new $class($property);
+    }
 
 }

src/lib/Request.php

Indentation +222 added lines, -222 removed lines

@@ -143,227 +143,227 @@
 class Request
 {
 
-	/**
-	 * Available fields for InputFile helper
-	 *
-	 * This is basically the list of all fields that allow InputFile objects
-	 * for which input can be simplified by providing local path directly  as string.
-	 *
-	 * @var array
-	 */
-	private static array $input_file_fields = [
-		'setWebhook' => ['certificate'],
-		'sendPhoto' => ['photo'],
-		'sendAudio' => ['audio', 'thumb'],
-		'sendDocument' => ['document', 'thumb'],
-		'sendVideo' => ['video', 'thumb'],
-		'sendAnimation' => ['animation', 'thumb'],
-		'sendVoice' => ['voice', 'thumb'],
-		'sendVideoNote' => ['video_note', 'thumb'],
-		'setChatPhoto' => ['photo'],
-		'sendSticker' => ['sticker'],
-		'uploadStickerFile' => ['png_sticker'],
-		'createNewStickerSet' => ['png_sticker', 'tgs_sticker', 'webm_sticker'],
-		'addStickerToSet' => ['png_sticker', 'tgs_sticker', 'webm_sticker'],
-		'setStickerSetThumb' => ['thumb'],
-	];
-
-	/**
-	 * URI of the Telegram API
-	 *
-	 * @var string
-	 */
-	private static string $api_base_uri = 'https://api.telegram.org';
-
-	/**
-	 * URI of the Telegram API for downloading files (relative to $api_base_url or absolute)
-	 *
-	 * @var string
-	 */
-	private static string $api_base_download_uri = '/file/bot{API_KEY}';
-
-	/**
-	 * The current action that is being executed
-	 *
-	 * @var string
-	 */
-	private static string $current_action = '';
-
-	/**
-	 * Get the Telegram API path
-	 *
-	 * @return string
-	 */
-	public static function getApiPath(): string
-	{
-		return self::$api_base_uri . '/bot' . Telegram::getApiKey() . '/';
-	}
-
-	/**
-	 * Initialize a http client
-	 *
-	 * @return Client
-	 */
-	private static function getClient(): Client
-	{
-		return new Client();
-	}
-
-	/**
-	 * Use this method to get stats of given user in a supergroup or channel.
-	 *
-	 * @param int $user_id User identifier
-	 * @param int $chat_id Identifier of the chat to get stats for
-	 *
-	 * @return string [left, member, administrator, creator]
-	 */
-	public static function getChatMemberStatus(int $user_id, int $chat_id): string
-	{
-		$response = self::getChatMember([
-			'user_id' => $user_id,
-			'chat_id' => $chat_id,
-		]);
-
-		return $response->getResult()->status ?? "left";
-	}
-
-	/**
-	 * Properly set up the request params
-	 *
-	 * If any item of the array is a resource, reformat it to a multipart request.
-	 * Else, just return the passed data as form params.
-	 *
-	 * @param array $data
-	 * @return array
-	 */
-	private static function setUpRequestParams(array $data): array
-	{
-		$multipart = [];
-		$has_resource = false;
-
-		$options = [
-			'header' => [
-				'Content-Type' => 'application/json',
-				'Accept' => 'application/json',
-				'User-Agent' => 'TelegramBot-PHP/' . Telegram::$VERSION
-			]
-		];
-
-		foreach ($data as $key => &$item) {
-			if (array_key_exists(self::$current_action, self::$input_file_fields) && in_array($key, self::$input_file_fields[self::$current_action], true)) {
-
-				if (is_string($item) && file_exists($item)) {
-					$has_resource = true;
-
-				} elseif (filter_var($item, FILTER_VALIDATE_URL)) {
-					$has_resource = false;
-					continue;
-
-				} else {
-					throw new TelegramException(
-						'Invalid file path or URL: ' . $item . ' for ' . self::$current_action . ' action'
-					);
-				}
-
-				$multipart[$key] = $item;
-				continue;
-			}
-
-			if ($item instanceof Entity) {
-				$item = $item->getRawData();
-			}
-
-			if (is_array($item)) {
-				$item = json_encode($item);
-			}
-
-			$options['query'][$key] = $item;
-		}
-		unset($item);
-
-		if ($has_resource) {
-			$options['multipart'] = FormData::create($multipart);
-		}
-
-		return $options;
-	}
-
-	/**
-	 * Create a Http Request
-	 *
-	 * @param string $action Action to execute
-	 * @param array $data Data to attach to the execution
-	 *
-	 * @return array An array of the setUpRequestParams and the url
-	 */
-	public static function create(string $action, array $data): array
-	{
-		return [
-			'url' => self::getApiPath() . $action,
-			'options' => self::setUpRequestParams($data)
-		];
-	}
-
-	/**
-	 * Execute HTTP Request
-	 *
-	 * @param string $action Action to execute
-	 * @param array $data Data to attach to the execution
-	 *
-	 * @return string Result of the HTTP Request
-	 */
-	private static function execute(string $action, array $data): string
-	{
-		$request = self::create($action, $data);
-
-		$response = self::getClient()->get($request['url'], $request['options']);
-
-		return $response->getBody();
-	}
-
-	/**
-	 * Send command
-	 *
-	 * @param string $action
-	 * @param array $data
-	 *
-	 * @return Response
-	 * @throws TelegramException
-	 */
-	public static function send(string $action, array $data = []): Response
-	{
-		self::$current_action = $action;
-
-		$raw_response = self::execute($action, $data);
-
-		if (!Common::isJson($raw_response)) {
-			TelegramLog::debug($raw_response);
-			throw new TelegramException('Invalid response from API');
-		}
-
-		$response = new Response(json_decode($raw_response, true));
-
-		if (!$response->isOk() && $response->getErrorCode() === 401 && $response->getDescription() === 'Unauthorized') {
-			throw new InvalidBotTokenException();
-		}
-
-		self::$current_action = '';
-
-		return $response;
-	}
-
-	/**
-	 * Any statically called method should be relayed to the `send` method.
-	 *
-	 * @param string $action
-	 * @param array $data
-	 *
-	 * @return Response
-	 * @throws TelegramException
-	 */
-	public static function __callStatic(string $action, array $data): Response
-	{
-		return static::send($action, reset($data) ?: []);
-	}
+    /**
+     * Available fields for InputFile helper
+     *
+     * This is basically the list of all fields that allow InputFile objects
+     * for which input can be simplified by providing local path directly  as string.
+     *
+     * @var array
+     */
+    private static array $input_file_fields = [
+        'setWebhook' => ['certificate'],
+        'sendPhoto' => ['photo'],
+        'sendAudio' => ['audio', 'thumb'],
+        'sendDocument' => ['document', 'thumb'],
+        'sendVideo' => ['video', 'thumb'],
+        'sendAnimation' => ['animation', 'thumb'],
+        'sendVoice' => ['voice', 'thumb'],
+        'sendVideoNote' => ['video_note', 'thumb'],
+        'setChatPhoto' => ['photo'],
+        'sendSticker' => ['sticker'],
+        'uploadStickerFile' => ['png_sticker'],
+        'createNewStickerSet' => ['png_sticker', 'tgs_sticker', 'webm_sticker'],
+        'addStickerToSet' => ['png_sticker', 'tgs_sticker', 'webm_sticker'],
+        'setStickerSetThumb' => ['thumb'],
+    ];
+
+    /**
+     * URI of the Telegram API
+     *
+     * @var string
+     */
+    private static string $api_base_uri = 'https://api.telegram.org';
+
+    /**
+     * URI of the Telegram API for downloading files (relative to $api_base_url or absolute)
+     *
+     * @var string
+     */
+    private static string $api_base_download_uri = '/file/bot{API_KEY}';
+
+    /**
+     * The current action that is being executed
+     *
+     * @var string
+     */
+    private static string $current_action = '';
+
+    /**
+     * Get the Telegram API path
+     *
+     * @return string
+     */
+    public static function getApiPath(): string
+    {
+        return self::$api_base_uri . '/bot' . Telegram::getApiKey() . '/';
+    }
+
+    /**
+     * Initialize a http client
+     *
+     * @return Client
+     */
+    private static function getClient(): Client
+    {
+        return new Client();
+    }
+
+    /**
+     * Use this method to get stats of given user in a supergroup or channel.
+     *
+     * @param int $user_id User identifier
+     * @param int $chat_id Identifier of the chat to get stats for
+     *
+     * @return string [left, member, administrator, creator]
+     */
+    public static function getChatMemberStatus(int $user_id, int $chat_id): string
+    {
+        $response = self::getChatMember([
+            'user_id' => $user_id,
+            'chat_id' => $chat_id,
+        ]);
+
+        return $response->getResult()->status ?? "left";
+    }
+
+    /**
+     * Properly set up the request params
+     *
+     * If any item of the array is a resource, reformat it to a multipart request.
+     * Else, just return the passed data as form params.
+     *
+     * @param array $data
+     * @return array
+     */
+    private static function setUpRequestParams(array $data): array
+    {
+        $multipart = [];
+        $has_resource = false;
+
+        $options = [
+            'header' => [
+                'Content-Type' => 'application/json',
+                'Accept' => 'application/json',
+                'User-Agent' => 'TelegramBot-PHP/' . Telegram::$VERSION
+            ]
+        ];
+
+        foreach ($data as $key => &$item) {
+            if (array_key_exists(self::$current_action, self::$input_file_fields) && in_array($key, self::$input_file_fields[self::$current_action], true)) {
+
+                if (is_string($item) && file_exists($item)) {
+                    $has_resource = true;
+
+                } elseif (filter_var($item, FILTER_VALIDATE_URL)) {
+                    $has_resource = false;
+                    continue;
+
+                } else {
+                    throw new TelegramException(
+                        'Invalid file path or URL: ' . $item . ' for ' . self::$current_action . ' action'
+                    );
+                }
+
+                $multipart[$key] = $item;
+                continue;
+            }
+
+            if ($item instanceof Entity) {
+                $item = $item->getRawData();
+            }
+
+            if (is_array($item)) {
+                $item = json_encode($item);
+            }
+
+            $options['query'][$key] = $item;
+        }
+        unset($item);
+
+        if ($has_resource) {
+            $options['multipart'] = FormData::create($multipart);
+        }
+
+        return $options;
+    }
+
+    /**
+     * Create a Http Request
+     *
+     * @param string $action Action to execute
+     * @param array $data Data to attach to the execution
+     *
+     * @return array An array of the setUpRequestParams and the url
+     */
+    public static function create(string $action, array $data): array
+    {
+        return [
+            'url' => self::getApiPath() . $action,
+            'options' => self::setUpRequestParams($data)
+        ];
+    }
+
+    /**
+     * Execute HTTP Request
+     *
+     * @param string $action Action to execute
+     * @param array $data Data to attach to the execution
+     *
+     * @return string Result of the HTTP Request
+     */
+    private static function execute(string $action, array $data): string
+    {
+        $request = self::create($action, $data);
+
+        $response = self::getClient()->get($request['url'], $request['options']);
+
+        return $response->getBody();
+    }
+
+    /**
+     * Send command
+     *
+     * @param string $action
+     * @param array $data
+     *
+     * @return Response
+     * @throws TelegramException
+     */
+    public static function send(string $action, array $data = []): Response
+    {
+        self::$current_action = $action;
+
+        $raw_response = self::execute($action, $data);
+
+        if (!Common::isJson($raw_response)) {
+            TelegramLog::debug($raw_response);
+            throw new TelegramException('Invalid response from API');
+        }
+
+        $response = new Response(json_decode($raw_response, true));
+
+        if (!$response->isOk() && $response->getErrorCode() === 401 && $response->getDescription() === 'Unauthorized') {
+            throw new InvalidBotTokenException();
+        }
+
+        self::$current_action = '';
+
+        return $response;
+    }
+
+    /**
+     * Any statically called method should be relayed to the `send` method.
+     *
+     * @param string $action
+     * @param array $data
+     *
+     * @return Response
+     * @throws TelegramException
+     */
+    public static function __callStatic(string $action, array $data): Response
+    {
+        return static::send($action, reset($data) ?: []);
+    }
 
 }

src/lib/Entities/Keyboard.php

Indentation +98 added lines, -98 removed lines

@@ -23,103 +23,103 @@
 class Keyboard extends Entity
 {
 
-	public function __construct(array $data = [])
-	{
-		parent::__construct(array_merge($data, [
-			'resize_keyboard' => false,
-			'one_time_keyboard' => false,
-			'input_field_placeholder' => '',
-			'selective' => false
-		]));
-	}
-
-	/**
-	 * Create a new row in keyboard and add buttons.
-	 *
-	 * @param array<KeyboardButton> $row
-	 * @return Keyboard
-	 */
-	public function addRow(array $row): Keyboard
-	{
-		$keyboard_type = self::getType();
-
-		if (!isset($this->raw_data[$keyboard_type]) || !is_array($this->raw_data[$keyboard_type])) {
-			$this->raw_data[$keyboard_type] = [];
-		}
-
-		$new_row = [];
-		foreach ($row as $button) {
-			$new_row[] = $button->getRawData();
-		}
-
-		$this->raw_data[$keyboard_type][] = $new_row;
-
-		return $this;
-	}
-
-	/**
-	 * Remove the current custom keyboard and display the default letter-keyboard.
-	 *
-	 * @link https://core.telegram.org/bots/api/#replykeyboardremove
-	 *
-	 * @param array $data
-	 *
-	 * @return Keyboard
-	 */
-	public static function remove(array $data = []): Keyboard
-	{
-		return new static(array_merge(['keyboard' => [], 'remove_keyboard' => true, 'selective' => false], $data));
-	}
-
-	/**
-	 * Display a reply interface to the user (act as if the user has selected the bot's message and tapped 'Reply').
-	 *
-	 * @link https://core.telegram.org/bots/api#forcereply
-	 *
-	 * @param array $data
-	 *
-	 * @return Keyboard
-	 */
-	public static function forceReply(array $data = []): Keyboard
-	{
-		return new static(array_merge(['keyboard' => [], 'force_reply' => true, 'selective' => false], $data));
-	}
-
-	/**
-	 * Get keyboard button type
-	 *
-	 * @return string ["keyboard"|"inline_keyboard"]
-	 */
-	public function getType(): string
-	{
-		$reflection = new \ReflectionClass(static::class);
-
-		$class_name = $reflection->getShortName();
-
-		return strtolower(ltrim(preg_replace('/[A-Z]/', '_$0', $class_name), '_'));
-	}
-
-	/**
-	 * Creates instance of Keyboard
-	 *
-	 * @return Keyboard
-	 */
-	public static function make(): Keyboard
-	{
-		return new self();
-	}
-
-	/**
-	 * @param array $rows
-	 * @return Keyboard
-	 */
-	public function setKeyboard(array $rows): Keyboard
-	{
-		foreach ($rows as $row) {
-			$this->addRow($row);
-		}
-
-		return $this;
-	}
+    public function __construct(array $data = [])
+    {
+        parent::__construct(array_merge($data, [
+            'resize_keyboard' => false,
+            'one_time_keyboard' => false,
+            'input_field_placeholder' => '',
+            'selective' => false
+        ]));
+    }
+
+    /**
+     * Create a new row in keyboard and add buttons.
+     *
+     * @param array<KeyboardButton> $row
+     * @return Keyboard
+     */
+    public function addRow(array $row): Keyboard
+    {
+        $keyboard_type = self::getType();
+
+        if (!isset($this->raw_data[$keyboard_type]) || !is_array($this->raw_data[$keyboard_type])) {
+            $this->raw_data[$keyboard_type] = [];
+        }
+
+        $new_row = [];
+        foreach ($row as $button) {
+            $new_row[] = $button->getRawData();
+        }
+
+        $this->raw_data[$keyboard_type][] = $new_row;
+
+        return $this;
+    }
+
+    /**
+     * Remove the current custom keyboard and display the default letter-keyboard.
+     *
+     * @link https://core.telegram.org/bots/api/#replykeyboardremove
+     *
+     * @param array $data
+     *
+     * @return Keyboard
+     */
+    public static function remove(array $data = []): Keyboard
+    {
+        return new static(array_merge(['keyboard' => [], 'remove_keyboard' => true, 'selective' => false], $data));
+    }
+
+    /**
+     * Display a reply interface to the user (act as if the user has selected the bot's message and tapped 'Reply').
+     *
+     * @link https://core.telegram.org/bots/api#forcereply
+     *
+     * @param array $data
+     *
+     * @return Keyboard
+     */
+    public static function forceReply(array $data = []): Keyboard
+    {
+        return new static(array_merge(['keyboard' => [], 'force_reply' => true, 'selective' => false], $data));
+    }
+
+    /**
+     * Get keyboard button type
+     *
+     * @return string ["keyboard"|"inline_keyboard"]
+     */
+    public function getType(): string
+    {
+        $reflection = new \ReflectionClass(static::class);
+
+        $class_name = $reflection->getShortName();
+
+        return strtolower(ltrim(preg_replace('/[A-Z]/', '_$0', $class_name), '_'));
+    }
+
+    /**
+     * Creates instance of Keyboard
+     *
+     * @return Keyboard
+     */
+    public static function make(): Keyboard
+    {
+        return new self();
+    }
+
+    /**
+     * @param array $rows
+     * @return Keyboard
+     */
+    public function setKeyboard(array $rows): Keyboard
+    {
+        foreach ($rows as $row) {
+            $this->addRow($row);
+        }
+
+        return $this;
+    }
 
 }

src/lib/Entities/Update.php

Indentation +61 added lines, -61 removed lines

@@ -32,70 +32,70 @@
 class Update extends Entity
 {
 
-	public const TYPE_MESSAGE = 'message';
-	public const TYPE_EDITED_MESSAGE = 'edited_message';
-	public const TYPE_CHANNEL_POST = 'channel_post';
-	public const TYPE_EDITED_CHANNEL_POST = 'edited_channel_post';
-	public const TYPE_INLINE_QUERY = 'inline_query';
-	public const TYPE_CHOSEN_INLINE_RESULT = 'chosen_inline_result';
-	public const TYPE_CALLBACK_QUERY = 'callback_query';
-	public const TYPE_SHIPPING_QUERY = 'shipping_query';
-	public const TYPE_PRE_CHECKOUT_QUERY = 'pre_checkout_query';
-	public const TYPE_POLL = 'poll';
-	public const TYPE_POLL_ANSWER = 'poll_answer';
-	public const TYPE_MY_CHAT_MEMBER = 'my_chat_member';
-	public const TYPE_CHAT_MEMBER = 'chat_member';
-	public const TYPE_CHAT_JOIN_REQUEST = 'chat_join_request';
-	public const TYPE_WEB_DATA = 'web_data';
+    public const TYPE_MESSAGE = 'message';
+    public const TYPE_EDITED_MESSAGE = 'edited_message';
+    public const TYPE_CHANNEL_POST = 'channel_post';
+    public const TYPE_EDITED_CHANNEL_POST = 'edited_channel_post';
+    public const TYPE_INLINE_QUERY = 'inline_query';
+    public const TYPE_CHOSEN_INLINE_RESULT = 'chosen_inline_result';
+    public const TYPE_CALLBACK_QUERY = 'callback_query';
+    public const TYPE_SHIPPING_QUERY = 'shipping_query';
+    public const TYPE_PRE_CHECKOUT_QUERY = 'pre_checkout_query';
+    public const TYPE_POLL = 'poll';
+    public const TYPE_POLL_ANSWER = 'poll_answer';
+    public const TYPE_MY_CHAT_MEMBER = 'my_chat_member';
+    public const TYPE_CHAT_MEMBER = 'chat_member';
+    public const TYPE_CHAT_JOIN_REQUEST = 'chat_join_request';
+    public const TYPE_WEB_DATA = 'web_data';
 
-	/**
-	 * {@inheritdoc}
-	 */
-	protected function subEntities(): array
-	{
-		return [
-			self::TYPE_MESSAGE => Message::class,
-			self::TYPE_EDITED_MESSAGE => EditedMessage::class,
-			self::TYPE_CHANNEL_POST => ChannelPost::class,
-			self::TYPE_EDITED_CHANNEL_POST => EditedChannelPost::class,
-			self::TYPE_INLINE_QUERY => InlineQuery::class,
-			self::TYPE_CHOSEN_INLINE_RESULT => ChosenInlineResult::class,
-			self::TYPE_CALLBACK_QUERY => CallbackQuery::class,
-			self::TYPE_SHIPPING_QUERY => ShippingQuery::class,
-			self::TYPE_PRE_CHECKOUT_QUERY => PreCheckoutQuery::class,
-			self::TYPE_POLL => Poll::class,
-			self::TYPE_POLL_ANSWER => PollAnswer::class,
-			self::TYPE_MY_CHAT_MEMBER => ChatMemberUpdated::class,
-			self::TYPE_CHAT_MEMBER => ChatMemberUpdated::class,
-			self::TYPE_CHAT_JOIN_REQUEST => ChatJoinRequest::class,
-			self::TYPE_WEB_DATA => WebAppData::class,
-		];
-	}
+    /**
+     * {@inheritdoc}
+     */
+    protected function subEntities(): array
+    {
+        return [
+            self::TYPE_MESSAGE => Message::class,
+            self::TYPE_EDITED_MESSAGE => EditedMessage::class,
+            self::TYPE_CHANNEL_POST => ChannelPost::class,
+            self::TYPE_EDITED_CHANNEL_POST => EditedChannelPost::class,
+            self::TYPE_INLINE_QUERY => InlineQuery::class,
+            self::TYPE_CHOSEN_INLINE_RESULT => ChosenInlineResult::class,
+            self::TYPE_CALLBACK_QUERY => CallbackQuery::class,
+            self::TYPE_SHIPPING_QUERY => ShippingQuery::class,
+            self::TYPE_PRE_CHECKOUT_QUERY => PreCheckoutQuery::class,
+            self::TYPE_POLL => Poll::class,
+            self::TYPE_POLL_ANSWER => PollAnswer::class,
+            self::TYPE_MY_CHAT_MEMBER => ChatMemberUpdated::class,
+            self::TYPE_CHAT_MEMBER => ChatMemberUpdated::class,
+            self::TYPE_CHAT_JOIN_REQUEST => ChatJoinRequest::class,
+            self::TYPE_WEB_DATA => WebAppData::class,
+        ];
+    }
 
-	/**
-	 * Get the list of all available update types
-	 *
-	 * @return string[]
-	 */
-	public static function getUpdateTypes(): array
-	{
-		return array_keys((new self([]))->subEntities());
-	}
+    /**
+     * Get the list of all available update types
+     *
+     * @return string[]
+     */
+    public static function getUpdateTypes(): array
+    {
+        return array_keys((new self([]))->subEntities());
+    }
 
-	/**
-	 * Get the update type based on the set properties
-	 *
-	 * @return string|null
-	 */
-	public function getUpdateType(): ?string
-	{
-		foreach (self::getUpdateTypes() as $type) {
-			if ($this->getProperty($type)) {
-				return $type;
-			}
-		}
+    /**
+     * Get the update type based on the set properties
+     *
+     * @return string|null
+     */
+    public function getUpdateType(): ?string
+    {
+        foreach (self::getUpdateTypes() as $type) {
+            if ($this->getProperty($type)) {
+                return $type;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 
 }

src/lib/WebhookHandler.php

Indentation +217 added lines, -217 removed lines

@@ -17,222 +17,222 @@
 abstract class WebhookHandler extends Telegram
 {
 
-	/**
-	 * @var ?Update
-	 */
-	protected ?Update $update;
-
-	/**
-	 * @var array<Plugin>
-	 */
-	private array $plugins = [];
-
-	/**
-	 * @var bool
-	 */
-	private bool $isActive = false;
-
-	/**
-	 * The default configuration of the webhook.
-	 *
-	 * @var array
-	 */
-	private array $config = [
-		'autoload_env_file' => false,
-		'env_file_path' => null,
-	];
-
-	/**
-	 * Webhook constructor.
-	 *
-	 * @param string $api_key The API key of the bot. Leave it blank for autoload from .env file.
-	 */
-	public function __construct(string $api_key = '')
-	{
-		parent::__construct($api_key);
-
-		if (!Telegram::validateToken(self::getApiKey())) {
-			throw new InvalidBotTokenException();
-		}
-	}
-
-	/**
-	 * Initialize the receiver.
-	 *
-	 * @return void
-	 */
-	public function init(): void
-	{
-		$this->config['env_file_path'] = $_SERVER['DOCUMENT_ROOT'] . '/.env';
-	}
-
-	/**
-	 * Add a plugin to the receiver
-	 *
-	 * @param array<Plugin> $plugins
-	 */
-	public function addPlugin(array $plugins): void
-	{
-		foreach ($plugins as $plugin) {
-			if (!is_subclass_of($plugin, Plugin::class)) {
-				throw new \RuntimeException(
-					sprintf('The plugin %s must be an instance of %s', get_class($plugin), Plugin::class)
-				);
-			}
-			$this->plugins[] = $plugin;
-		}
-	}
-
-	/**
-	 * Match the update with the given plugins
-	 *
-	 * @param array<Plugin> $plugins
-	 * @param ?Update $update The update to match
-	 * @return void
-	 */
-	public function loadPluginsWith(array $plugins, Update $update = null): void
-	{
-		$update = $update ?? ($this->update ?? Telegram::getUpdate());
-
-		foreach ($plugins as $plugin) {
-			if (!is_subclass_of($plugin, Plugin::class)) {
-				throw new \InvalidArgumentException(
-					sprintf('The plugin %s must be an instance of %s', get_class($plugin), Plugin::class)
-				);
-			}
-		}
-
-		if ($update instanceof Update) {
-			$this->spreadUpdateWith($update, $plugins);
-		}
-	}
-
-	/**
-	 * Match the message to the plugins
-	 *
-	 * @param ?Update $update The update to match
-	 * @return void
-	 */
-	public function loadPlugins(Update $update = null): void
-	{
-		$update = $update ?? ($this->update ?? Telegram::getUpdate());
-		$this->loadPluginsWith($this->plugins, $update);
-	}
-
-	/**
-	 * Load the environment's
-	 *
-	 * @param string $path
-	 * @retrun void
-	 */
-	public function loadFileOfEnv(string $path): void
-	{
-		DotEnv::load($path);
-	}
-
-	/**
-	 * Update the configuration
-	 *
-	 * @param array $configuration
-	 * @return void
-	 */
-	public function updateConfiguration(array $configuration): void
-	{
-		$this->config = array_merge($this->config, $configuration);
-	}
-
-	/**
-	 * Resolve the request.
-	 *
-	 * @param ?Update $update The custom to work with
-	 * @param array $config The configuration of the receiver
-	 *
-	 * @retrun void
-	 */
-	public function resolve(Update $update = null, array $config = []): void
-	{
-		$method = '__process';
-		if (!method_exists($this, $method)) {
-			throw new \RuntimeException(sprintf('The method %s does not exist', $method));
-		}
-
-		if (is_array($config)) $this->updateConfiguration($config);
-
-		if (!empty($update)) $this->update = $update;
-		else $this->update = Telegram::getUpdate() !== false ? Telegram::getUpdate() : null;
-
-		if (empty($this->update)) {
-			TelegramLog::error(
-				'The update is empty, the request is not processed'
-			);
-			return;
-		}
-
-		try {
-
-			Common::arrest($this, $method, $this->update);
-
-		} catch (\RuntimeException $exception) {
-
-			$e = $exception->getPrevious();
-			TelegramLog::error(($message = sprintf(
-				'%s(%d): %s\n%s', $e->getFile(), $e->getLine(), $e->getMessage(), $e->getTraceAsString()
-			)));
-
-			if (defined('TG_ADMIN_ID') && TG_ADMIN_ID && defined('DEBUG_MODE') && DEBUG_MODE) {
-				file_put_contents(
-					($file = getcwd() . '/' . uniqid('error_') . '.log'),
-					$message . PHP_EOL . PHP_EOL . $update->getRawData(false)
-				);
-				Request::sendMessage([
-					'chat_id' => TG_ADMIN_ID,
-					'text' => $message,
-				]);
-				Request::sendDocument([
-					'chat_id' => TG_ADMIN_ID,
-					'document' => $file,
-				]);
-				unlink($file);
-			}
-		}
-	}
-
-	/**
-	 * This function will get update and spread it to the plugins
-	 *
-	 * @param Update $update
-	 * @param array<Plugin> $plugins
-	 * @return void
-	 */
-	private function spreadUpdateWith(Update $update, array $plugins): void
-	{
-		$this->isActive = true;
-
-		foreach ($plugins as $plugin) {
-			/** @var Plugin $plugin */
-			(new $plugin())->__execute($this, $update);
-			if ($this->isActive === false) break;
-		}
-
-		$this->isActive = false;
-	}
-
-	/**
-	 * Kill the speeding process
-	 *
-	 * @return void
-	 */
-	public function kill(): void
-	{
-		$this->isActive = false;
-	}
-
-	/**
-	 * Use this method on the webhook class to get the updates
-	 *
-	 * @param Update $update
-	 * @return void
-	 */
-	abstract public function __process(Update $update): void;
+    /**
+     * @var ?Update
+     */
+    protected ?Update $update;
+
+    /**
+     * @var array<Plugin>
+     */
+    private array $plugins = [];
+
+    /**
+     * @var bool
+     */
+    private bool $isActive = false;
+
+    /**
+     * The default configuration of the webhook.
+     *
+     * @var array
+     */
+    private array $config = [
+        'autoload_env_file' => false,
+        'env_file_path' => null,
+    ];
+
+    /**
+     * Webhook constructor.
+     *
+     * @param string $api_key The API key of the bot. Leave it blank for autoload from .env file.
+     */
+    public function __construct(string $api_key = '')
+    {
+        parent::__construct($api_key);
+
+        if (!Telegram::validateToken(self::getApiKey())) {
+            throw new InvalidBotTokenException();
+        }
+    }
+
+    /**
+     * Initialize the receiver.
+     *
+     * @return void
+     */
+    public function init(): void
+    {
+        $this->config['env_file_path'] = $_SERVER['DOCUMENT_ROOT'] . '/.env';
+    }
+
+    /**
+     * Add a plugin to the receiver
+     *
+     * @param array<Plugin> $plugins
+     */
+    public function addPlugin(array $plugins): void
+    {
+        foreach ($plugins as $plugin) {
+            if (!is_subclass_of($plugin, Plugin::class)) {
+                throw new \RuntimeException(
+                    sprintf('The plugin %s must be an instance of %s', get_class($plugin), Plugin::class)
+                );
+            }
+            $this->plugins[] = $plugin;
+        }
+    }
+
+    /**
+     * Match the update with the given plugins
+     *
+     * @param array<Plugin> $plugins
+     * @param ?Update $update The update to match
+     * @return void
+     */
+    public function loadPluginsWith(array $plugins, Update $update = null): void
+    {
+        $update = $update ?? ($this->update ?? Telegram::getUpdate());
+
+        foreach ($plugins as $plugin) {
+            if (!is_subclass_of($plugin, Plugin::class)) {
+                throw new \InvalidArgumentException(
+                    sprintf('The plugin %s must be an instance of %s', get_class($plugin), Plugin::class)
+                );
+            }
+        }
+
+        if ($update instanceof Update) {
+            $this->spreadUpdateWith($update, $plugins);
+        }
+    }
+
+    /**
+     * Match the message to the plugins
+     *
+     * @param ?Update $update The update to match
+     * @return void
+     */
+    public function loadPlugins(Update $update = null): void
+    {
+        $update = $update ?? ($this->update ?? Telegram::getUpdate());
+        $this->loadPluginsWith($this->plugins, $update);
+    }
+
+    /**
+     * Load the environment's
+     *
+     * @param string $path
+     * @retrun void
+     */
+    public function loadFileOfEnv(string $path): void
+    {
+        DotEnv::load($path);
+    }
+
+    /**
+     * Update the configuration
+     *
+     * @param array $configuration
+     * @return void
+     */
+    public function updateConfiguration(array $configuration): void
+    {
+        $this->config = array_merge($this->config, $configuration);
+    }
+
+    /**
+     * Resolve the request.
+     *
+     * @param ?Update $update The custom to work with
+     * @param array $config The configuration of the receiver
+     *
+     * @retrun void
+     */
+    public function resolve(Update $update = null, array $config = []): void
+    {
+        $method = '__process';
+        if (!method_exists($this, $method)) {
+            throw new \RuntimeException(sprintf('The method %s does not exist', $method));
+        }
+
+        if (is_array($config)) $this->updateConfiguration($config);
+
+        if (!empty($update)) $this->update = $update;
+        else $this->update = Telegram::getUpdate() !== false ? Telegram::getUpdate() : null;
+
+        if (empty($this->update)) {
+            TelegramLog::error(
+                'The update is empty, the request is not processed'
+            );
+            return;
+        }
+
+        try {
+
+            Common::arrest($this, $method, $this->update);
+
+        } catch (\RuntimeException $exception) {
+
+            $e = $exception->getPrevious();
+            TelegramLog::error(($message = sprintf(
+                '%s(%d): %s\n%s', $e->getFile(), $e->getLine(), $e->getMessage(), $e->getTraceAsString()
+            )));
+
+            if (defined('TG_ADMIN_ID') && TG_ADMIN_ID && defined('DEBUG_MODE') && DEBUG_MODE) {
+                file_put_contents(
+                    ($file = getcwd() . '/' . uniqid('error_') . '.log'),
+                    $message . PHP_EOL . PHP_EOL . $update->getRawData(false)
+                );
+                Request::sendMessage([
+                    'chat_id' => TG_ADMIN_ID,
+                    'text' => $message,
+                ]);
+                Request::sendDocument([
+                    'chat_id' => TG_ADMIN_ID,
+                    'document' => $file,
+                ]);
+                unlink($file);
+            }
+        }
+    }
+
+    /**
+     * This function will get update and spread it to the plugins
+     *
+     * @param Update $update
+     * @param array<Plugin> $plugins
+     * @return void
+     */
+    private function spreadUpdateWith(Update $update, array $plugins): void
+    {
+        $this->isActive = true;
+
+        foreach ($plugins as $plugin) {
+            /** @var Plugin $plugin */
+            (new $plugin())->__execute($this, $update);
+            if ($this->isActive === false) break;
+        }
+
+        $this->isActive = false;
+    }
+
+    /**
+     * Kill the speeding process
+     *
+     * @return void
+     */
+    public function kill(): void
+    {
+        $this->isActive = false;
+    }
+
+    /**
+     * Use this method on the webhook class to get the updates
+     *
+     * @param Update $update
+     * @return void
+     */
+    abstract public function __process(Update $update): void;
 
 }
\ No newline at end of file

Braces +11 added lines, -4 removed lines

@@ -156,10 +156,15 @@ 
 			throw new \RuntimeException(sprintf('The method %s does not exist', $method));
 		}
 
-		if (is_array($config)) $this->updateConfiguration($config);
+		if (is_array($config)) {
+		    $this->updateConfiguration($config);
+		}
 
-		if (!empty($update)) $this->update = $update;
-		else $this->update = Telegram::getUpdate() !== false ? Telegram::getUpdate() : null;
+		if (!empty($update)) {
+		    $this->update = $update;
+		} else {
+		    $this->update = Telegram::getUpdate() !== false ? Telegram::getUpdate() : null;
+		}
 
 		if (empty($this->update)) {
 			TelegramLog::error(
@@ -211,7 +216,9 @@ 
 		foreach ($plugins as $plugin) {
 			/** @var Plugin $plugin */
 			(new $plugin())->__execute($this, $update);
-			if ($this->isActive === false) break;
+			if ($this->isActive === false) {
+			    break;
+			}
 		}
 
 		$this->isActive = false;

src/lib/Plugin.php

Indentation +110 added lines, -110 removed lines

@@ -14,115 +14,115 @@
 abstract class Plugin
 {
 
-	/**
-	 * The Update types
-	 *
-	 * @var array
-	 */
-	protected array $update_types = [
-		'message',
-		'edited_message',
-		'channel_post',
-		'edited_channel_post',
-		'inline_query',
-		'chosen_inline_result',
-		'callback_query',
-		'shipping_query',
-		'pre_checkout_query',
-	];
-
-	/**
-	 * @var WebhookHandler
-	 */
-	protected WebhookHandler $hook;
-
-	/**
-	 * @var \Generator
-	 */
-	protected \Generator $returns;
-
-	/**
-	 * @var bool
-	 */
-	protected bool $kill_on_yield = false;
-
-	/**
-	 * Check for the exit of the plugin.
-	 *
-	 * @param \Generator $return
-	 * @return void
-	 */
-	public function __checkExit(\Generator $return): void
-	{
-		if ($return->valid()) {
-			if ($return->current() !== null && $this->kill_on_yield === true) {
-				$this->kill();
-			}
-		}
-
-		if ($return->valid()) {
-			$return->next();
-			$this->__checkExit($return);
-		}
-	}
-
-	/**
-	 * Identify the update type. e.g. Message, EditedMessage, etc.
-	 *
-	 * @param Update $update
-	 * @return string|null
-	 */
-	public function __identify(Update $update): ?string
-	{
-		$type = $update->getUpdateType();
-
-		if ($type === null) {
-			return null;
-		}
-
-		return str_replace('_', '', ucwords($type, '_'));
-	}
-
-
-	/**
-	 * Execute the plugin.
-	 *
-	 * @param WebhookHandler $receiver
-	 * @param Update $update
-	 * @return void
-	 */
-	public function __execute(WebhookHandler $receiver, Update $update): void
-	{
-		$this->hook = $receiver;
-
-		if (method_exists($this, 'onReceivedUpdate')) {
-			$return = $this->onReceivedUpdate($update);
-			$this->__checkExit($return);
-		}
-
-		$type = $this->__identify($update);
-		if (method_exists($this, ($method = 'on' . $type)) && $type !== null) {
-			$return = $this->$method($update);
-			$this->__checkExit($return);
-		}
-	}
-
-	/**
-	 * Identify the update type and if method of the type is exists, execute it.
-	 *
-	 * @param Update $update
-	 * @return \Generator
-	 */
-	abstract protected function onReceivedUpdate(Update $update): \Generator;
-
-	/**
-	 * Kill the plugin.
-	 *
-	 * @return void
-	 */
-	public function kill(): void
-	{
-		$this->hook->kill();
-	}
+    /**
+     * The Update types
+     *
+     * @var array
+     */
+    protected array $update_types = [
+        'message',
+        'edited_message',
+        'channel_post',
+        'edited_channel_post',
+        'inline_query',
+        'chosen_inline_result',
+        'callback_query',
+        'shipping_query',
+        'pre_checkout_query',
+    ];
+
+    /**
+     * @var WebhookHandler
+     */
+    protected WebhookHandler $hook;
+
+    /**
+     * @var \Generator
+     */
+    protected \Generator $returns;
+
+    /**
+     * @var bool
+     */
+    protected bool $kill_on_yield = false;
+
+    /**
+     * Check for the exit of the plugin.
+     *
+     * @param \Generator $return
+     * @return void
+     */
+    public function __checkExit(\Generator $return): void
+    {
+        if ($return->valid()) {
+            if ($return->current() !== null && $this->kill_on_yield === true) {
+                $this->kill();
+            }
+        }
+
+        if ($return->valid()) {
+            $return->next();
+            $this->__checkExit($return);
+        }
+    }
+
+    /**
+     * Identify the update type. e.g. Message, EditedMessage, etc.
+     *
+     * @param Update $update
+     * @return string|null
+     */
+    public function __identify(Update $update): ?string
+    {
+        $type = $update->getUpdateType();
+
+        if ($type === null) {
+            return null;
+        }
+
+        return str_replace('_', '', ucwords($type, '_'));
+    }
+
+
+    /**
+     * Execute the plugin.
+     *
+     * @param WebhookHandler $receiver
+     * @param Update $update
+     * @return void
+     */
+    public function __execute(WebhookHandler $receiver, Update $update): void
+    {
+        $this->hook = $receiver;
+
+        if (method_exists($this, 'onReceivedUpdate')) {
+            $return = $this->onReceivedUpdate($update);
+            $this->__checkExit($return);
+        }
+
+        $type = $this->__identify($update);
+        if (method_exists($this, ($method = 'on' . $type)) && $type !== null) {
+            $return = $this->$method($update);
+            $this->__checkExit($return);
+        }
+    }
+
+    /**
+     * Identify the update type and if method of the type is exists, execute it.
+     *
+     * @param Update $update
+     * @return \Generator
+     */
+    abstract protected function onReceivedUpdate(Update $update): \Generator;
+
+    /**
+     * Kill the plugin.
+     *
+     * @return void
+     */
+    public function kill(): void
+    {
+        $this->hook->kill();
+    }
 
 }
\ No newline at end of file