-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(http-client): improve client configuration handling
* add support for HttpMethodsClient to be used directly without wrapping * handle different client types (PSR-18, HttpClient) properly by wrapping only when needed * fix client initialization to avoid creating new instances on every call * add tests for client configuration scenarios * improve type hints and error messages for invalid client configurations
- Loading branch information
1 parent
5f0202f
commit adc2386
Showing
2 changed files
with
95 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
<?php | ||
|
||
namespace Feature; | ||
|
||
use Tests\TestCase; | ||
use Http\Client\Common\HttpMethodsClient; | ||
use Http\Discovery\Psr17FactoryDiscovery; | ||
use Http\Discovery\Psr18ClientDiscovery; | ||
use Typesense\Exceptions\ConfigError; | ||
use Symfony\Component\HttpClient\Psr18Client; | ||
use Typesense\Client; | ||
use \stdClass; | ||
|
||
class HttpClientsTest extends TestCase | ||
{ | ||
private array $baseConfig; | ||
|
||
protected function setUp(): void | ||
{ | ||
parent::setUp(); | ||
$this->baseConfig = [ | ||
'api_key' => $_ENV['TYPESENSE_API_KEY'], | ||
'nodes' => [[ | ||
'host' => $_ENV['TYPESENSE_NODE_HOST'], | ||
'port' => $_ENV['TYPESENSE_NODE_PORT'], | ||
'protocol' => $_ENV['TYPESENSE_NODE_PROTOCOL'] | ||
]] | ||
]; | ||
} | ||
|
||
public function testWorksWithDefaultClient(): void | ||
{ | ||
$client = new Client($this->baseConfig); | ||
$response = $client->health->retrieve(); | ||
$this->assertIsBool($response['ok']); | ||
} | ||
|
||
public function testWorksWithPsr18Client(): void | ||
{ | ||
$httpClient = new Psr18Client(); | ||
$config = array_merge($this->baseConfig, ['client' => $httpClient]); | ||
|
||
$client = new Client($config); | ||
$response = $client->health->retrieve(); | ||
$this->assertIsBool($response['ok']); | ||
} | ||
|
||
public function testWorksWithHttpMethodsClient(): void | ||
{ | ||
$httpClient = new HttpMethodsClient( | ||
Psr18ClientDiscovery::find(), | ||
Psr17FactoryDiscovery::findRequestFactory(), | ||
Psr17FactoryDiscovery::findStreamFactory() | ||
); | ||
|
||
$config = array_merge($this->baseConfig, ['client' => $httpClient]); | ||
|
||
$client = new Client($config); | ||
$response = $client->health->retrieve(); | ||
$this->assertIsBool($response['ok']); | ||
} | ||
|
||
public function testRejectsInvalidClient(): void | ||
{ | ||
$this->expectException(ConfigError::class); | ||
$this->expectExceptionMessage('Client must implement PSR-18 ClientInterface or Http\Client\HttpClient'); | ||
|
||
$config = array_merge($this->baseConfig, ['client' => new stdClass()]); | ||
new Client($config); | ||
} | ||
} |