merged branch rybakit/is_bundle2.1 (PR symfony#7640)

fabpot · fabpot · commit fef7990c7c54 · 2013-04-18T07:13:02.000+02:00
This PR was submitted for the 2.1 branch but it was merged into the master branch instead (closes symfony#7640). Discussion ---------- Set default value for "is_bundle" option to true for "auto_mapping" mode Commits ------- c4a6467 Set default value for "is_bundle" option to true for "auto_mapping" mode
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -51,7 +51,10 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
             // automatically register bundle mappings
             foreach (array_keys($container->getParameter('kernel.bundles')) as $bundle) {
                 if (!isset($objectManager['mappings'][$bundle])) {
-                    $objectManager['mappings'][$bundle] = null;
+                    $objectManager['mappings'][$bundle] = array(
+                        'mapping'   => true,
+                        'is_bundle' => true,
+                    );
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,10 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder`
`51`	`51`	`// automatically register bundle mappings`
`52`	`52`	`foreach (array_keys($container->getParameter('kernel.bundles')) as $bundle) {`
`53`	`53`	`if (!isset($objectManager['mappings'][$bundle])) {`
`54`		`- $objectManager['mappings'][$bundle] = null;`
	`54`	`+ $objectManager['mappings'][$bundle] = array(`
	`55`	`+ 'mapping' => true,`
	`56`	`+ 'is_bundle' => true,`
	`57`	`+ );`
`55`	`58`	`}`
`56`	`59`	`}`
`57`	`60`	`}`