Skip to content

Commit 53e43ef

Browse files
Merge branch '5.4' into 6.2
* 5.4: [FrameworkBundle] Improve error message in MicroKernelTrait when using deprecated configureRoutes(RouteCollectionBuilder) with symfony/routing >= 6.0 Add warning about Symfony 5.2 changing pcntl_async_signals [Tests] Fix static calls and Mock var annotation [FrameworkBundle] Fix checkboxes check assertions [Notifier][WebProfilerBundle] Ignore messages whose `getNotification` returns `null` [HttpClient] Fix over-encoding of URL parts to match browser's behavior Fix Psalm job [HttpClient] Fix data collector [Tests] Migrate tests to static data providers [Semaphore] Fix test Fix: Split and clean up tests Remove unused data provider add Sender to the list of bypassed headers
2 parents b43903f + 23069c3 commit 53e43ef

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

Tests/PathTest.php

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -439,25 +439,6 @@ public function testGetRoot(string $path, string $root)
439439
$this->assertSame($root, Path::getRoot($path));
440440
}
441441

442-
public function providePathTests(): \Generator
443-
{
444-
// relative to absolute path
445-
yield ['css/style.css', '/webmozart/symfony', '/webmozart/symfony/css/style.css'];
446-
yield ['../css/style.css', '/webmozart/symfony', '/webmozart/css/style.css'];
447-
yield ['../../css/style.css', '/webmozart/symfony', '/css/style.css'];
448-
449-
// relative to root
450-
yield ['css/style.css', '/', '/css/style.css'];
451-
yield ['css/style.css', 'C:', 'C:/css/style.css'];
452-
yield ['css/style.css', 'C:/', 'C:/css/style.css'];
453-
454-
// same sub directories in different base directories
455-
yield ['../../symfony/css/style.css', '/webmozart/css', '/symfony/css/style.css'];
456-
457-
yield ['', '/webmozart/symfony', '/webmozart/symfony'];
458-
yield ['..', '/webmozart/symfony', '/webmozart'];
459-
}
460-
461442
private static function getPathTests(): \Generator
462443
{
463444
yield from [
@@ -481,7 +462,7 @@ private static function getPathTests(): \Generator
481462

482463
public function provideMakeAbsoluteTests(): \Generator
483464
{
484-
yield from static::getPathTests();
465+
yield from self::getPathTests();
485466

486467
// collapse dots
487468
yield ['css/./style.css', '/webmozart/symfony', '/webmozart/symfony/css/style.css'];
@@ -608,7 +589,7 @@ public function testMakeAbsoluteDoesNotFailIfDifferentRoot(string $basePath, str
608589

609590
public function provideMakeRelativeTests(): \Generator
610591
{
611-
foreach (static::getPathTests() as $set) {
592+
foreach (self::getPathTests() as $set) {
612593
yield [$set[2], $set[1], $set[0]];
613594
}
614595

0 commit comments

Comments
 (0)