Skip to content

Commit 0ab1586

Browse files
committed
Merge branch 'master' of github.com:botman/driver-telegram
2 parents 8a91113 + 0572c10 commit 0ab1586

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

src/Extensions/Keyboard.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
namespace BotMan\Drivers\Telegram\Extensions;
44
use Illuminate\Support\Collection;
55

6-
76
/**
8-
* Class Keyboard
9-
* @package BotMan\Drivers\Telegram\Extensions
7+
* Class Keyboard.
108
*/
119
class Keyboard
1210
{
@@ -97,5 +95,4 @@ public function toArray()
9795
])->filter())
9896
];
9997
}
100-
101-
}
98+
}

src/Extensions/KeyboardButton.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,8 @@ public function requestLocation($active = true)
9797
return $this;
9898
}
9999

100-
101100
/**
102-
* Specify data which should be serialized to JSON
101+
* Specify data which should be serialized to JSON.
103102
* @link http://php.net/manual/en/jsonserializable.jsonserialize.php
104103
* @return mixed data which can be serialized by <b>json_encode</b>,
105104
* which is a value of any type other than a resource.
@@ -112,7 +111,7 @@ public function jsonSerialize()
112111
'callback_data' => $this->callbackData,
113112
'request_contact' => $this->requestContact,
114113
'request_location' => $this->requestLocation,
115-
'text' => $this->text
114+
'text' => $this->text,
116115
])->filter()->toArray();
117116
}
118-
}
117+
}

tests/TelegramKeyboardTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
namespace Tests;
44

5-
use BotMan\Drivers\Telegram\Extensions\KeyboardButton;
65
use PHPUnit_Framework_TestCase;
76
use BotMan\Drivers\Telegram\Extensions\Keyboard;
7+
use BotMan\Drivers\Telegram\Extensions\KeyboardButton;
88

99
class TelegramKeyboardTest extends PHPUnit_Framework_TestCase
1010
{
11-
1211
/** @test */
1312
public function it_can_be_created()
1413
{
@@ -52,5 +51,4 @@ public function it_can_have_multiple_buttons_in_each_row()
5251

5352
$this->assertCount(2, $replyMarkup[Keyboard::TYPE_INLINE][0]);
5453
}
55-
56-
}
54+
}

0 commit comments

Comments
 (0)