Skip to content

Commit 1afefdf

Browse files
renovate[bot]simPod
authored andcommitted
chore(deps): update phpstan packages to v2
1 parent eddc8c2 commit 1afefdf

File tree

15 files changed

+71
-42
lines changed

15 files changed

+71
-42
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
"nyholm/psr7": "^1.2",
4343
"php-http/message-factory": "^1.1",
4444
"phpstan/extension-installer": "^1.1",
45-
"phpstan/phpstan": "^1.0.0",
46-
"phpstan/phpstan-phpunit": "^1.0.0",
47-
"phpstan/phpstan-strict-rules": "^1.0.0",
45+
"phpstan/phpstan": "^2.0.0",
46+
"phpstan/phpstan-phpunit": "^2.0.0",
47+
"phpstan/phpstan-strict-rules": "^2.0.0",
4848
"phpunit/phpunit": "^11.0",
4949
"symfony/http-client": "^7.0"
5050
},

src/Client/Http/RequestFactory.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ public function prepareRequest(RequestOptions $requestOptions): RequestInterface
8282
}
8383
}
8484

85-
$typeToParam = array_reduce(
85+
/** @var array<string, Type> $paramToType */
86+
$paramToType = array_reduce(
8687
array_keys($matches[1]),
8788
static function (array $acc, string|int $k) use ($matches) {
8889
$acc[$matches[1][$k]] = Type::fromString($matches[2][$k]);
@@ -94,7 +95,7 @@ static function (array $acc, string|int $k) use ($matches) {
9495

9596
$streamElements = [['name' => 'query', 'contents' => $requestOptions->sql]];
9697
foreach ($requestOptions->params as $name => $value) {
97-
$type = $typeToParam[$name] ?? null;
98+
$type = $paramToType[$name] ?? null;
9899
if ($type === null) {
99100
continue;
100101
}

src/Format/Json.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ final class Json implements Format
1616
/** @throws JsonException */
1717
public static function output(string $contents): Output
1818
{
19-
return new \SimPod\ClickHouseClient\Output\Json($contents);
19+
/** @var \SimPod\ClickHouseClient\Output\Json<T> $output */
20+
$output = new \SimPod\ClickHouseClient\Output\Json($contents);
21+
return $output;
2022
}
2123

2224
public static function toSql(): string

src/Format/JsonCompact.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ final class JsonCompact implements Format
1616
/** @throws JsonException */
1717
public static function output(string $contents): Output
1818
{
19-
return new \SimPod\ClickHouseClient\Output\JsonCompact($contents);
19+
/** @var \SimPod\ClickHouseClient\Output\JsonCompact<T> $output */
20+
$output = new \SimPod\ClickHouseClient\Output\JsonCompact($contents);
21+
return $output;
2022
}
2123

2224
public static function toSql(): string

src/Format/JsonEachRow.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ final class JsonEachRow implements Format
1616
/** @throws JsonException */
1717
public static function output(string $contents): Output
1818
{
19-
return new \SimPod\ClickHouseClient\Output\JsonEachRow($contents);
19+
/** @var \SimPod\ClickHouseClient\Output\JsonEachRow<T> $output */
20+
$output = new \SimPod\ClickHouseClient\Output\JsonEachRow($contents);
21+
return $output;
2022
}
2123

2224
public static function toSql(): string

src/Format/Null_.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ final class Null_ implements Format
1616
{
1717
public static function output(string $contents): Output
1818
{
19-
return new \SimPod\ClickHouseClient\Output\Null_($contents);
19+
/** @var \SimPod\ClickHouseClient\Output\Null_<T> $output */
20+
$output = new \SimPod\ClickHouseClient\Output\Null_($contents);
21+
22+
return $output;
2023
}
2124

2225
public static function toSql(): string

src/Format/Pretty.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ final class Pretty implements Format
1515
{
1616
public static function output(string $contents): Output
1717
{
18-
return new Basic($contents);
18+
/** @var Basic<T> $output */
19+
$output = new Basic($contents);
20+
return $output;
1921
}
2022

2123
public static function toSql(): string

src/Format/PrettySpace.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ final class PrettySpace implements Format
1515
{
1616
public static function output(string $contents): Output
1717
{
18-
return new Basic($contents);
18+
/** @var Basic<T> $output */
19+
$output = new Basic($contents);
20+
return $output;
1921
}
2022

2123
public static function toSql(): string

src/Format/TabSeparated.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ final class TabSeparated implements Format
1515
{
1616
public static function output(string $contents): Output
1717
{
18-
return new Basic($contents);
18+
/** @var Basic<T> $output */
19+
$output = new Basic($contents);
20+
return $output;
1921
}
2022

2123
public static function toSql(): string

src/Output/Json.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ final class Json implements Output
2525

2626
public int $rows;
2727

28-
public int|null $rowsBeforeLimitAtLeast = null;
28+
public int|null $rowsBeforeLimitAtLeast;
2929

3030
/** @var array{elapsed: float, rows_read: int, bytes_read: int} */
3131
public array $statistics;

0 commit comments

Comments
 (0)