Skip to content

Commit 73ed274

Browse files
nicolas-grekasnicolas-grekas
committed
minor symfony#61071 chore: PHP CS Fixer fixes (keradus)
This PR was squashed before being merged into the 7.4 branch. Discussion ---------- chore: PHP CS Fixer fixes | Q | A | ------------- | --- | Branch? | 7.4 | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Issues | Fix CS <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead --> | License | MIT with love by [PHP Coding Standards Fixer](https://cs.symfony.com/) Commits ------- 65b21a7 chore: PHP CS Fixer fixes
2 parents 120056b + 65b21a7 commit 73ed274

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

‎src/Symfony/Component/Cache/Traits/RelayClusterProxy.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ class RelayClusterProxy extends Cluster implements ResetInterface, LazyObjectInt
3131
}
3232

3333
public function __construct(
34-
string|null $name,
35-
array|null $seeds = null,
34+
?string $name,
35+
?array $seeds = null,
3636
int|float $connect_timeout = 0,
3737
int|float $command_timeout = 0,
3838
bool $persistent = false,
3939
#[\SensitiveParameter] mixed $auth = null,
40-
array|null $context = null,
40+
?array $context = null,
4141
) {
4242
$this->initializeLazyObject()->__construct(...\func_get_args());
4343
}
@@ -172,12 +172,12 @@ public function info(array|string $key_or_address, string ...$sections): Cluster
172172
return $this->initializeLazyObject()->info(...\func_get_args());
173173
}
174174

175-
public function flushdb(array|string $key_or_address, bool|null $sync = null): Cluster|bool
175+
public function flushdb(array|string $key_or_address, ?bool $sync = null): Cluster|bool
176176
{
177177
return $this->initializeLazyObject()->flushdb(...\func_get_args());
178178
}
179179

180-
public function flushall(array|string $key_or_address, bool|null $sync = null): Cluster|bool
180+
public function flushall(array|string $key_or_address, ?bool $sync = null): Cluster|bool
181181
{
182182
return $this->initializeLazyObject()->flushall(...\func_get_args());
183183
}
@@ -192,7 +192,7 @@ public function waitaof(array|string $key_or_address, int $numlocal, int $numrem
192192
return $this->initializeLazyObject()->waitaof(...\func_get_args());
193193
}
194194

195-
public function restore(mixed $key, int $ttl, string $value, array|null $options = null): Cluster|bool
195+
public function restore(mixed $key, int $ttl, string $value, ?array $options = null): Cluster|bool
196196
{
197197
return $this->initializeLazyObject()->restore(...\func_get_args());
198198
}
@@ -202,7 +202,7 @@ public function echo(array|string $key_or_address, string $message): Cluster|str
202202
return $this->initializeLazyObject()->echo(...\func_get_args());
203203
}
204204

205-
public function ping(array|string $key_or_address, string|null $message = null): Cluster|bool|string
205+
public function ping(array|string $key_or_address, ?string $message = null): Cluster|bool|string
206206
{
207207
return $this->initializeLazyObject()->ping(...\func_get_args());
208208
}
@@ -232,7 +232,7 @@ public function lastsave(array|string $key_or_address): Cluster|false|int
232232
return $this->initializeLazyObject()->lastsave(...\func_get_args());
233233
}
234234

235-
public function lcs(mixed $key1, mixed $key2, array|null $options = null): mixed
235+
public function lcs(mixed $key1, mixed $key2, ?array $options = null): mixed
236236
{
237237
return $this->initializeLazyObject()->lcs(...\func_get_args());
238238
}
@@ -297,7 +297,7 @@ public function geoadd(mixed $key, float $lng, float $lat, string $member, mixed
297297
return $this->initializeLazyObject()->geoadd(...\func_get_args());
298298
}
299299

300-
public function geodist(mixed $key, string $src, string $dst, string|null $unit = null): Cluster|float|false
300+
public function geodist(mixed $key, string $src, string $dst, ?string $unit = null): Cluster|float|false
301301
{
302302
return $this->initializeLazyObject()->geodist(...\func_get_args());
303303
}
@@ -492,7 +492,7 @@ public function unlink(mixed ...$keys): Cluster|false|int
492492
return $this->initializeLazyObject()->unlink(...\func_get_args());
493493
}
494494

495-
public function expire(mixed $key, int $seconds, string|null $mode = null): Cluster|bool
495+
public function expire(mixed $key, int $seconds, ?string $mode = null): Cluster|bool
496496
{
497497
return $this->initializeLazyObject()->expire(...\func_get_args());
498498
}
@@ -572,7 +572,7 @@ public function lpop(mixed $key, int $count = 1): mixed
572572
return $this->initializeLazyObject()->lpop(...\func_get_args());
573573
}
574574

575-
public function lpos(mixed $key, mixed $value, array|null $options = null): mixed
575+
public function lpos(mixed $key, mixed $value, ?array $options = null): mixed
576576
{
577577
return $this->initializeLazyObject()->lpos(...\func_get_args());
578578
}
@@ -707,7 +707,7 @@ public function hexists(mixed $key, mixed $member): Cluster|bool
707707
return $this->initializeLazyObject()->hexists(...\func_get_args());
708708
}
709709

710-
public function hrandfield(mixed $key, array|null $options = null): Cluster|array|string|false
710+
public function hrandfield(mixed $key, ?array $options = null): Cluster|array|string|false
711711
{
712712
return $this->initializeLazyObject()->hrandfield(...\func_get_args());
713713
}
@@ -862,7 +862,7 @@ public function getMode(bool $masked = false): int
862862
return $this->initializeLazyObject()->getMode(...\func_get_args());
863863
}
864864

865-
public function scan(mixed &$iterator, array|string $key_or_address, mixed $match = null, int $count = 0, string|null $type = null): array|false
865+
public function scan(mixed &$iterator, array|string $key_or_address, mixed $match = null, int $count = 0, ?string $type = null): array|false
866866
{
867867
return $this->initializeLazyObject()->scan($iterator, ...\array_slice(\func_get_args(), 1));
868868
}
@@ -1007,12 +1007,12 @@ public function xdel(mixed $key, array $ids): Cluster|false|int
10071007
return $this->initializeLazyObject()->xdel(...\func_get_args());
10081008
}
10091009

1010-
public function xinfo(string $operation, string|null $arg1 = null, string|null $arg2 = null, int $count = -1): mixed
1010+
public function xinfo(string $operation, ?string $arg1 = null, ?string $arg2 = null, int $count = -1): mixed
10111011
{
10121012
return $this->initializeLazyObject()->xinfo(...\func_get_args());
10131013
}
10141014

1015-
public function xpending(mixed $key, string $group, string|null $start = null, string|null $end = null, int $count = -1, string|null $consumer = null, int $idle = 0): Cluster|array|false
1015+
public function xpending(mixed $key, string $group, ?string $start = null, ?string $end = null, int $count = -1, ?string $consumer = null, int $idle = 0): Cluster|array|false
10161016
{
10171017
return $this->initializeLazyObject()->xpending(...\func_get_args());
10181018
}
@@ -1047,7 +1047,7 @@ public function zadd(mixed $key, mixed ...$args): mixed
10471047
return $this->initializeLazyObject()->zadd(...\func_get_args());
10481048
}
10491049

1050-
public function zrandmember(mixed $key, array|null $options = null): mixed
1050+
public function zrandmember(mixed $key, ?array $options = null): mixed
10511051
{
10521052
return $this->initializeLazyObject()->zrandmember(...\func_get_args());
10531053
}
@@ -1127,7 +1127,7 @@ public function zcount(mixed $key, mixed $min, mixed $max): Cluster|false|int
11271127
return $this->initializeLazyObject()->zcount(...\func_get_args());
11281128
}
11291129

1130-
public function zdiff(array $keys, array|null $options = null): Cluster|array|false
1130+
public function zdiff(array $keys, ?array $options = null): Cluster|array|false
11311131
{
11321132
return $this->initializeLazyObject()->zdiff(...\func_get_args());
11331133
}
@@ -1152,7 +1152,7 @@ public function zmscore(mixed $key, mixed ...$members): Cluster|array|false
11521152
return $this->initializeLazyObject()->zmscore(...\func_get_args());
11531153
}
11541154

1155-
public function zinter(array $keys, array|null $weights = null, mixed $options = null): Cluster|array|false
1155+
public function zinter(array $keys, ?array $weights = null, mixed $options = null): Cluster|array|false
11561156
{
11571157
return $this->initializeLazyObject()->zinter(...\func_get_args());
11581158
}
@@ -1162,17 +1162,17 @@ public function zintercard(array $keys, int $limit = -1): Cluster|false|int
11621162
return $this->initializeLazyObject()->zintercard(...\func_get_args());
11631163
}
11641164

1165-
public function zinterstore(mixed $dstkey, array $keys, array|null $weights = null, mixed $options = null): Cluster|false|int
1165+
public function zinterstore(mixed $dstkey, array $keys, ?array $weights = null, mixed $options = null): Cluster|false|int
11661166
{
11671167
return $this->initializeLazyObject()->zinterstore(...\func_get_args());
11681168
}
11691169

1170-
public function zunion(array $keys, array|null $weights = null, mixed $options = null): Cluster|array|false
1170+
public function zunion(array $keys, ?array $weights = null, mixed $options = null): Cluster|array|false
11711171
{
11721172
return $this->initializeLazyObject()->zunion(...\func_get_args());
11731173
}
11741174

1175-
public function zunionstore(mixed $dstkey, array $keys, array|null $weights = null, mixed $options = null): Cluster|false|int
1175+
public function zunionstore(mixed $dstkey, array $keys, ?array $weights = null, mixed $options = null): Cluster|false|int
11761176
{
11771177
return $this->initializeLazyObject()->zunionstore(...\func_get_args());
11781178
}
@@ -1197,7 +1197,7 @@ public function _masters(): array
11971197
return $this->initializeLazyObject()->_masters(...\func_get_args());
11981198
}
11991199

1200-
public function copy(mixed $srckey, mixed $dstkey, array|null $options = null): Cluster|bool
1200+
public function copy(mixed $srckey, mixed $dstkey, ?array $options = null): Cluster|bool
12011201
{
12021202
return $this->initializeLazyObject()->copy(...\func_get_args());
12031203
}

‎src/Symfony/Component/HttpFoundation/Response.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public function sendHeaders(?int $statusCode = null): static
320320
if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
321321
$statusCode ??= $this->statusCode;
322322
trigger_deprecation('symfony/http-foundation', '7.4', 'Trying to use "%s::sendHeaders()" after headers have already been sent is deprecated will throw a PHP warning in 8.0. Use a "StreamedResponse" instead.', static::class);
323-
//header(\sprintf('HTTP/%s %s %s', $this->version, $statusCode, $this->statusText), true, $statusCode);
323+
// header(\sprintf('HTTP/%s %s %s', $this->version, $statusCode, $this->statusText), true, $statusCode);
324324
}
325325

326326
return $this;

0 commit comments

Comments
 (0)