Skip to content

Commit 8094b8e

Browse files
Fix aggregate PHP routing imports (#3101)
1 parent 685bdc1 commit 8094b8e

2 files changed

Lines changed: 29 additions & 4 deletions

File tree

src/Resources/config/routing/all.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
return static function (RoutingConfigurator $routes): void {
1515
$routes->import('@FOSUserBundle/Resources/config/routing/security.php');
1616

17-
$routes->import('@FOSUserBundle/Resources/config/profile.php')
17+
$routes->import('@FOSUserBundle/Resources/config/routing/profile.php')
1818
->prefix('/profile');
1919

20-
$routes->import('@FOSUserBundle/Resources/config/registration.php')
20+
$routes->import('@FOSUserBundle/Resources/config/routing/registration.php')
2121
->prefix('/register');
2222

23-
$routes->import('@FOSUserBundle/Resources/config/resetting.php')
23+
$routes->import('@FOSUserBundle/Resources/config/routing/resetting.php')
2424
->prefix('/resetting');
2525

26-
$routes->import('@FOSUserBundle/Resources/config/change_password.php')
26+
$routes->import('@FOSUserBundle/Resources/config/routing/change_password.php')
2727
->prefix('/profile');
2828
};

tests/Routing/RoutingTest.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,37 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Config\FileLocator;
16+
use Symfony\Component\HttpKernel\Config\FileLocator as KernelFileLocator;
17+
use Symfony\Component\HttpKernel\KernelInterface;
1618
use Symfony\Component\Routing\Loader\PhpFileLoader;
1719
use Symfony\Component\Routing\Loader\XmlFileLoader;
1820
use Symfony\Component\Routing\RouteCollection;
1921

2022
class RoutingTest extends TestCase
2123
{
24+
private const BUNDLE_PREFIX = '@FOSUserBundle/';
25+
private const SOURCE_DIR = __DIR__.'/../../src';
26+
27+
public function testLoadAllRouting(): void
28+
{
29+
$kernel = $this->createMock(KernelInterface::class);
30+
$kernel->method('locateResource')->willReturnCallback(static function (string $resource): string {
31+
self::assertStringStartsWith(self::BUNDLE_PREFIX, $resource);
32+
33+
return self::SOURCE_DIR.'/'.substr($resource, \strlen(self::BUNDLE_PREFIX));
34+
});
35+
36+
$loader = new PhpFileLoader(new KernelFileLocator($kernel));
37+
$collection = $loader->load(self::SOURCE_DIR.'/Resources/config/routing/all.php');
38+
39+
$expectedRouteNames = array_column(self::loadRoutingProvider(), 0);
40+
$actualRouteNames = array_keys($collection->all());
41+
sort($expectedRouteNames);
42+
sort($actualRouteNames);
43+
44+
self::assertSame($expectedRouteNames, $actualRouteNames);
45+
}
46+
2247
/**
2348
* @dataProvider loadRoutingProvider
2449
*

0 commit comments

Comments
 (0)