8000 [Cache][VarExporter] Fix proxy generation to deal with edgy behaviors of internal classes by nicolas-grekas · Pull Request #52036 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Cache][VarExporter] Fix proxy generation to deal with edgy behaviors of internal classes #52036

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 13, 2023
Merged

[Cache][VarExporter] Fix proxy generation to deal with edgy behaviors of internal classes #52036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/Symfony/Component/Cache/Traits/Redis6Proxy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ public function hVals($key): \Redis|array|false

public function hscan($key, &$iterator, $pattern = null, $count = 0): \Redis|array|bool
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hscan($key, $iterator, $pattern, $count, ...\array_slice(\func_get_args(), 4));
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hscan($key, $iterator, ...\array_slice(\func_get_args(), 2));
}

public function incr($key, $by = 1): \Redis|false|int
Expand Down Expand Up @@ -888,7 +888,7 @@ public function save(): \Redis|bool

public function scan(&$iterator, $pattern = null, $count = 0, $type = null): array|false
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->scan($iterator, $pattern, $count, $type, ...\arr 10000 ay_slice(\func_get_args(), 4));
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->scan($iterator, ...\array_slice(\func_get_args(), 1));
}

public function scard($key): \Redis|false|int
Expand Down Expand Up @@ -998,7 +998,7 @@ public function srem($key, $value, ...$other_values): \Redis|false|int

public function sscan($key, &$iterator, $pattern = null, $count = 0): array|false
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sscan($key, $iterator, $pattern, $count, ...\array_slice(\func_get_args(), 4));
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sscan($key, $iterator, ...\array_slice(\func_get_args(), 2));
}

public function ssubscribe($channels, $cb): bool
Expand Down Expand Up @@ -1278,7 +1278,7 @@ public function zinterstore($dst, $keys, $weights = null, $aggregate = null): \R

public function zscan($key, &$iterator, $pattern = null, $count = 0): \Redis|array|false
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zscan($key, $iterator, $pattern, $count, ...\array_slice(\func_get_args(), 4));
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zscan($key, $iterator, ...\array_slice(\func_get_args(), 2));
}

public function zunion($keys, $weights = null, $options = null): \Redis|array|false
Expand Down
8 changes: 4 additions & 4 deletions src/Symfony/Component/Cache/Traits/RedisCluster6Proxy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ public function hmset($key, $key_values): \RedisCluster|bool

public function hscan($key, &$iterator, $pattern = null, $count = 0): array|bool
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hscan($key, $iterator, $pattern, $count, ...\array_slice(\func_get_args(), 4));
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hscan($key, $iterator, ...\array_slice(\func_get_args(), 2));
}

public function hrandfield($key, $options = null): \RedisCluster|array|string
Expand Down Expand Up @@ -738,7 +738,7 @@ public function save($key_or_address): \RedisCluster|bool

public function scan(&$iterator, $key_or_address, $pattern = null, $count = 0): array|bool
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->scan($iterator, $key_or_address, $pattern, $count, ...\array_slice(\func_get_args(), 4));
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->scan($iterator, ...\array_slice(\func_get_args(), 1));
}

public function scard($key): \RedisCluster|false|int
Expand Down Expand Up @@ -858,7 +858,7 @@ public function srem($key, $value, ...$other_values): \RedisCluster|false|int

public function sscan($key, &$iterator, $pattern = null, $count = 0): array|false
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sscan($key, $iterator, $pattern, $count, ...\array_slice(\func_get_args(), 4));
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sscan($key, $iterator, ...\array_slice(\func_get_args(), 2));
}

public function strlen($key): \RedisCluster|false|int
Expand Down Expand Up @@ -1103,7 +1103,7 @@ public function zrevrank($key, $member): \RedisCluster|false|int

public function zscan($key, &$iterator, $pattern = null, $count = 0): \RedisCluster|array|bool
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zscan($key, $iterator, $pattern, $count, ...\array_slice(\func_get_args(), 4));
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zscan($key, $iterator, ...\array_slice(\func_get_args(), 2));
}

public function zscore($key, $member): \RedisCluster|false|float
Expand Down
8 changes: 4 additions & 4 deletions src/Symfony/Component/Cache/Traits/RelayProxy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,22 +984,22 @@ public function clearBytes(): void

public function scan(&$iterator, $match = null, $count = 0, $type = null): array|false
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->scan($iterator, $match, $count, $type, ...\array_slice(\func_get_args(), 4));
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->scan($iterator, ...\array_slice(\func_get_args(), 1));
}

public function hscan($key, &$iterator, $match = null, $count = 0): array|false
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hscan($key, $iterator, $match, $count, ...\array_slice(\func_get_args(), 4));
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->hscan($key, $iterator, ...\array_slice(\func_get_args(), 2));
}

public function sscan($key, &$iterator, $match = null, $count = 0): array|false
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sscan($key, $iterator, $match, $count, ...\array_slice(\func_get_args(), 4));
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->sscan($key, $iterator, ...\array_slice(\func_get_args(), 2));
}

public function zscan($key, &$iterator, $match = null, $count = 0): array|false
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zscan($key, $iterator, $match, $count, ...\array_slice(\func_get_args(), 4));
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->zscan($key, $iterator, ...\array_slice(\func_get_args(), 2));
}

public function keys($pattern): \Relay\Relay|array|false
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Cache/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"psr/log": "^1.1|^2|^3",
"symfony/cache-contracts": "^2.5|^3",
"symfony/service-contracts": "^2.5|^3",
"symfony/var-exporter": "^6.2.10"
"symfony/var-exporter": "^6.3.6"
},
"require-dev": {
"cache/integration-tests": "dev-master",
Expand Down
12 changes: 8 additions & 4 deletions src/Symfony/Component/VarExporter/ProxyHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);

public static function exportSignature(\ReflectionFunctionAbstract $function, bool $withParameterTypes = true, string &$args = null): string
{
$hasByRef = false;
$byRefIndex = 0;
$args = '';
$param = null;
$parameters = [];
Expand All @@ -225,16 +225,20 @@ public static function exportSignature(\ReflectionFunctionAbstract $function, bo
.($param->isPassedByReference() ? '&' : '')
.($param->isVariadic() ? '...' : '').'$'.$param->name
.($param->isOptional() && !$param->isVariadic() ? ' = '.self::exportDefault($param) : '');
$hasByRef = $hasByRef || $param->isPassedByReference();
if ($param->isPassedByReference()) {
$byRefIndex = 1 + $param->getPosition();
}
$args .= ($param->isVariadic() ? '...$' : '$').$param->name.', ';
}

if (!$param || !$hasByRef) {
if (!$param || !$byRefIndex) {
$args = '...\func_get_args()';
} elseif ($param->isVariadic()) {
$args = substr($args, 0, -2);
} else {
$args .= sprintf('...\array_slice(\func_get_args(), %d)', \count($parameters));
$args = explode(', ', $args, 1 + $byRefIndex);
$args[$byRefIndex] = sprintf('...\array_slice(\func_get_args(), %d)', $byRefIndex);
$args = implode(', ', $args);
}

$signature = 'function '.($function->returnsReference() ? '&' : '')
Expand Down
0