Skip to content

Refactor handleGetUpdates to remove backwards compatibility #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devrabie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor handleGetUpdates to remove backwards compatibility #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 7 additions & 19 deletions src/Telegram.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,15 +422,12 @@ public function getLastCommandResponse(): ServerResponse
/**
* Handle getUpdates method
*
* @todo Remove backwards compatibility for old signature and force $data to be an array.
*
* @param array|int|null $data
* @param int|null $timeout
* @param array $data
*
* @return ServerResponse
* @throws TelegramException
*/
public function handleGetUpdates($data = null, ?int $timeout = null): ServerResponse
public function handleGetUpdates(array $data = []): ServerResponse
{
if (empty($this->bot_username)) {
throw new TelegramException('Bot Username is not defined!');
Expand All @@ -440,24 +437,15 @@ public function handleGetUpdates($data = null, ?int $timeout = null): ServerResp

$offset = 0;
$limit = null;
$timeout = null;

// By default, get update types sent by Telegram.
$allowed_updates = [];

// @todo Backwards compatibility for old signature, remove in next version.
if (!is_array($data)) {
$limit = $data;

@trigger_error(
sprintf('Use of $limit and $timeout parameters in %s is deprecated. Use $data array instead.', __METHOD__),
E_USER_DEPRECATED
);
} else {
$offset = $data['offset'] ?? $offset;
$limit = $data['limit'] ?? $limit;
$timeout = $data['timeout'] ?? $timeout;
$allowed_updates = $data['allowed_updates'] ?? $allowed_updates;
}
$offset = $data['offset'] ?? $offset;
$limit = $data['limit'] ?? $limit;
$timeout = $data['timeout'] ?? $timeout;
$allowed_updates = $data['allowed_updates'] ?? $allowed_updates;

// Take custom input into account.
if ($custom_input = $this->getCustomInput()) {
Expand Down