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

PHPDoc: Add CurlHandle as curl connection #2086

Merged
merged 1 commit into from
Jun 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
* Fixed some PHPDoc types adding `null` as possible value by @franmomu [#2070](https://github.com/ruflin/Elastica/pull/2070)
* Fixed passing wrong types to `GapPolicyInterface::setGapPolicy()`, `Document::setDocAsUpsert()` and `Connection::setPort()` methods.
* Fixed `Http` PHPDoc adding `\CurlHandle` type for Curl connection by @franmomu [#2086](https://github.com/ruflin/Elastica/pull/2086)
### Security

## [7.1.5](https://github.com/ruflin/Elastica/compare/7.1.5...7.1.4)
Expand Down
1 change: 1 addition & 0 deletions src/ClientConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public static function fromDsn(string $dsnString): self
} elseif ('pool' === $func->getName()) {
$connections = [];
$clientConfiguration = new static();
/** @var Url $arg */
foreach ($func->getArguments() as $arg) {
$connections[] = self::parseDsn($arg);
}
Expand Down
1 change: 1 addition & 0 deletions src/Pipeline.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class Pipeline extends Param

/**
* @var AbstractProcessor[]
* @phpstan-var array{processors?: AbstractProcessor[]}
*/
protected $_processors = [];

Expand Down
4 changes: 2 additions & 2 deletions src/Transport/Http.php
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public function exec(Request $request, array $params): Response
/**
* Called to add additional curl params.
*
* @param resource $curlConnection Curl connection
* @param \CurlHandle|resource $curlConnection Curl connection
*/
protected function _setupCurl($curlConnection): void
{
Expand All @@ -208,7 +208,7 @@ protected function _setupCurl($curlConnection): void
*
* @param bool $persistent False if not persistent connection
*
* @return resource Connection resource
* @return \CurlHandle|resource Connection resource
*/
protected function _getConnection(bool $persistent = true)
{
Expand Down