Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 90d9262

Browse filesBrowse files
Merge branch '5.4' into 6.3
* 5.4: Make tests green again
2 parents a804e9a + c557647 commit 90d9262
Copy full SHA for 90d9262

File tree

Expand file treeCollapse file tree

2 files changed

+9
-0
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+9
-0
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/Traits/RelayProxy.php
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,11 @@ public function bitcount($key, $start = 0, $end = -1, $by_bit = false): \Relay\R
457457
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bitcount(...\func_get_args());
458458
}
459459

460+
public function bitfield($key, ...$args): \Relay\Relay|array|false
461+
{
462+
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->bitfield(...\func_get_args());
463+
}
464+
460465
public function config($operation, $key = null, $value = null): \Relay\Relay|array|bool
461466
{
462467
return ($this->lazyObjectState->realInstance ??= ($this->lazyObjectState->initializer)())->config(...\func_get_args());

‎src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,10 @@ public function testDumpArrayWithColor($value, $flags, $expectedOut)
460460

461461
public function testCollapse()
462462
{
463+
if ('\\' === \DIRECTORY_SEPARATOR) {
464+
$this->markTestSkipped('This test cannot be run on Windows.');
465+
}
466+
463467
$stub = new Stub();
464468
$stub->type = Stub::TYPE_OBJECT;
465469
$stub->class = 'stdClass';

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.