Skip to content

[FrameworkBundle] fix routing config type information #62421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
Nov 20, 2025
+9 −9
Merged

[FrameworkBundle] fix routing config type information #62421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...ymfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/PhpConfigReferenceDumpPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,24 @@ class PhpConfigReferenceDumpPass implements CompilerPassInterface
namespace Symfony\Component\DependencyInjection\Loader\Configurator;

{APP_TYPES}
final class App extends AppReference
final class App
{
{APP_PARAM}
public static function config(array $config): array
{
return parent::config($config);
return AppReference::config($config);
}
}

namespace Symfony\Component\Routing\Loader\Configurator;

{ROUTES_TYPES}
final class Routes extends RoutesReference
final class Routes
Copy link
Member

@nicolas-grekas nicolas-grekas Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest removing the extends for AppReference also

Copy link
Member Author

@xabbuh xabbuh Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

{
{ROUTES_PARAM}
public static function config(array $config): array
{
return parent::config($config);
return $config;
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...dle/FrameworkBundle/Tests/DependencyInjection/Compiler/PhpConfigReferenceDumpPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function testProcessWithConfigDir()

$content = file_get_contents($referenceFile);
$this->assertStringContainsString('namespace Symfony\Component\DependencyInjection\Loader\Configurator;', $content);
$this->assertStringContainsString('final class App extends AppReference', $content);
$this->assertStringContainsString('final class App', $content);
$this->assertStringContainsString('public static function config(array $config): array', $content);
$this->assertEquals([new FileResource(realpath($this->tempDir).'/reference.php')], $container->getResources());
}
Expand Down
8 changes: 4 additions & 4 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/reference.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
* }>
* }
*/
final class App extends AppReference
final class App
{
/**
* @param ConfigType $config
Expand All @@ -170,7 +170,7 @@ final class App extends AppReference
*/
public static function config(array $config): array
{
return parent::config($config);
return AppReference::config($config);
}
}

Expand Down Expand Up @@ -238,7 +238,7 @@ public static function config(array $config): array
* ...<string, RouteConfig|ImportConfig|AliasConfig>
* }
*/
final class Routes extends RoutesReference
final class Routes
{
/**
* @param RoutesConfig $config
Expand All @@ -247,6 +247,6 @@ final class Routes extends RoutesReference
*/
public static function config(array $config): array
{
return parent::config($config);
return $config;
}
}