Skip to content

Commit 56ec28d

Browse files
Merge branch '6.0' into 6.1
* 6.0: [6.0] cs fixes [5.4] cs fixes [5.3] cs fixes [Cache] Fix saving items with no expiration through ProxyAdapter CS fixes fix merge Remove pointless assignment [HttpClient] Fix tracing requests made after calling withOptions() [Cache] disable lock on CLI Revert "feature #41989 [Cache] make `LockRegistry` use semaphores when possible (nicolas-grekas)" [HttpKernel] fix how configuring log-level and status-code by exception works [VarDumper] add more "transient-on-macos" groups
2 parents a0efb26 + ed7d6d2 commit 56ec28d

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

AbstractString.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,9 +425,6 @@ public function repeat(int $multiplier): static
425425

426426
abstract public function replace(string $from, string $to): static;
427427

428-
/**
429-
* @param string|callable $to
430-
*/
431428
abstract public function replaceMatches(string $fromRegexp, string|callable $to): static;
432429

433430
abstract public function reverse(): static;

Tests/AbstractUnicodeTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public function provideCreateFromCodePoint(): array
3737
['*', [42]],
3838
['AZ', [65, 90]],
3939
['', [8364]],
40-
['', [0x20ac]],
40+
['', [0x20AC]],
4141
['Ʃ', [425]],
42-
['Ʃ', [0x1a9]],
42+
['Ʃ', [0x1A9]],
4343
['☢☎❄', [0x2622, 0x260E, 0x2744]],
4444
];
4545
}

0 commit comments

Comments
 (0)