Updates for PHP7 minimum

.travis.yml

@@ -1,6 +1,6 @@
 language: php
 
-php: [5.6, 7.0, 7.1]
+php: [7.0, 7.1]
 
 before_script:
   - composer selfupdate

README.md

@@ -6,8 +6,8 @@ Just some basic helper stuff to help test API endpoints.
 
 ## Compatibility
 
-* PHP 5.6 and above
-* PHPUnit 5.7 and above
+* PHP 7.0 and above
+* PHPUnit 6.0 and above
 * Guzzlehttp 6.2 and above
 
 ## Installation

composer.json

@@ -20,10 +20,10 @@
         }
     },
     "require": {
-        "php": "^5.6|^7.0",
-        "phpunit/phpunit": "^5.7",
+        "php": "^7.0",
         "guzzlehttp/guzzle": "^6.2",
-        "spatie/array-to-xml": "^2.2"
+        "spatie/array-to-xml": "^2.2",
+        "phpunit/phpunit": "^6.0"
     },
     "require-dev": {
         "satooshi/php-coveralls": "^1.0"

src/ApiTestCase.php

@@ -1,12 +1,15 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Brunty;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Psr7\Response as GuzzleResponse;
 use PHPUnit\Framework\TestCase;
+use SimpleXMLElement;
 use Spatie\ArrayToXml\ArrayToXml;
 
 class ApiTestCase extends TestCase
@@ -54,89 +57,52 @@ public function setUp()
         );
     }
 
-    /**
-     * @return Client
-     */
-    public function client()
+    public function client(): Client
     {
         return $this->client;
     }
 
-    /**
-     * @return GuzzleResponse
-     */
-    public function response()
+    public function response(): GuzzleResponse
     {
         return $this->response;
     }
 
-    /**
-     * @return mixed
-     */
-    public function statusCode()
+    public function statusCode(): int
     {
         return $this->statusCode;
     }
 
-    /**
-     * @param string $path
-     * @param array  $options
-     */
-    public function get($path, array $options = [])
+    public function get(string $path, array $options = [])
     {
         $this->request('get', $path, $options);
     }
 
-    /**
-     * @param string $path
-     * @param array  $options
-     */
-    public function post($path, array $options = [])
+    public function post(string $path, array $options = [])
     {
         $this->request('post', $path, $options);
     }
 
-    /**
-     * @param string $path
-     * @param array  $options
-     */
-    public function patch($path, array $options = [])
+    public function patch(string $path, array $options = [])
     {
         $this->request('patch', $path, $options);
     }
 
-    /**
-     * @param string $path
-     * @param array  $options
-     */
-    public function put($path, array $options = [])
+    public function put(string $path, array $options = [])
     {
         $this->request('put', $path, $options);
     }
 
-    /**
-     * @param string $path
-     * @param array  $options
-     */
-    public function delete($path, array $options = [])
+    public function delete(string $path, array $options = [])
     {
         $this->request('delete', $path, $options);
     }
 
-    /**
-     * @param $name
-     *
-     * @return \string[]
-     */
-    public function getHeader($name)
+    public function getHeader(string $name): array
     {
         return $this->response->getHeader($name);
     }
 
-    /**
-     * @param int $status
-     */
-    public function assertResponseStatus($status)
+    public function assertResponseStatus(int $status)
     {
         self::assertEquals(
             $status,
@@ -186,10 +152,7 @@ public function assertResponseWasServerError()
         );
     }
 
-    /**
-     * @param $path
-     */
-    public function assertRedirectedTo($path)
+    public function assertRedirectedTo(string $path)
     {
         $headers = $this->response->getHeader('X-Guzzle-Redirect-History');
         $path = $this->absolutePath($path);
@@ -212,26 +175,23 @@ public function assertResponseWasXml()
         );
     }
 
-    public function assertResponseHasKey($key)
+    public function assertResponseHasKey(string $key)
     {
         $content = $this->responseBody(true);
 
         self::assertTrue(isset($content[$key]), sprintf('Response body does not have the key %s', $key));
     }
 
     /**
-     * @param string      $query
+     * @param string $query
      * @param string|null $value
      */
-    public function assertNodeIsValue($query, $value)
+    public function assertNodeIsValue(string $query, $value)
     {
         self::assertEquals($value, $this->query($query));
     }
 
-    /**
-     * @return string
-     */
-    public function rawResponseBody()
+    public function rawResponseBody(): string
     {
         return $this->response->getBody()->getContents();
     }
@@ -242,7 +202,7 @@ public function rawResponseBody()
      * @return array|\SimpleXMLElement|\stdClass
      * @throws ContentTypeNotFoundException
      */
-    public function responseBody($asArray = false)
+    public function responseBody(bool $asArray = false)
     {
         if ($this->contentTypeIsJson()) {
             return json_decode($this->rawResponseBody(), $asArray);
@@ -260,36 +220,22 @@ public function responseBody($asArray = false)
         throw new ContentTypeNotFoundException(sprintf('Content-Type not recognised: "%s"', $this->getContentType()));
     }
 
-    /**
-     * @return mixed
-     */
-    public function getContentType()
+    public function getContentType(): string
     {
         return $this->response->getHeader('Content-Type')[0];
     }
 
-    /**
-     * @return bool
-     */
-    public function contentTypeIsXml()
+    public function contentTypeIsXml(): bool
     {
         return $this->getContentType() === self::XML_CONTENT_TYPE;
     }
 
-    /**
-     * @return bool
-     */
-    public function contentTypeIsJson()
+    public function contentTypeIsJson(): bool
     {
         return $this->getContentType() === self::JSON_CONTENT_TYPE;
     }
 
-    /**
-     * @param $type
-     * @param $path
-     * @param $options
-     */
-    private function request($type, $path, $options)
+    private function request(string $type, string $path, array $options = [])
     {
         $options = $options + [
                 'allow_redirects' => [
@@ -308,12 +254,7 @@ private function request($type, $path, $options)
         }
     }
 
-    /**
-     * @param $path
-     *
-     * @return mixed
-     */
-    private function absolutePath($path)
+    private function absolutePath(string $path): string
     {
         $baseUrl = $this->baseUrl();
 
@@ -324,18 +265,12 @@ private function absolutePath($path)
         return $path;
     }
 
-    /**
-     * @return mixed
-     */
-    private function baseUrl()
+    private function baseUrl(): string
     {
         return $_ENV['api_base_url'];
     }
 
-    /**
-     * @return \SimpleXMLElement
-     */
-    private function getBodyAsXml()
+    private function getBodyAsXml(): SimpleXMLElement
     {
         if ($this->bodyAsXml === null) {
             if ($this->contentTypeIsXml()) {
@@ -351,11 +286,11 @@ private function getBodyAsXml()
     }
 
     /**
-     * @param $query
+     * @param string $query
      *
      * @return null|string
      */
-    private function query($query)
+    private function query(string $query)
     {
         $xml = $this->getBodyAsXml();