Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit e79977a60ab0 · 2017-08-06T15:42:33.000+02:00
* 3.3: [Profiler] Fix request_collector check in main layout Github template: Remove EOM 3.2 from branch suggestion [Security] Fix security.interactive_login event const doc block Update Container.php: Deprecated -> @deprecated allow phpdocumentor/reflection-docblock >=3.2.1 Avoid infinite loops when profiler data is malformed [FrameworkBundle] Warmup annotations for bundle-less controllers and entities [HttpFoundation] Generate safe fallback filename for wrongly encoded filename
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -259,8 +259,8 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         $this->addAnnotatedClassesToCompile(array(
-            '**Bundle\\Controller\\',
-            '**Bundle\\Entity\\',
+            '**\\Controller\\',
+            '**\\Entity\\',
 
             // Added explicitly so that we don't rely on the class map being dumped to make it work
             'Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller',

Original file line number	Diff line number	Diff line change
`@@ -259,8 +259,8 @@ public function load(array $configs, ContainerBuilder $container)`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`$this->addAnnotatedClassesToCompile(array(`
`262`		`- '**Bundle\\Controller\\',`
`263`		`- '**Bundle\\Entity\\',`
	`262`	`+ '**\\Controller\\',`
	`263`	`+ '**\\Entity\\',`
`264`	`264`
`265`	`265`	`// Added explicitly so that we don't rely on the class map being dumped to make it work`
`266`	`266`	`'Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller',`