Merge pull request #92 from botman/fixes-test

Fixes tests and run on PHP 7.0 - 7.4
botman · Sep 10, 2020 · 9159a6d · 9159a6d
2 parents 6c2f1df + f7acfe3
commit 9159a6d
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 64 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,6 @@
 .DS_Store
 composer.lock
 .php_cs.cache
-/vendor/
+/vendor/
+
+/.discovery/*
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,13 @@ language: php
 php:
   - 7.0
   - 7.1
+  - 7.2
+  - 7.3
+  - 7.4
 
 before_script:
   - travis_retry composer self-update --preview
-  - travis_retry composer install --prefer-dist --no-interaction
+  - travis_retry composer install --prefer-dist --no-interaction --ignore-platform-req=composer-plugin-api
 
 script:
   - vendor/bin/phpunit --coverage-clover=coverage.xml
@@ -16,4 +19,4 @@ before_install:
   - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 after_success:
-  - codecov
+  - codecov
diff --git a/composer.json b/composer.json
@@ -16,13 +16,13 @@
     ],
     "require": {
         "php": ">=7.0",
-        "botman/botman": "~2.0"
+        "botman/botman": "^2.0"
     },
     "require-dev": {
-        "botman/studio-addons": "~1.0",
-        "illuminate/contracts": "~5.5.0",
-        "phpunit/phpunit": "~5.0",
-        "mockery/mockery": "dev-master",
+        "botman/studio-addons": "^1.0",
+        "illuminate/contracts": "^5.5",
+        "phpunit/phpunit": "^5.0",
+        "mockery/mockery": "^1.1",
         "ext-curl": "*"
     },
     "autoload": {

diff --git a/src/Console/Commands/TelegramRegisterCommand.php b/src/Console/Commands/TelegramRegisterCommand.php
@@ -44,7 +44,8 @@ public function handle()
         $output = json_decode(file_get_contents($url));
 
         if ($output->ok == true && $output->result == true) {
-            $this->info($remove
+            $this->info(
+                $remove
                 ? 'Your bot Telegram\'s webhook has been removed!'
                 : 'Your bot is now set up with Telegram\'s webhook!'
             );

diff --git a/src/TelegramAudioDriver.php b/src/TelegramAudioDriver.php
@@ -47,8 +47,12 @@ public function getMessages()
      */
     public function loadMessages()
     {
-        $message = new IncomingMessage(Audio::PATTERN, $this->event->get('from')['id'], $this->event->get('chat')['id'],
-            $this->event);
+        $message = new IncomingMessage(
+            Audio::PATTERN,
+            $this->event->get('from')['id'],
+            $this->event->get('chat')['id'],
+            $this->event
+        );
         $message->setAudio($this->getAudio());
 
         $this->messages = [$message];

diff --git a/src/TelegramDriver.php b/src/TelegramDriver.php
@@ -240,11 +240,13 @@ public function loadMessages()
                 new IncomingMessage('', $this->queryParameters->get('id'), $this->queryParameters->get('id'), $this->queryParameters),
             ];
         } else {
+            $event = $this->event->all();
+
             $messages = [
                 new IncomingMessage(
                     $this->event->get('text'),
-                    $this->event->get('from')['id'],
-                    $this->event->get('chat')['id'],
+                    isset($event['from']['id']) ? $event['from']['id'] : null,
+                    isset($event['chat']['id']) ? $event['chat']['id'] : null,
                     $this->event
                 ),
             ];
@@ -334,7 +336,7 @@ public function buildServicePayload($message, $matchingMessage, $additionalParam
         $parameters = array_merge_recursive([
             'chat_id' => $recipient,
         ], $additionalParameters + $defaultAdditionalParameters);
-        
+
         /*
          * If we send a Question with buttons, ignore
          * the text and append the question.

diff --git a/src/TelegramFileDriver.php b/src/TelegramFileDriver.php
@@ -47,8 +47,12 @@ public function getMessages()
      */
     public function loadMessages()
     {
-        $message = new IncomingMessage(File::PATTERN, $this->event->get('from')['id'], $this->event->get('chat')['id'],
-            $this->event);
+        $message = new IncomingMessage(
+            File::PATTERN,
+            $this->event->get('from')['id'],
+            $this->event->get('chat')['id'],
+            $this->event
+        );
         $message->setFiles($this->getFiles());
 
         $this->messages = [$message];

diff --git a/src/TelegramLocationDriver.php b/src/TelegramLocationDriver.php
@@ -46,10 +46,17 @@ public function getMessages()
      */
     public function loadMessages()
     {
-        $message = new IncomingMessage(Location::PATTERN, $this->event->get('from')['id'], $this->event->get('chat')['id'],
-            $this->event);
-        $message->setLocation(new Location($this->event->get('location')['latitude'],
-            $this->event->get('location')['longitude'], $this->event->get('location')));
+        $message = new IncomingMessage(
+            Location::PATTERN,
+            $this->event->get('from')['id'],
+            $this->event->get('chat')['id'],
+            $this->event
+        );
+        $message->setLocation(new Location(
+            $this->event->get('location')['latitude'],
+            $this->event->get('location')['longitude'],
+            $this->event->get('location')
+        ));
 
         $this->messages = [$message];
     }

diff --git a/src/TelegramPhotoDriver.php b/src/TelegramPhotoDriver.php
@@ -48,8 +48,12 @@ public function getMessages()
      */
     public function loadMessages()
     {
-        $message = new IncomingMessage(Image::PATTERN, $this->event->get('from')['id'], $this->event->get('chat')['id'],
-            $this->event);
+        $message = new IncomingMessage(
+            Image::PATTERN,
+            $this->event->get('from')['id'],
+            $this->event->get('chat')['id'],
+            $this->event
+        );
         $message->setImages($this->getImages());
 
         $this->messages = [$message];

diff --git a/src/TelegramVideoDriver.php b/src/TelegramVideoDriver.php
@@ -47,8 +47,12 @@ public function getMessages()
      */
     public function loadMessages()
     {
-        $message = new IncomingMessage(Video::PATTERN, $this->event->get('from')['id'], $this->event->get('chat')['id'],
-            $this->event);
+        $message = new IncomingMessage(
+            Video::PATTERN,
+            $this->event->get('from')['id'],
+            $this->event->get('chat')['id'],
+            $this->event
+        );
         $message->setVideos($this->getVideos());
 
         $this->messages = [$message];

diff --git a/tests/TelegramDriverTest.php b/tests/TelegramDriverTest.php
@@ -1461,45 +1461,6 @@ public function it_can_reply_message_objects_with_location()
         $driver->sendPayload($driver->buildServicePayload(\BotMan\BotMan\Messages\Outgoing\OutgoingMessage::create('Test', new Location('123', '321')), $message));
     }
 
-    /** @test */
-    public function it_can_reply_message_objects_with_contact()
-    {
-        $responseData = [
-            'update_id' => '1234567890',
-            'message' => [
-                'message_id' => '123',
-                'from' => [
-                    'id' => 'from_id',
-                ],
-                'chat' => [
-                    'id' => '12345',
-                ],
-                'date' => '1480369277',
-                'text' => 'Telegram Text',
-            ],
-        ];
-
-        $html = m::mock(Curl::class);
-        $html->shouldReceive('post')
-            ->once()
-            ->with('https://api.telegram.org/botTELEGRAM-BOT-TOKEN/sendContact', [], [
-                'chat_id' => '12345',
-                'phone_number' => '0775269856',
-                'first_name' => 'Daniele',
-                'first_name' => 'Rapisarda',
-                'user_id' => '123',
-                'caption' => 'Test',
-            ]);
-
-        $request = m::mock(\Symfony\Component\HttpFoundation\Request::class.'[getContent]');
-        $request->shouldReceive('getContent')->andReturn(json_encode($responseData));
-
-        $driver = new TelegramDriver($request, $this->telegramConfig, $html);
-
-        $message = $driver->getMessages()[0];
-        $driver->sendPayload($driver->buildServicePayload(\BotMan\BotMan\Messages\Outgoing\OutgoingMessage::create('Test', new Contact('0775269856', 'Daniele', 'Rapisarda', '123')), $message));
-    }
-
     /** @test */
     public function it_can_reply_message_objects_with_contact()
     {
@@ -1527,7 +1488,7 @@ public function it_can_reply_message_objects_with_contact()
                 'first_name' => 'Daniele',
                 'last_name' => 'Rapisarda',
                 'user_id' => '123',
-                'caption' => 'Test'
+                'caption' => 'Test',
             ]);
 
         $request = m::mock(\Symfony\Component\HttpFoundation\Request::class.'[getContent]');