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

Updated dependencies #948

Merged
merged 2 commits into from
Feb 2, 2024
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
256 changes: 128 additions & 128 deletions composer.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,13 @@ public function extract(FlowContext $context) : \Generator
$total = $this->maximum;
} else {
$countQuery = (clone $this->queryBuilder)->select('COUNT(*)');
$countQuery->resetQueryPart('orderBy');

if (\method_exists($countQuery, 'resetOrderBy')) {
$countQuery->resetOrderBy();
} else {
/** @psalm-suppress DeprecatedMethod */
$countQuery->resetQueryPart('orderBy');
}

$total = (int) $this->connection->fetchOne(
$countQuery->getSQL(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ final class ElasticsearchLoader implements Loader
private string $method;

/**
* @param array{hosts?: array<string>, connectionParams?: array<mixed>, retries?: int, sniffOnStart?: boolean, sslCert?: array<string>, sslKey?: array<string>, sslVerification?: (boolean|string), elasticMetaHeader?: boolean, includePortInHostHeader?: boolean} $config
* @param array{hosts?: array<string>, connectionParams?: array<mixed>, retries?: int, sniffOnStart?: bool, sslCert?: array<string>, sslKey?: array<string>, sslVerification?: (bool|string), elasticMetaHeader?: bool, includePortInHostHeader?: bool} $config
* @param array<mixed> $parameters
*/
public function __construct(
Expand Down
2 changes: 1 addition & 1 deletion src/core/etl/src/Flow/ETL/Cache/PSRSimpleCache.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ final class PSRSimpleCache implements Cache
{
public function __construct(
private readonly CacheInterface $cache,
private readonly null|int|\DateInterval $ttl = null,
private readonly int|\DateInterval|null $ttl = null,
private readonly Serializer $serializer = new NativePHPSerializer()
) {
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/etl/src/Flow/ETL/DataFrame.php
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ public function rows(Transformer|Transformation $transformer) : self
* @param bool $analyze - when set to true, run will return Report
*/
#[DSLMethod(exclude: true)]
public function run(?callable $callback = null, bool $analyze = false) : null|Report
public function run(?callable $callback = null, bool $analyze = false) : Report|null
{
$clone = clone $this;

Expand Down
2 changes: 1 addition & 1 deletion src/core/etl/src/Flow/ETL/Formatter/ASCII/ASCIIValue.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ final class ASCIIValue
{
private ?string $stringValue = null;

public function __construct(private readonly null|string|int|bool|float|array|Entry $value)
public function __construct(private readonly string|int|bool|float|array|Entry|null $value)
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/core/etl/src/Flow/ETL/Function/DOMNodeAttribute.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public function __construct(private readonly ScalarFunction $ref, private readon
{
}

public function eval(Row $row) : null|string
public function eval(Row $row) : string|null
{
/** @var mixed $value */
$value = $this->ref->eval($row);
Expand Down
2 changes: 1 addition & 1 deletion src/core/etl/src/Flow/ETL/Function/XPath.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public function __construct(private readonly ScalarFunction $ref, private readon
/**
* @psalm-suppress InvalidReturnStatement
*/
public function eval(Row $row) : null|\DOMNode|array
public function eval(Row $row) : \DOMNode|array|null
{
/** @var mixed $value */
$value = $this->ref->eval($row);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function __construct(private readonly FlatColumn $column)
$this->comparator = new Comparator();
}

public function add(string|int|float|null|array|bool|object $value) : void
public function add(string|int|float|array|bool|object|null $value) : void
{
if (\is_array($value)) {
$value = array_flatten($value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function __construct()
$this->comparator = new Comparator();
}

public function add(string|int|float|null|array|bool|object $value) : void
public function add(string|int|float|array|bool|object|null $value) : void
{
if (\is_array($value)) {
$value = array_flatten($value);
Expand Down
72 changes: 36 additions & 36 deletions tools/box/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading