Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace deprecated package php-http/message-factory to psr/http-factory #300

Draft
wants to merge 5 commits into
base: 3.x
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Test passed
kedarkhaire committed Aug 24, 2023
commit 364340164c482db2b57ed346133190e3a055ca28
11 changes: 6 additions & 5 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 Psr\Http\Message\UriFactoryInterface;
use Http\Message\UriFactory;
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 \Psr\Http\Message\UriFactoryInterface */
/** @var \Http\Message\UriFactory */
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: Psr\Http\Message\UriFactoryInterface|null
* - Apigee\Edge\Client::CONFIG_URI_FACTORY: Http\Message\UriFactory|null
* Factory for PSR-7 URIs.
* - Apigee\Edge\Client::CONFIG_REQUEST_FACTORY: \Http\Message\RequestFactory|null
* Factory for PSR-7 Requests.
@@ -155,7 +155,8 @@ public function getJournal(): JournalInterface
/**
* {@inheritdoc}
*/
public function getUriFactory(): UriFactoryInterface
#[\ReturnTypeWillChange]
public function getUriFactory(): UriFactory
{
return $this->uriFactory;
}
@@ -266,7 +267,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', '\Psr\Http\Message\UriFactoryInterface']);
$resolver->setAllowedTypes(static::CONFIG_URI_FACTORY, ['null', '\Http\Message\UriFactory']);
$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']);
7 changes: 4 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 Psr\Http\Message\UriFactoryInterface;
use Http\Message\UriFactory;

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

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