From edacca9f3d97ac95d7749cfcebeb644fea99ee21 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Sat, 27 May 2023 19:11:44 +0200 Subject: [PATCH] Change name of parameter of broadcastForwardMessages from ids to message_ids --- docs | 2 +- src/Broadcast/Broadcast.php | 6 +++--- src/InternalDoc.php | 6 +++--- tests/dockerfiles/php-cli/Dockerfile.alpine | 3 ++- tests/dockerfiles/php-cli/Dockerfile.debian | 3 ++- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs b/docs index d67b23e6eb..e4d123bcc6 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit d67b23e6eb8e9b8ea0f9086aea6d9e4b05e4c007 +Subproject commit e4d123bcc66f1ab4b4e3eb1620fa95621d807960 diff --git a/src/Broadcast/Broadcast.php b/src/Broadcast/Broadcast.php index 8c1b29f99a..cfb3c81778 100644 --- a/src/Broadcast/Broadcast.php +++ b/src/Broadcast/Broadcast.php @@ -66,12 +66,12 @@ public function broadcastMessages(array $messages, ?Filter $filter = null): int * containing a Progress object for all broadcasts currently in-progress. * * @param mixed $from_peer Bot API ID or Update, from where to forward the messages. - * @param list $ids IDs of the messages to forward. + * @param list $message_ids IDs of the messages to forward. * @param bool $drop_author If true, will forward messages without quoting the original author. */ - public function broadcastForwardMessages(mixed $from_peer, array $ids, bool $drop_author = false, ?Filter $filter = null): int + public function broadcastForwardMessages(mixed $from_peer, array $message_ids, bool $drop_author = false, ?Filter $filter = null): int { - return $this->broadcastCustom(new ActionForward($this, $this->getID($from_peer), $ids, $drop_author), $filter); + return $this->broadcastCustom(new ActionForward($this, $this->getID($from_peer), $message_ids, $drop_author), $filter); } /** diff --git a/src/InternalDoc.php b/src/InternalDoc.php index f715c54d71..8a284597c5 100644 --- a/src/InternalDoc.php +++ b/src/InternalDoc.php @@ -260,12 +260,12 @@ public function broadcastCustom(\danog\MadelineProto\Broadcast\Action $action, ? * containing a Progress object for all broadcasts currently in-progress. * * @param mixed $from_peer Bot API ID or Update, from where to forward the messages. - * @param list $ids IDs of the messages to forward. + * @param list $message_ids IDs of the messages to forward. * @param bool $drop_author If true, will forward messages without quoting the original author. */ - public function broadcastForwardMessages(mixed $from_peer, array $ids, bool $drop_author = false, ?\danog\MadelineProto\Broadcast\Filter $filter = null): int + public function broadcastForwardMessages(mixed $from_peer, array $message_ids, bool $drop_author = false, ?\danog\MadelineProto\Broadcast\Filter $filter = null): int { - return $this->wrapper->getAPI()->broadcastForwardMessages($from_peer, $ids, $drop_author, $filter); + return $this->wrapper->getAPI()->broadcastForwardMessages($from_peer, $message_ids, $drop_author, $filter); } /** * Sends a list of messages to all peers (users, chats, channels) of the bot. diff --git a/tests/dockerfiles/php-cli/Dockerfile.alpine b/tests/dockerfiles/php-cli/Dockerfile.alpine index 0913020b8b..4ec1ecdd2f 100644 --- a/tests/dockerfiles/php-cli/Dockerfile.alpine +++ b/tests/dockerfiles/php-cli/Dockerfile.alpine @@ -1,4 +1,5 @@ -FROM php:fpm-alpine +ARG ARCH= +FROM ${ARCH}php:fpm-alpine RUN apk add make g++ && \ curl -sSLf https://github.com/danog/PrimeModule-ext/archive/refs/tags/2.0.tar.gz | tar -xz && \ diff --git a/tests/dockerfiles/php-cli/Dockerfile.debian b/tests/dockerfiles/php-cli/Dockerfile.debian index 5dbff19e7b..58e775177e 100644 --- a/tests/dockerfiles/php-cli/Dockerfile.debian +++ b/tests/dockerfiles/php-cli/Dockerfile.debian @@ -1,4 +1,5 @@ -FROM php:fpm-bullseye +ARG ARCH= +FROM ${ARCH}php:fpm-bullseye ADD https://raw.githubusercontent.com/danog/docker-php-extension-installer/master/install-php-extensions /usr/local/bin/