strict_types=1 (#10)

* strict_types=1
* Finalize classes
* Fixes doc types

Author: SmetDenis

.gitattributes

@@ -11,4 +11,14 @@
 # @link       https://github.com/JBZoo/Http-Client
 #
 
+/.phan               export-ignore
+/build               export-ignore
+/tests               export-ignore
+/.editorconfig       export-ignore
+/.gitattributes      export-ignore
+/.gitignore          export-ignore
+/.travis.yml         export-ignore
+/phpunit.xml.dist    export-ignore
+/Makefile            export-ignore
+
 * text eol=lf

.phan/config.php

@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 $default = include __DIR__ . '/../vendor/jbzoo/codestyle/src/phan/default.php';
 
 return array_merge($default, [

.travis.yml

@@ -19,6 +19,14 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
+  - nightly
+
+jobs:
+  fast_finish: true
+  allow_failures:
+    - php: 8.0
+    - php: nightly
 
 env:
   matrix:

README.md

@@ -1,6 +1,6 @@
 # JBZoo / Http-Client
 
-[![Build Status](https://travis-ci.org/JBZoo/Http-Client.svg)](https://travis-ci.org/JBZoo/Http-Client)    [![Coverage Status](https://coveralls.io/repos/JBZoo/Http-Client/badge.svg)](https://coveralls.io/github/JBZoo/Http-Client)    [![Psalm Coverage](https://shepherd.dev/github/JBZoo/Http-Client/coverage.svg)](https://shepherd.dev/github/JBZoo/Http-Client)    
+[![Build Status](https://travis-ci.org/JBZoo/Http-Client.svg)](https://travis-ci.org/JBZoo/Http-Client)    [![Coverage Status](https://coveralls.io/repos/JBZoo/Http-Client/badge.svg)](https://coveralls.io/github/JBZoo/Http-Client)    [![Psalm Coverage](https://shepherd.dev/github/JBZoo/Http-Client/coverage.svg)](https://shepherd.dev/github/JBZoo/Http-Client)    [![PHP Strict Types](https://img.shields.io/badge/strict__types-%3D1-brightgreen)](https://www.php.net/manual/en/language.types.declarations.php#language.types.declarations.strict)    
 [![Stable Version](https://poser.pugx.org/jbzoo/http-client/version)](https://packagist.org/packages/jbzoo/http-client)    [![Latest Unstable Version](https://poser.pugx.org/jbzoo/http-client/v/unstable)](https://packagist.org/packages/jbzoo/http-client)    [![Dependents](https://poser.pugx.org/jbzoo/http-client/dependents)](https://packagist.org/packages/jbzoo/http-client/dependents?order_by=downloads)    [![GitHub Issues](https://img.shields.io/github/issues/jbzoo/http-client)](https://github.com/JBZoo/Http-Client/issues)    [![Total Downloads](https://poser.pugx.org/jbzoo/http-client/downloads)](https://packagist.org/packages/jbzoo/http-client/stats)    [![GitHub License](https://img.shields.io/github/license/jbzoo/http-client)](https://github.com/JBZoo/Http-Client/blob/master/LICENSE)
 
 
@@ -10,7 +10,7 @@ Just make HTTP requests in one line and don't care about terrible syntax of Guzz
 
 ## Install
 ```sh
-composer require guzzlehttp/guzzle --no-update # Recomended, but not required
+composer require guzzlehttp/guzzle --no-update # Recommended, but not required
 composer require jbzoo/http-client
 ```
 
@@ -32,7 +32,7 @@ $httpClient = new HttpClient([
     'verify'          => false,     // Check cert for SSL
     'exceptions'      => false,     // Show exceptions for statuses 4xx and 5xx
     'allow_redirects' => true,      // Show real 3xx-header or result?
-    'max_redirects'   => 10,        // How much to reirect?
+    'max_redirects'   => 10,        // How much to redirect?
     'user_agent'      => "It's me", // Custom UserAgent
 ]);
 
@@ -70,7 +70,10 @@ $value = $json->find('key.nested', 'default', 'trim');
 
 
 ## Asynchronous requests (curl_multi_* for parallels)
+
 ```php
+use JBZoo\HttpClient\HttpClient;
+
 $httpClient = new HttpClient();
 
 $results = $httpClient->multiRequest(array(

composer.json

@@ -17,14 +17,14 @@
         "php"                 : ">=7.2",
         "ext-json"            : "*",
 
-        "jbzoo/data"          : "^4.1.3",
-        "jbzoo/utils"         : "^4.2.3",
+        "jbzoo/data"          : "^4.2.0",
+        "jbzoo/utils"         : "^4.3.0",
         "guzzlehttp/promises" : ">=1.4.0"
     },
 
     "require-dev"       : {
-        "jbzoo/toolbox-dev" : "^2.6.2",
-        "jbzoo/event"       : "^3.0.3",
+        "jbzoo/toolbox-dev" : "^2.10.0",
+        "jbzoo/event"       : "^3.1.0",
         "rmccue/requests"   : "^1.7.0",
         "guzzlehttp/guzzle" : ">=6.5.5"
     },

src/Driver/AbstractDriver.php

@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\HttpClient\Driver;
 
 use JBZoo\HttpClient\Request;

src/Driver/Auto.php

@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\HttpClient\Driver;
 
 use GuzzleHttp\Client;
@@ -23,7 +25,7 @@
  * Class Auto
  * @package JBZoo\HttpClient\Driver
  */
-class Auto extends AbstractDriver
+final class Auto extends AbstractDriver
 {
     /**
      * @inheritDoc

src/Driver/Guzzle.php

@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\HttpClient\Driver;
 
 use GuzzleHttp\Client;
@@ -25,7 +27,7 @@
  * Class Guzzle
  * @package JBZoo\HttpClient\Driver
  */
-class Guzzle extends AbstractDriver
+final class Guzzle extends AbstractDriver
 {
     /**
      * @inheritDoc
@@ -97,7 +99,7 @@ public function multiRequest(array $requestList): array
      * @param string|array|null $args
      * @return array
      */
-    protected static function getDriverOptions(Options $options, array $headers, string $method, $args): array
+    private static function getDriverOptions(Options $options, array $headers, string $method, $args): array
     {
         $headers['User-Agent'] = $options->getUserAgent('Guzzle');
 
@@ -127,11 +129,11 @@ protected static function getDriverOptions(Options $options, array $headers, str
 
     /**
      * @param Options $options
-     * @return array|bool
+     * @return array|null
      */
-    protected static function getAllowRedirects(Options $options)
+    private static function getAllowRedirects(Options $options): ?array
     {
-        $allowRedirects = false;
+        $allowRedirects = null;
 
         if ($options->isAllowRedirects()) {
             $allowRedirects = [

src/Driver/Rmccue.php

@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\HttpClient\Driver;
 
 use JBZoo\HttpClient\Exception;
@@ -26,7 +28,7 @@
  * Class Rmccue
  * @package JBZoo\HttpClient\Driver
  */
-class Rmccue extends AbstractDriver
+final class Rmccue extends AbstractDriver
 {
     private const INVALID_CODE_LINE = HttpCodes::BAD_REQUEST;
 
@@ -39,7 +41,7 @@ public function request(Request $request): Response
 
         /**
          * @psalm-suppress PossiblyInvalidArgument
-         * @phan-suppress PhanPartialTypeMismatchArgument
+         * @phan-suppress  PhanPartialTypeMismatchArgument
          */
         $httpResult = Requests::request(
             $request->getUri(),
@@ -95,7 +97,7 @@ public function multiRequest(array $requestList): array
      * @param Options $options
      * @return array
      */
-    protected static function getDriverOptions(Options $options): array
+    private static function getDriverOptions(Options $options): array
     {
         return [
             'timeout'          => $options->getTimeout(),

src/Exception.php

@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\HttpClient;
 
 use JBZoo\Event\EventManager;
@@ -21,7 +23,7 @@
  * Class Exception
  * @package JBZoo\HttpClient
  */
-class Exception extends \RuntimeException
+final class Exception extends \RuntimeException
 {
     /**
      * Exception constructor.

src/HttpClient.php

@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\HttpClient;
 
 use JBZoo\Event\EventManager;
@@ -22,7 +24,7 @@
  * Class HttpClient
  * @package JBZoo\HttpClient
  */
-class HttpClient
+final class HttpClient
 {
     /**
      * @var Options
@@ -152,7 +154,7 @@ protected function getDriver(): AbstractDriver
      * @param EventManager $eManager
      * @return $this
      */
-    public function setEventManager(EventManager $eManager)
+    public function setEventManager(EventManager $eManager): self
     {
         $this->eManager = $eManager;
         return $this;
@@ -162,9 +164,9 @@ public function setEventManager(EventManager $eManager)
      * @param string        $eventName
      * @param array         $context
      * @param \Closure|null $callback
-     * @return int|string
+     * @return int
      */
-    public function trigger(string $eventName, array $context = [], ?\Closure $callback = null)
+    public function trigger(string $eventName, array $context = [], ?\Closure $callback = null): int
     {
         if (!$this->eManager) {
             return 0;

src/HttpCodes.php

@@ -13,13 +13,15 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\HttpClient;
 
 /**
  * Class HttpCodes
  * @package JBZoo\HttpClient
  */
-class HttpCodes
+final class HttpCodes
 {
     /**
      * @var string[]

src/Options.php

@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\HttpClient;
 
 use JBZoo\Data\Data;
@@ -24,7 +26,7 @@
  * Class Options
  * @package JBZoo\HttpClient
  */
-class Options
+final class Options
 {
     public const DEFAULT_DRIVER          = 'Guzzle';
     public const DEFAULT_TIMEOUT         = 10;

src/Request.php

@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\HttpClient;
 
 use JBZoo\Utils\Url;
@@ -21,7 +23,7 @@
  * Class Request
  * @package JBZoo\HttpClient
  */
-class Request
+final class Request
 {
     public const GET    = 'GET';
     public const HEAD   = 'HEAD';

src/Response.php

@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\HttpClient;
 
 use JBZoo\Data\JSON;
@@ -27,7 +29,7 @@
  * @property string     $body
  * @property float|null $time
  */
-class Response
+final class Response
 {
     /**
      * @var int
@@ -157,7 +159,7 @@ public function getXml(): JSON
      * @param string $name
      * @return array|string|float|int|string[]|null
      */
-    public function __get($name)
+    public function __get(string $name)
     {
         if ('code' === $name) {
             return $this->getCode();

tests/AbstractDriverTest.php

@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 use JBZoo\HttpClient\HttpClient;
@@ -97,7 +99,7 @@ public function testAllMethods()
             }
 
             isSame(200, $result->getCode(), $message);
-            isContain('application/json', $result->getHeader('Content-Type'), $message);
+            isContain('application/json', $result->getHeader('Content-Type'), false, $message);
             isSame($method, $body->find('queryString.method'), $message);
             isSame($method, $body->find('method'), $message);
 

tests/DriverGuzzleTest.php

@@ -13,13 +13,15 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 /**
  * Class RmccueDriverTest
  * @package JBZoo\PHPUnit
  */
-class DriverGuzzleTest extends AbstractDriverTest
+final class DriverGuzzleTest extends AbstractDriverTest
 {
     protected $driver = 'Guzzle';
 }

tests/DriverRmccueTest.php

@@ -13,13 +13,15 @@
  * @link       https://github.com/JBZoo/Http-Client
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 /**
  * Class DriverRmccueTest
  * @package JBZoo\PHPUnit
  */
-class DriverRmccueTest extends AbstractDriverTest
+final class DriverRmccueTest extends AbstractDriverTest
 {
     protected $driver = 'Rmccue';
 }