From f84f757ae21f1f6b6f0e52a3d27ab10473df6fa8 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sun, 3 Feb 2019 17:58:13 +0100 Subject: [PATCH] Use PSR-17 and mark classes as final --- src/HttpClient/HttpClientConfigurator.php | 16 ++++++++-------- src/Model/Webhook/ShowResponse.php | 2 +- src/Model/Webhook/UpdateResponse.php | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/HttpClient/HttpClientConfigurator.php b/src/HttpClient/HttpClientConfigurator.php index 4e436c6..d3eb5db 100644 --- a/src/HttpClient/HttpClientConfigurator.php +++ b/src/HttpClient/HttpClientConfigurator.php @@ -11,14 +11,14 @@ declare(strict_types=1); namespace Mailgun\HttpClient; -use Http\Client\Common\PluginClient; -use Http\Discovery\Psr18ClientDiscovery; -use Http\Discovery\UriFactoryDiscovery; -use Http\Message\UriFactory; use Http\Client\Common\Plugin; +use Http\Client\Common\PluginClient; +use Http\Discovery\Psr17FactoryDiscovery; +use Http\Discovery\Psr18ClientDiscovery; use Mailgun\HttpClient\Plugin\History; use Mailgun\HttpClient\Plugin\ReplaceUriPlugin; use Psr\Http\Client\ClientInterface; +use Psr\Http\Message\UriFactoryInterface; /** * Configure a HTTP client. @@ -45,7 +45,7 @@ final class HttpClientConfigurator private $apiKey; /** - * @var UriFactory + * @var UriFactoryInterface */ private $uriFactory; @@ -108,16 +108,16 @@ final class HttpClientConfigurator return $this; } - private function getUriFactory(): UriFactory + private function getUriFactory(): UriFactoryInterface { if (null === $this->uriFactory) { - $this->uriFactory = UriFactoryDiscovery::find(); + $this->uriFactory = Psr17FactoryDiscovery::findUrlFactory(); } return $this->uriFactory; } - public function setUriFactory(UriFactory $uriFactory): self + public function setUriFactory(UriFactoryInterface $uriFactory): self { $this->uriFactory = $uriFactory; diff --git a/src/Model/Webhook/ShowResponse.php b/src/Model/Webhook/ShowResponse.php index eb7e3cb..d334fc6 100644 --- a/src/Model/Webhook/ShowResponse.php +++ b/src/Model/Webhook/ShowResponse.php @@ -16,7 +16,7 @@ use Mailgun\Model\ApiResponse; /** * @author Tobias Nyholm */ -class ShowResponse implements ApiResponse +final class ShowResponse implements ApiResponse { private $webhook = []; diff --git a/src/Model/Webhook/UpdateResponse.php b/src/Model/Webhook/UpdateResponse.php index 61aa669..e030530 100644 --- a/src/Model/Webhook/UpdateResponse.php +++ b/src/Model/Webhook/UpdateResponse.php @@ -14,6 +14,6 @@ namespace Mailgun\Model\Webhook; /** * @author Tobias Nyholm */ -class UpdateResponse extends BaseResponse +final class UpdateResponse extends BaseResponse { }