소스 검색

fixed PHP warnings

Fabien Potencier 14 년 전
부모
커밋
d1bdd88ac2

+ 2 - 1
src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php

@@ -61,7 +61,8 @@ class DoctrineExtension extends AbstractDoctrineExtension
         $loader->load('dbal.xml');
 
         if (empty ($config['default_connection'])) {
-            $config['default_connection'] = reset(array_keys($config['connections']));
+            $keys = array_keys($config['connections']);
+            $config['default_connection'] = reset($keys);
         }
 
         $container->setAlias('database_connection', sprintf('doctrine.dbal.%s_connection', $config['default_connection']));

+ 5 - 2
src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php

@@ -50,10 +50,13 @@ class DoctrineMongoDBExtension extends AbstractDoctrineExtension
         }
 
         if (empty ($config['default_connection'])) {
-            $config['default_connection'] = reset(array_keys($config['connections']));
+            $keys = array_keys($config['connections']);
+            $config['default_connection'] = reset($keys);
         }
+
         if (empty ($config['default_document_manager'])) {
-            $config['default_document_manager'] = reset(array_keys($config['document_managers']));
+            $keys = array_keys($config['document_managers']);
+            $config['default_document_manager'] = reset($keys);
         }
 
         // set some options as parameters and unset them