Skip to content

Commit

Permalink
Reverted to UrifactoryInterface
Browse files Browse the repository at this point in the history
  • Loading branch information
kedarkhaire committed Aug 22, 2023
1 parent 9615eed commit 751b634
Showing 2 changed files with 11 additions and 9 deletions.
14 changes: 8 additions & 6 deletions src/Client.php
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@
use Http\Discovery\MessageFactoryDiscovery;
use Http\Discovery\UriFactoryDiscovery;
use Http\Message\Authentication;
use Http\Message\UriFactory;
use Psr\Http\Message\UriFactoryInterface;
use Psr\Http\Client\ClientInterface as HttpClient;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
@@ -66,7 +66,7 @@ class Client implements ClientInterface

public const CONFIG_RETRY_PLUGIN_CONFIG = 'retry_plugin_config';

/** @var \Http\Message\UriFactory */
/** @var UriFactoryInterface */
private $uriFactory;

/** @var string|null */
@@ -122,7 +122,7 @@ class Client implements ClientInterface
* User agent prefix.
* - Apigee\Edge\Client::CONFIG_HTTP_CLIENT_BUILDER: \Apigee\Edge\HttpClient\Utility\BuilderInterface|null
* Http client builder.
* - Apigee\Edge\Client::CONFIG_URI_FACTORY: \Http\Message\UriFactory|null
* - Apigee\Edge\Client::CONFIG_URI_FACTORY: \Psr\Http\Message\UriFactoryInterface|null
* Factory for PSR-7 URIs.
* - Apigee\Edge\Client::CONFIG_REQUEST_FACTORY: \Http\Message\RequestFactory|null
* Factory for PSR-7 Requests.
@@ -153,10 +153,12 @@ public function getJournal(): JournalInterface
}

/**
* {@inheritdoc}
* Create a new URI.
*
* @return UriFactoryInterface
*/
#[\ReturnTypeWillChange]
public function getUriFactory(): UriFactory
public function getUriFactory(): UriFactoryInterface
{
return $this->uriFactory;
}
@@ -267,7 +269,7 @@ protected function configureOptions(OptionsResolver $resolver): void
$resolver->setAllowedTypes(static::CONFIG_USER_AGENT_PREFIX, ['null', 'string']);
$resolver->setAllowedTypes(static::CONFIG_HTTP_CLIENT_BUILDER, ['null', '\Apigee\Edge\HttpClient\Utility\BuilderInterface']);
$resolver->setAllowedTypes(static::CONFIG_JOURNAL, ['null', '\Apigee\Edge\HttpClient\Utility\JournalInterface']);
$resolver->setAllowedTypes(static::CONFIG_URI_FACTORY, ['null', '\Http\Message\UriFactory']);
$resolver->setAllowedTypes(static::CONFIG_URI_FACTORY, ['null', '\Psr\Http\Message\UriFactoryInterface']);
$resolver->setAllowedTypes(static::CONFIG_REQUEST_FACTORY, ['null', '\Http\Message\RequestFactory']);
$resolver->setAllowedTypes(static::CONFIG_ERROR_FORMATTER, ['null', '\Http\Message\Formatter']);
$resolver->setAllowedTypes(static::CONFIG_RETRY_PLUGIN_CONFIG, ['null', 'array']);
6 changes: 3 additions & 3 deletions src/ClientInterface.php
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
use Apigee\Edge\HttpClient\Utility\JournalInterface;
use Psr\Http\Client\ClientInterface as HttpClient;
use Psr\Http\Message\ResponseInterface;
use Http\Message\UriFactory;
use Psr\Http\Message\UriFactoryInterface;

/**
* Interface ClientInterface.
@@ -76,10 +76,10 @@ public function getJournal(): JournalInterface;
/**
* Returns the URI factory used by the Client.
*
* @return UriFactory
* @return UriFactoryInterface
*/
#[\ReturnTypeWillChange]
public function getUriFactory(): UriFactory;
public function getUriFactory(): UriFactoryInterface;

/**
* Returns the version of the API client.

0 comments on commit 751b634

Please sign in to comment.