Permalink
Browse files

Fixed as per GH feedback

  • Loading branch information...
1 parent d441e5b commit 9984b3b929a5870cabf8dc350f950058dfc9180b @dlsniper committed Feb 28, 2013
Showing with 9 additions and 12 deletions.
  1. +9 −12 DependencyInjection/SensioFrameworkExtraExtension.php
@@ -36,7 +36,6 @@ public function load(array $configs, ContainerBuilder $container)
if ($config['router']['annotations']) {
$annotationsToLoad[] = 'routing.xml';
-
$this->addClassesToCompile(array(
'Sensio\\Bundle\\FrameworkExtraBundle\\EventListener\\ControllerListener',
));
@@ -71,20 +70,18 @@ public function load(array $configs, ContainerBuilder $container)
));
}
- if (empty($annotationsToLoad)) {
- return ;
- }
+ if ($annotationsToLoad) {
+ // must be first
+ $loader->load('annotations.xml');
- // must be first
- $loader->load('annotations.xml');
+ foreach ($annotationsToLoad as $config) {
+ $loader->load($config);
+ }
- foreach ($annotationsToLoad as $config) {
- $loader->load($config);
+ $this->addClassesToCompile(array(
+ 'Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ConfigurationAnnotation',
+ ));
}
-
- $this->addClassesToCompile(array(
- 'Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\ConfigurationAnnotation',
- ));
}
/**

0 comments on commit 9984b3b

Please sign in to comment.