Add return type information

Author: paolobueno

src/MessageBird/Objects/Number.php

@@ -46,7 +46,7 @@ class Number extends Base
      * Additional user-provided tags for this Number
      * @var array
      */
-    public $tags = array();
+    public $tags = [];
 
     /**
      * Number type (example: landline, mobile).

src/MessageBird/Resources/AvailablePhoneNumbers.php

@@ -34,33 +34,32 @@ public function __construct(Common\HttpClient $HttpClient)
      * @throws \MessageBird\Exceptions\RequestException
      * @throws \MessageBird\Exceptions\ServerException
      */
-    public function getList($countryCode, $parameters = array())
+    public function getList($countryCode, $parameters = []): Objects\BaseList
     {
         list($status, , $body) = $this->HttpClient->performHttpRequest(
             Common\HttpClient::REQUEST_GET,
             "available-phone-numbers/$countryCode",
             $parameters
         );
 
-        if ($status === 200) {
-            $body = json_decode($body);
+        if ($status !== 200) {
+            return $this->processRequest($body);
+        }
+        $body = json_decode($body);
 
-            $items = $body->data;
-            unset($body->data);
+        $items = $body->data;
+        unset($body->data);
 
-            $baseList = new Objects\BaseList();
-            $baseList->loadFromArray($body);
+        $baseList = new Objects\BaseList();
+        $baseList->loadFromArray($body);
 
-            foreach ($items as $item) {
-                $object = new Objects\Number($this->HttpClient);
+        foreach ($items as $item) {
+            $object = new Objects\Number($this->HttpClient);
 
-                $itemObject = $object->loadFromArray($item);
-                $baseList->items[] = $itemObject;
-            }
-            return $baseList;
+            $itemObject = $object->loadFromArray($item);
+            $baseList->items[] = $itemObject;
         }
-
-        return $this->processRequest($body);
+        return $baseList;
     }
 
     /**
@@ -70,20 +69,20 @@ public function getList($countryCode, $parameters = array())
      * @throws \MessageBird\Exceptions\RequestException
      * @throws \MessageBird\Exceptions\ServerException
      */
-    private function processRequest($body)
+    private function processRequest($body): Objects\Number
     {
-        $body = @json_decode($body);
+        $body = json_decode($body);
 
-        if ($body === null or $body === false) {
+        if (json_last_error()) {
             throw new \MessageBird\Exceptions\ServerException('Got an invalid JSON response from the server.');
         }
 
-        if (empty($body->errors)) {
-            return Objects\Number.loadFromArray($body->data[0]);
+        if (!empty($body->errors)) {
+            $ResponseError = new Common\ResponseError($body);
+            throw new \MessageBird\Exceptions\RequestException($ResponseError->getErrorString());
         }
 
-        $ResponseError = new Common\ResponseError($body);
-        throw new \MessageBird\Exceptions\RequestException($ResponseError->getErrorString());
+        return Objects\Number.loadFromArray($body->data[0]);
     }
 }
 ?>

src/MessageBird/Resources/PhoneNumbers.php

@@ -32,11 +32,11 @@ public function __construct(Common\HttpClient $HttpClient)
      * @param $object
      * @param $id
      *
-     * @return $this ->Object
+     * @return Objects\Number
      *
      * @internal param array $parameters
      */
-    public function update($object, $id)
+    public function update($object, $id): Objects\Number
     {
         $objVars = get_object_vars($object);
         $body = array();

tests/integration/numbers/AvailablePhoneNumbersTest.php

@@ -7,7 +7,7 @@ protected function setUp(): void
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);
     }
 
-    public function testListAvailablePhoneNumbers()
+    public function testListAvailablePhoneNumbers(): void
     {
         $this->expectException(\MessageBird\Exceptions\ServerException::class);
         $this->mockClient->expects($this->once())->method('performHttpRequest')->with('GET', 'available-phone-numbers/nl', array (), null);

tests/integration/numbers/PhoneNumbersTest.php

@@ -7,21 +7,21 @@ protected function setUp(): void
         $this->client = new \MessageBird\Client('YOUR_ACCESS_KEY', $this->mockClient);
     }
 
-    public function testReadPhoneNumber()
+    public function testReadPhoneNumber(): void
     {
         $this->expectException(\MessageBird\Exceptions\ServerException::class);
         $this->mockClient->expects($this->once())->method('performHttpRequest')->with('GET', 'phone-numbers/31612345678', null, null);
         $this->client->phoneNumbers->read(31612345678);
     }
 
-    public function testListPhoneNumbers()
+    public function testListPhoneNumbers(): void
     {
         $this->expectException(\MessageBird\Exceptions\ServerException::class);
         $this->mockClient->expects($this->once())->method('performHttpRequest')->with('GET', 'phone-numbers', array (), null);
         $this->client->phoneNumbers->getList();
     }
 
-    public function testUpdatePhoneNumber()
+    public function testUpdatePhoneNumber(): void
     {
         $Number = new \MessageBird\Objects\Number();
         $Number->tags = array('tag1');
@@ -31,7 +31,7 @@ public function testUpdatePhoneNumber()
         $this->client->phoneNumbers->update($Number, '31612345678');
     }
 
-    public function testPurchasePhoneNumber()
+    public function testPurchasePhoneNumber(): void
     {
         $NumberPurchaseRequest                        = new \MessageBird\Objects\NumberPurchaseRequest();
         $NumberPurchaseRequest->number                = '31612345678';
@@ -45,7 +45,7 @@ public function testPurchasePhoneNumber()
         $this->client->phoneNumbers->create($NumberPurchaseRequest);
     }
 
-    public function testCancelPhoneNumber()
+    public function testCancelPhoneNumber(): void
     {
         $this->mockClient->expects($this->atLeastOnce())->method('performHttpRequest')->willReturn(array(204, '', ''));
         $this->mockClient->expects($this->once())->method('performHttpRequest')->with('DELETE', 'phone-numbers/31612345678', null, null);