Skip to content

Commit b341fbe

Browse files
Revert "Merge pull request #721"
This reverts commit ed25f50, reversing changes made to 9880918.
1 parent 937bca6 commit b341fbe

File tree

6 files changed

+4
-93
lines changed

6 files changed

+4
-93
lines changed

symfony/framework-bundle/5.1/config/routes.php

Lines changed: 0 additions & 12 deletions
This file was deleted.

symfony/framework-bundle/5.1/config/services.php

Lines changed: 0 additions & 59 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../4.2/config/services.yaml

symfony/framework-bundle/5.1/src/Kernel.php

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,14 @@ protected function configureContainer(ContainerConfigurator $container): void
1515
{
1616
$container->import('../config/{packages}/*.yaml');
1717
$container->import('../config/{packages}/'.$this->environment.'/*.yaml');
18-
19-
if (file_exists(\dirname(__DIR__).'/config/services.yaml')) {
20-
$container->import('../config/{services}.yaml');
21-
$container->import('../config/{services}_'.$this->environment.'.yaml');
22-
} else {
23-
$path = \dirname(__DIR__).'/config/services.php';
24-
(require $path)($container->withPath($path), $this);
25-
}
18+
$container->import('../config/{services}.yaml');
19+
$container->import('../config/{services}_'.$this->environment.'.yaml');
2620
}
2721

2822
protected function configureRoutes(RoutingConfigurator $routes): void
2923
{
3024
$routes->import('../config/{routes}/'.$this->environment.'/*.yaml');
3125
$routes->import('../config/{routes}/*.yaml');
32-
33-
if (file_exists(\dirname(__DIR__).'/config/routes.yaml')) {
34-
$routes->import('../config/{routes}.yaml');
35-
} else {
36-
$path = \dirname(__DIR__).'/config/routes.php';
37-
(require $path)($routes->withPath($path), $this);
38-
}
26+
$routes->import('../config/{routes}.yaml');
3927
}
4028
}

symfony/routing/5.1/config/packages

Lines changed: 0 additions & 1 deletion
This file was deleted.

symfony/routing/5.1/manifest.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)