diff --git a/DependencyInjection/ChillReportExtension.php b/DependencyInjection/ChillReportExtension.php index e0b7406f1..1f5d408cf 100644 --- a/DependencyInjection/ChillReportExtension.php +++ b/DependencyInjection/ChillReportExtension.php @@ -30,6 +30,8 @@ class ChillReportExtension extends Extension implements PrependExtensionInterfac /** * Declare the entity Report, as a customizable entity (can add custom fields) + * + * @param ContainerBuilder $container */ public function declareReportAsCustomizable(ContainerBuilder $container) { @@ -46,9 +48,31 @@ class ChillReportExtension extends Extension implements PrependExtensionInterfac ) ); } + + /** + * declare routes from report bundle + * + * @param ContainerBuilder $container + */ + private function declareRouting(ContainerBuilder $container) + { + $container->prependExtensionConfig('chill_main', array( + 'routing' => array( + 'resources' => array( + '@ChillReportBundle/Resources/config/routing.yml' + ) + ) + )); + } + /** + * {@inheritdoc} + * + * @param ContainerBuilder $container + */ public function prepend(ContainerBuilder $container) { $this->declareReportAsCustomizable($container); + $this->declareRouting($container); } } diff --git a/Resources/config/services.yml b/Resources/config/services.yml index f5223961a..4c06c3b79 100644 --- a/Resources/config/services.yml +++ b/Resources/config/services.yml @@ -3,10 +3,6 @@ services: # class: Chill\ReportBundle\Example # arguments: [@service_id, "plain_value", %parameter%] services: - chill.report.routing_loader: - class: Chill\ReportBundle\Routing\RoutesLoader - tags: - - { name: routing.loader } chill.report.search: class: Chill\ReportBundle\Search\ReportSearch diff --git a/Routing/RoutesLoader.php b/Routing/RoutesLoader.php deleted file mode 100644 index ce234aa16..000000000 --- a/Routing/RoutesLoader.php +++ /dev/null @@ -1,51 +0,0 @@ - - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -namespace Chill\ReportBundle\Routing; - -use Symfony\Component\Config\Loader\Loader; -use Symfony\Component\Routing\RouteCollection; - -/** - * Load routes automatically - * - * @author Champs-Libres - */ -class RoutesLoader extends Loader -{ - public function load($resource, $type = null) - { - $collection = new RouteCollection(); - - $resource = '@ChillReportBundle/Resources/config/routing.yml'; - $type = 'yaml'; - - $importedRoutes = $this->import($resource, $type); - - $collection->addCollection($importedRoutes); - - return $collection; - } - - public function supports($resource, $type = null) - { - return 'chill_routes_report' === $type; - } -}