Merge pull request #473 from php-http/strict-typing

Declare parameter and return types

Author: dbu

CHANGELOG.md

@@ -20,6 +20,7 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" betwee
 - Removed the `DummyClient` interface
 - Removed the `Http\Client\HttpClient` alias use the `Psr\Http\Client\ClientInterface` typehint in your services for autowiring.
 - Changed classes marked as `@final` to be actually `final`. If you extended any of those, instead implement interfaces or decorate the class rather than extending it. Open an issue if you think a class needs to be made non-final to discuss what we should do.
+- Added return type declaration to `Http\HttplugBundle\ClientFactory\ClientFactory::createClient`
 
 # Version 1
 

src/ClientFactory/AutoDiscoveryFactory.php

@@ -5,6 +5,7 @@
 namespace Http\HttplugBundle\ClientFactory;
 
 use Http\Discovery\Psr18ClientDiscovery;
+use Psr\Http\Client\ClientInterface;
 
 /**
  * Use auto discovery to find a HTTP client.
@@ -13,7 +14,7 @@
  */
 final class AutoDiscoveryFactory implements ClientFactory
 {
-    public function createClient(array $config = [])
+    public function createClient(array $config = []): ClientInterface
     {
         return Psr18ClientDiscovery::find();
     }

src/ClientFactory/BuzzFactory.php

@@ -5,6 +5,7 @@
 namespace Http\HttplugBundle\ClientFactory;
 
 use Buzz\Client\FileGetContents;
+use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -17,7 +18,7 @@ public function __construct(private readonly ResponseFactoryInterface $responseF
     {
     }
 
-    public function createClient(array $config = [])
+    public function createClient(array $config = []): ClientInterface
     {
         if (!class_exists('Buzz\Client\FileGetContents')) {
             throw new \LogicException('To use the Buzz you need to install the "kriswallsmith/buzz" package.');
@@ -29,7 +30,7 @@ public function createClient(array $config = [])
     /**
      * Get options to configure the Buzz client.
      */
-    private function getOptions(array $config = [])
+    private function getOptions(array $config = []): array
     {
         $resolver = new OptionsResolver();
 

src/ClientFactory/ClientFactory.php

@@ -13,8 +13,6 @@ interface ClientFactory
 {
     /**
      * Input an array of configuration to be able to create a ClientInterface.
-     *
-     * @return ClientInterface
      */
-    public function createClient(array $config = []);
+    public function createClient(array $config = []): ClientInterface;
 }

src/ClientFactory/CurlFactory.php

@@ -5,6 +5,7 @@
 namespace Http\HttplugBundle\ClientFactory;
 
 use Http\Client\Curl\Client;
+use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 
@@ -19,7 +20,7 @@ public function __construct(
     ) {
     }
 
-    public function createClient(array $config = [])
+    public function createClient(array $config = []): ClientInterface
     {
         if (!class_exists('Http\Client\Curl\Client')) {
             throw new \LogicException('To use the Curl client you need to install the "php-http/curl-client" package.');

src/ClientFactory/Guzzle6Factory.php

@@ -5,13 +5,14 @@
 namespace Http\HttplugBundle\ClientFactory;
 
 use Http\Adapter\Guzzle6\Client;
+use Psr\Http\Client\ClientInterface;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 final class Guzzle6Factory implements ClientFactory
 {
-    public function createClient(array $config = [])
+    public function createClient(array $config = []): ClientInterface
     {
         if (!class_exists('Http\Adapter\Guzzle6\Client')) {
             throw new \LogicException('To use the Guzzle6 adapter you need to install the "php-http/guzzle6-adapter" package.');

src/ClientFactory/Guzzle7Factory.php

@@ -5,13 +5,14 @@
 namespace Http\HttplugBundle\ClientFactory;
 
 use Http\Adapter\Guzzle7\Client;
+use Psr\Http\Client\ClientInterface;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 final class Guzzle7Factory implements ClientFactory
 {
-    public function createClient(array $config = [])
+    public function createClient(array $config = []): ClientInterface
     {
         if (!class_exists('Http\Adapter\Guzzle7\Client')) {
             throw new \LogicException('To use the Guzzle7 adapter you need to install the "php-http/guzzle7-adapter" package.');

src/ClientFactory/MockFactory.php

@@ -19,12 +19,12 @@ final class MockFactory implements ClientFactory
      *
      * Note that this can be any client, not only a mock client.
      */
-    public function setClient(ClientInterface $client)
+    public function setClient(ClientInterface $client): void
     {
         $this->client = $client;
     }
 
-    public function createClient(array $config = [])
+    public function createClient(array $config = []): ClientInterface
     {
         if (!class_exists(Client::class)) {
             throw new \LogicException('To use the mock adapter you need to install the "php-http/mock-client" package.');

src/ClientFactory/ReactFactory.php

@@ -5,13 +5,14 @@
 namespace Http\HttplugBundle\ClientFactory;
 
 use Http\Adapter\React\Client;
+use Psr\Http\Client\ClientInterface;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 final class ReactFactory implements ClientFactory
 {
-    public function createClient(array $config = [])
+    public function createClient(array $config = []): ClientInterface
     {
         if (!class_exists('Http\Adapter\React\Client')) {
             throw new \LogicException('To use the React adapter you need to install the "php-http/react-adapter" package.');

src/ClientFactory/SocketFactory.php

@@ -5,13 +5,14 @@
 namespace Http\HttplugBundle\ClientFactory;
 
 use Http\Client\Socket\Client;
+use Psr\Http\Client\ClientInterface;
 
 /**
  * @author Tobias Nyholm <[email protected]>
  */
 final class SocketFactory implements ClientFactory
 {
-    public function createClient(array $config = [])
+    public function createClient(array $config = []): ClientInterface
     {
         if (!class_exists('Http\Client\Socket\Client')) {
             throw new \LogicException('To use the Socket client you need to install the "php-http/socket-client" package.');