Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
}
],
"require": {
"php": ">=5.3.0"
"php": ">=5.3.0",
"ext-curl": "*"
},
"require-dev": {
"phpunit/phpunit": "4.7.*"
Expand Down
5 changes: 3 additions & 2 deletions src/MessageBird/Resources/Lookup.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ public function __construct(Common\HttpClient $HttpClient)
}

/**
* @param $phoneNumber
* @param string|int $phoneNumber
* @param string $countryCode
*
* @return $this->Object
*
Expand All @@ -39,7 +40,7 @@ public function read($phoneNumber = null, $countryCode = null)
if(empty($phoneNumber)) {
throw new InvalidArgumentException('The phone number cannot be empty.');
}
$query = null;
$query = null;
if ($countryCode != null) {
$query = array("countryCode" => $countryCode);
}
Expand Down
6 changes: 4 additions & 2 deletions src/MessageBird/Resources/LookupHlr.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ class LookupHlr extends Base
*/
public function __construct(Common\HttpClient $HttpClient)
{
$this->setObject(new Objects\HLR);
$this->setObject(new Objects\Hlr);
$this->setResourceName('lookup');

parent::__construct($HttpClient);
}

/**
* @param $phoneNumber
* @param Objects\Hlr $hlr
* @param string|null $countryCode
*
* @return $this->Object
*
Expand All @@ -51,6 +52,7 @@ public function create($hlr, $countryCode = null)

/**
* @param $phoneNumber
* @param string|null $countryCode
*
* @return $this->Object
*
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/BaseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ public function testClientConstructor()
public function testHttpClientMock()
{
$this->mockClient->expects($this->atLeastOnce())->method('addUserAgentString');
$client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);
new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);
}
}
4 changes: 2 additions & 2 deletions tests/integration/balance/BalanceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class BalanceTest extends BaseTest
{
public function setUp()
{
parent::setup();
parent::setUp();
$this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);
}

Expand All @@ -13,6 +13,6 @@ public function setUp()
public function testReadBalance()
{
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("GET", 'balance', null, null);
$Hlr = $this->client->balance->read();
$this->client->balance->read();
}
}
4 changes: 2 additions & 2 deletions tests/integration/hlr/HlrTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class HlrTest extends BaseTest
{
public function setUp()
{
parent::setup();
parent::setUp();
$this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);
}

Expand All @@ -27,6 +27,6 @@ public function testCreateHlr()
public function testReadHlr()
{
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("GET", 'hlr/message_id', null, null);
$Hlr = $this->client->hlr->read("message_id");
$this->client->hlr->read("message_id");
}
}
2 changes: 1 addition & 1 deletion tests/integration/lookup/LookupTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class LookupTest extends BaseTest
{
public function setUp()
{
parent::setup();
parent::setUp();
$this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);
}

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/messages/MessagesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class MessageTest extends BaseTest
{
public function setUp()
{
parent::setup();
parent::setUp();
$this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);
}

Expand Down Expand Up @@ -100,7 +100,7 @@ public function testFlashSmsMessage()
public function testListMessage()
{
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("GET", 'messages', array ('offset' => 100, 'limit' => 30), null);
$MessageList = $this->client->messages->getList(array ('offset' => 100, 'limit' => 30));
$this->client->messages->getList(array ('offset' => 100, 'limit' => 30));
}

/**
Expand All @@ -109,7 +109,7 @@ public function testListMessage()
public function testReadMessage()
{
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("GET", 'messages/message_id', null, null);
$MessageList = $this->client->messages->read("message_id");
$this->client->messages->read("message_id");
}

/**
Expand All @@ -118,6 +118,6 @@ public function testReadMessage()
public function testDeleteMessage()
{
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("DELETE", 'messages/message_id', null, null);
$MessageList = $this->client->messages->delete("message_id");
$this->client->messages->delete("message_id");
}
}
2 changes: 1 addition & 1 deletion tests/integration/verify/VerifyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class VerifyTest extends BaseTest
{
public function setUp()
{
parent::setup();
parent::setUp();
$this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);
}

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/voicemessages/VoiceMessagesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class VoiceMessagesTest extends BaseTest
{
public function setUp()
{
parent::setup();
parent::setUp();
$this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);
}

Expand All @@ -28,7 +28,7 @@ public function testVoiceMessageCreate()
public function testListMessage()
{
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("GET", 'voicemessages', array ('offset' => 100, 'limit' => 30), null);
$MessageList = $this->client->voicemessages->getList(array ('offset' => 100, 'limit' => 30));
$this->client->voicemessages->getList(array ('offset' => 100, 'limit' => 30));
}

/**
Expand All @@ -37,7 +37,7 @@ public function testListMessage()
public function testReadMessage()
{
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("GET", 'voicemessages/message_id', null, null);
$MessageList = $this->client->voicemessages->read("message_id");
$this->client->voicemessages->read("message_id");
}

/**
Expand All @@ -46,6 +46,6 @@ public function testReadMessage()
public function testDeleteMessage()
{
$this->mockClient->expects($this->once())->method('performHttpRequest')->with("DELETE", 'voicemessages/message_id', null, null);
$MessageList = $this->client->voicemessages->delete("message_id");
$this->client->voicemessages->delete("message_id");
}
}