Fixed an issue with the definition description Mongo DB collections.

devel · devel · commit 4e7ba6d5da15 · 2010-12-26T21:57:32.000+03:00
Committer: VlastV &lt;me@vlastv.ru&gt;
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php
@@ -397,9 +397,9 @@ static protected function detectMetadataDriver($dir, ContainerBuilder $container
         }
         $container->addResource(new FileResource($resource));
 
-        if (count(glob($dir.'/Resources/config/doctrine/metadata/mongodb/*.xml'))) {
+        if (($files = glob($dir.'/Resources/config/doctrine/metadata/mongodb/*.xml')) && count($files)) {
             return 'xml';
-        } elseif (count(glob($dir.'/Resources/config/doctrine/metadata/mongodb/*.yml'))) {
+        } elseif (($files = glob($dir.'/Resources/config/doctrine/metadata/mongodb/*.yml')) && count($files)) {
             return 'yml';
         }
 

Original file line number	Diff line number	Diff line change
`@@ -397,9 +397,9 @@ static protected function detectMetadataDriver($dir, ContainerBuilder $container`
`397`	`397`	`}`
`398`	`398`	`$container->addResource(new FileResource($resource));`
`399`	`399`
`400`		`- if (count(glob($dir.'/Resources/config/doctrine/metadata/mongodb/*.xml'))) {`
	`400`	`+ if (($files = glob($dir.'/Resources/config/doctrine/metadata/mongodb/*.xml')) && count($files)) {`
`401`	`401`	`return 'xml';`
`402`		`- } elseif (count(glob($dir.'/Resources/config/doctrine/metadata/mongodb/*.yml'))) {`
	`402`	`+ } elseif (($files = glob($dir.'/Resources/config/doctrine/metadata/mongodb/*.yml')) && count($files)) {`
`403`	`403`	`return 'yml';`
`404`	`404`	`}`
`405`	`405`