From bfdd16ea57814eead527c4c7040a0f6f8e85e060 Mon Sep 17 00:00:00 2001 From: Bram Leeda Date: Wed, 20 Sep 2023 12:57:53 +0200 Subject: [PATCH] [Routing] Fix routing collection defaults when adding a new route to a collection --- .../Configurator/CollectionConfigurator.php | 8 ++++++ .../Tests/Fixtures/collection-defaults.php | 21 ++++++++++++++++ .../Tests/Loader/PhpFileLoaderTest.php | 25 +++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 src/Symfony/Component/Routing/Tests/Fixtures/collection-defaults.php diff --git a/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php index b8a0861f4ab40..bf41c27189874 100644 --- a/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php +++ b/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php @@ -114,4 +114,12 @@ final public function host(string|array $host): static return $this; } + + /** + * This method overrides the one from LocalizedRouteTrait. + */ + private function createRoute(string $path): Route + { + return (clone $this->route)->setPath($path); + } } diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/collection-defaults.php b/src/Symfony/Component/Routing/Tests/Fixtures/collection-defaults.php new file mode 100644 index 0000000000000..cbb8e7386b086 --- /dev/null +++ b/src/Symfony/Component/Routing/Tests/Fixtures/collection-defaults.php @@ -0,0 +1,21 @@ +collection(); + $collection + ->methods(['GET']) + ->defaults(['attribute' => true]) + ->stateless(); + + $collection->add('defaultsA', '/defaultsA') + ->locale('en') + ->format('html'); + + $collection->add('defaultsB', '/defaultsB') + ->methods(['POST']) + ->stateless(false) + ->locale('en') + ->format('html'); +}; diff --git a/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php index 6a0d04479bee2..d334a80defb1e 100644 --- a/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php +++ b/src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php @@ -103,6 +103,31 @@ public function testLoadingRouteWithDefaults() $this->assertSame('html', $defaultsRoute->getDefault('_format')); } + public function testLoadingRouteWithCollectionDefaults() + { + $loader = new PhpFileLoader(new FileLocator([__DIR__.'/../Fixtures'])); + $routes = $loader->load('collection-defaults.php'); + + $this->assertCount(2, $routes); + + $defaultsRoute = $routes->get('defaultsA'); + $this->assertSame(['GET'], $defaultsRoute->getMethods()); + $this->assertArrayHasKey('attribute', $defaultsRoute->getDefaults()); + $this->assertTrue($defaultsRoute->getDefault('_stateless')); + $this->assertSame('/defaultsA', $defaultsRoute->getPath()); + $this->assertSame('en', $defaultsRoute->getDefault('_locale')); + $this->assertSame('html', $defaultsRoute->getDefault('_format')); + + // The second route has a specific method and is not stateless, overwriting the collection settings + $defaultsRoute = $routes->get('defaultsB'); + $this->assertSame(['POST'], $defaultsRoute->getMethods()); + $this->assertArrayHasKey('attribute', $defaultsRoute->getDefaults()); + $this->assertFalse($defaultsRoute->getDefault('_stateless')); + $this->assertSame('/defaultsB', $defaultsRoute->getPath()); + $this->assertSame('en', $defaultsRoute->getDefault('_locale')); + $this->assertSame('html', $defaultsRoute->getDefault('_format')); + } + public function testLoadingImportedRoutesWithDefaults() { $loader = new PhpFileLoader(new FileLocator([__DIR__.'/../Fixtures'])); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy