8000 feature #36562 Revert "feature #30501 [FrameworkBundle][Routing] adde… · Koc/symfony@c6cf433 · GitHub
[go: up one dir, main page]
Skip to content

Commit c6cf433

Browse files
fabpotfabpot
committed
feature symfony#36562 Revert "feature symfony#30501 [FrameworkBundle][Routing] added Configurators to handle template and redirect controllers (HeahDude)" (nicolas-grekas)
This PR was merged into the 5.1-dev branch. Discussion ---------- Revert "feature symfony#30501 [FrameworkBundle][Routing] added Configurators to handle template and redirect controllers (HeahDude)" | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - This reverts commit 477ee19, reversing changes made to 9bfa258. The reverted PR is symfony#30501. Actually, it's a partial revert: changes made to the `Routing` component are not reverted. The reason for this revert is that a discussion is still on-going in symfony#35653 (which provides the same configuration extensions to yaml+xml), and we won't be able to resolve them in time for 5.1. Better postpone for 5.2. @HeahDude I invite you to open a PR after this one, reverting this very PR, which we'll consider again but for 5.2 if you don't mind. Commits ------- e4e8945 Revert "feature symfony#30501 [FrameworkBundle][Routing] added Configurators to handle template and redirect controllers (HeahDude)"
2 parents 69452b2 + e4e8945 commit c6cf433

File tree

16 files changed

+13
-587
lines changed

16 files changed

+13
-587
lines changed

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ CHANGELOG
66

77
* Added link to source for controllers registered as named services
88
* Added link to source on controller on `router:match`/`debug:router` (when `framework.ide` is configured)
9-
* Added `Routing\Loader` and `Routing\Loader\Configurator` namespaces to ease defining routes with default controllers
109
* Added the `framework.router.context` configuration node to configure the `RequestContext`
1110
* Made `MicroKernelTrait::configureContainer()` compatible with `ContainerConfigurator`
1211
* Added a new `mailer.message_bus` option to configure or disable the message bus to use to send mails.

‎src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Kernel;
1313

14-
use Symfony\Bundle\FrameworkBundle\Routing\Loader\Configurator\RoutingConfigurator;
15-
use Symfony\Bundle\FrameworkBundle\Routing\Loader\PhpFileLoader as RoutingPhpFileLoader;
1614
use Symfony\Component\Config\Loader\LoaderInterface;
1715
use Symfony\Component\DependencyInjection\ContainerBuilder;
1816
use Symfony\Component\DependencyInjection\Loader\Configurator\AbstractConfigurator;
1917
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
2018
use Symfony\Component\DependencyInjection\Loader\PhpFileLoader as ContainerPhpFileLoader;
2119
use Symfony\Component\DependencyInjection\Reference;
20+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
21+
use Symfony\Component\Routing\Loader\PhpFileLoader as RoutingPhpFileLoader;
2222
use Symfony\Component\Routing\RouteCollection;
2323
use Symfony\Component\Routing\RouteCollectionBuilder;
2424

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<argument type="service" id="file_locator" />
2626
</service>
2727

28-
<service id="routing.loader.php" class="Symfony\Bundle\FrameworkBundle\Routing\Loader\PhpFileLoader">
28+
<service id="routing.loader.php" class="Symfony\Component\Routing\Loader\PhpFileLoader">
2929
<tag name="routing.loader" />
3030
<argument type="service" id="file_locator" />
3131
</service>

‎src/Symfony/Bundle/FrameworkBundle/Routing/Loader/Configurator/GoneRouteConfigurator.php

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

‎src/Symfony/Bundle/FrameworkBundle/Routing/Loader/Configurator/RedirectRouteConfigurator.php

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

‎src/Symfony/Bundle/FrameworkBundle/Routing/Loader/Configurator/RouteConfigurator.php

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

‎src/Symfony/Bundle/FrameworkBundle/Routing/Loader/Configurator/RoutingConfigurator.php

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

‎src/Symfony/Bundle/FrameworkBundle/Routing/Loader/Configurator/TemplateRouteConfigurator.php

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

‎src/Symfony/Bundle/FrameworkBundle/Routing/Loader/Configurator/Traits/AddTrait.php

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

‎src/Symfony/Bundle/FrameworkBundle/Routing/Loader/Configurator/UrlRedirectRouteConfigurator.php

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

0 commit comments

Comments
 (0)
0