FIX: Set correct Api/Bot instance when add/init Commands

[alies-dev]

There is a public method \Telegram\Bot\Commands\CommandBus::addCommand($command) that accepts class-string<CommandInterface>:

telegram-bot-sdk/src/Commands/CommandBus.php

Lines 69 to 87 in 9466c47

	/**
	* Add a command to the commands list.
	*
	* @param CommandInterface|string $command Either an object or full path to the command class.
	*
	* @throws TelegramSDKException
	*
	* @return CommandBus
	*/
	public function addCommand($command): self
	{
	$command = $this->resolveCommand($command);
	/*
	* At this stage we definitely have a proper command to use.
	*
	* @var Command $command
	*/
	$this->commands[$command->getName()] = $command;

it calls private resolveCommand :

telegram-bot-sdk/src/Commands/CommandBus.php

Lines 241 to 261 in 9466c47

	/**
	* @param $command
	*
	* @return object
	* @throws TelegramSDKException
	*/
	private function resolveCommand($command)
	{
	$command = $this->makeCommandObj($command);
	if (! ($command instanceof CommandInterface)) {
	throw new TelegramSDKException(
	sprintf(
	'Command class "%s" should be an instance of "Telegram\Bot\Commands\CommandInterface"',
	get_class($command)
	)
	);
	}
	return $command;
	}

that calls weird private makeCommandObj:

telegram-bot-sdk/src/Commands/CommandBus.php

Lines 292 to 317 in 9466c47

	/**
	* @param $command
	*
	* @return object
	* @throws TelegramSDKException
	*/
	private function makeCommandObj($command)
	{
	if (is_object($command)) {
	return $command;
	}
	if (! class_exists($command)) {
	throw new TelegramSDKException(
	sprintf(
	'Command class "%s" not found! Please make sure the class exists.',
	$command
	)
	);
	}
	if ($this->telegram->hasContainer()) {
	return $this->buildDependencyInjectedAnswer($command);
	}
	return new $command();
	}

it seems like makeCommandObj built to initiate not Command instances only, but it initiates Command instances ONLY. But when it initiates then using new keyword or even using DI container, it does not set a custom Api/Bot instance - it always uses default:

        if ($commandInstance instanceof Command && $this->telegram) {
            $commandInstance->setTelegram($this->telegram);
        }

        return $commandInstance;

As result, inside a command $this->getTelegram() always returns a default bot instance (what is wrong for multi-bot apps).

Extra

1. I've also removed makeCommandObj. It was private, so this is not BC change. Also, resolveCommand method explicitly returns CommandInterface instances (I've added some type checks and return type).
2. I've fixed a flaky test: now we don't use prophesize to instantiate Commands (prophesize is deprecated and will be removed in PHPUnit v10)

[irazasyed]

Good. Thanks