extended api class

ahoulgrave · Nov 18, 2016 · 4a49bd7 · 4a49bd7
1 parent 32ef49f
commit 4a49bd7
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/src/Provider/TelegramServiceProvider.php b/src/Provider/TelegramServiceProvider.php
@@ -3,7 +3,7 @@
 
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
-use Telegram\Bot\Api;
+use Telegram\Bot\Silex\Service\TelegramService;
 
 class TelegramServiceProvider implements ServiceProviderInterface
 {
@@ -16,13 +16,13 @@ public function register(Container $app)
             if (!isset($app['telegram.bot_api'])) {
                 throw new \Exception('telegram.bot_api parameter must be set.');
             }
-            $botApi = new Api($app['telegram.bot_api']);
+            $botApi = new TelegramService($app, $app['telegram.bot_api']);
             if (
                 isset($app['telegram.commands'])
                 && is_array($app['telegram.commands'])
             ) {
                 foreach ($app['telegram.commands'] as $command) {
-                    $botApi->addCommand(new $command($app));
+                    $botApi->addCommand($command);
                 }
             }
             return $botApi;

diff --git a/src/Service/TelegramService.php b/src/Service/TelegramService.php
@@ -0,0 +1,28 @@
+<?php
+namespace Telegram\Bot\Silex\Service;
+
+use Pimple\Container;
+use Telegram\Bot\Api;
+
+class TelegramService extends Api
+{
+    /**
+     * @var Container
+     */
+    private $app;
+
+    public function __construct(Container $app, $token = null, $async = false, $http_client_handler = null)
+    {
+        parent::__construct($token, $async, $http_client_handler);
+        $this->app = $app;
+    }
+
+    /**
+     * @param string $command
+     * @return \Telegram\Bot\Commands\CommandBus
+     */
+    public function addCommand($command)
+    {
+        return parent::addCommand(new $command($this->app));
+    }
+}
diff --git a/tests/Command/ApplicationAwareCommandTest.php b/tests/Command/ApplicationAwareCommandTest.php
@@ -3,8 +3,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Silex\Application;
-use Telegram\Bot\Api;
 use Telegram\Bot\Silex\Provider\TelegramServiceProvider;
+use Telegram\Bot\Silex\Service\TelegramService;
 
 class ApplicationAwareCommandTest extends TestCase
 {
@@ -20,7 +20,7 @@ public function testAppInjection()
                 TestCommand::class
             ]
         ]);
-        /* @var $api Api */
+        /* @var $api TelegramService */
         $api = $app['telegram'];
         foreach ($api->getCommands() as $command) {
             $this->assertInstanceOf(Application::class, $command->getApplication());

diff --git a/tests/Provider/ServiceProviderTest.php b/tests/Provider/ServiceProviderTest.php
@@ -3,8 +3,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Silex\Application;
-use Telegram\Bot\Api;
 use Telegram\Bot\Silex\Provider\TelegramServiceProvider;
+use Telegram\Bot\Silex\Service\TelegramService;
 
 class ServiceProviderTest extends TestCase
 {
@@ -28,6 +28,6 @@ public function testCommandCount()
         $app->register(new TelegramServiceProvider(), [
             'telegram.bot_api' => 'testapicode'
         ]);
-        $this->assertInstanceOf(Api::class, $app['telegram']);
+        $this->assertInstanceOf(TelegramService::class, $app['telegram']);
     }
 }