Skip to content
Open
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
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/SecurityBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"symfony/password-hasher": "^5.4|^6.0|^7.0",
"symfony/security-core": "^6.2|^7.0",
"symfony/security-csrf": "^5.4|^6.0|^7.0",
"symfony/security-http": "^6.3|^7.0"
"symfony/security-http": "^6.3.4|^7.0"
},
"require-dev": {
"symfony/asset": "^5.4|^6.0|^7.0",
Expand Down
5 changes: 5 additions & 0 deletions src/Symfony/Component/Cache/Traits/RelayProxy.php
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,11 @@ public function bitcount($key, $start = 0, $end = -1, $by_bit = false): \Relay\R
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bitcount(...\func_get_args());
}

public function bitfield($key, ...$args): \Relay\Relay|array|false
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bitfield(...\func_get_args());
}

public function config($operation, $key = null, $value = null): \Relay\Relay|array|bool
{
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->config(...\func_get_args());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,9 @@ protected function getSecret(): string
{
return 'MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g==';
}

protected function mustBeSkipped(): bool
{
return !extension_loaded('openssl');
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,9 @@ protected function getSecret(): string
{
return 'incorrect';
}

protected function mustBeSkipped(): bool
{
return !extension_loaded('openssl');
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,9 @@ protected function getSecret(): string
{
return 'MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE83T4O/n84iotIvIW4mdBgQ/7dAfSmpqIM8kF9mN1flpVKS3GRqe62gw+2fNNRaINXvVpiglSI8eNEc6wEA3F+g==';
}

protected function mustBeSkipped(): bool
{
return !extension_loaded('openssl');
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"require": {
"php": ">=8.1",
"doctrine/dbal": "^2.13|^3.0",
"doctrine/dbal": "^3.2",
"symfony/messenger": "^5.4|^6.0|^7.0",
"symfony/service-contracts": "^2.5|^3"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function testRunFailedProcess()
(new RunProcessMessageHandler())(new RunProcessMessage(['invalid']));
} catch (RunProcessFailedException $e) {
$this->assertSame(['invalid'], $e->context->command);
$this->assertSame(127, $e->context->exitCode);
$this->assertSame('\\' === \DIRECTORY_SEPARATOR ? 1 : 127, $e->context->exitCode);

return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ abstract class AbstractRequestParserTestCase extends TestCase
*/
public function testParse(string $payload, RemoteEvent $expected)
{
if ($this->mustBeSkipped()) {
$this->markTestSkipped('This test cannot be run.');
}

$request = $this->createRequest($payload);
$parser = $this->createRequestParser();
$wh = $parser->parse($request, $this->getSecret());
Expand Down Expand Up @@ -66,4 +70,9 @@ protected static function getFixtureExtension(): string
{
return 'json';
}

protected function mustBeSkipped(): bool
{
return false;
}
}