浏览代码

[DoctrineBundle] Fixed invalid regex in DoctrineCommand

fivestar 14 年之前
父节点
当前提交
7ca046bfb5
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      src/Symfony/Bundle/DoctrineBundle/Command/DoctrineCommand.php

+ 4 - 3
src/Symfony/Bundle/DoctrineBundle/Command/DoctrineCommand.php

@@ -106,7 +106,7 @@ abstract class DoctrineCommand extends Command
         $connections = array();
         $ids = $this->container->getServiceIds();
         foreach ($ids as $id) {
-            preg_match('/doctrine.dbal.(.*)_connection/', $id, $matches);
+            preg_match('^doctrine\.dbal\.(.*)_connection$', $id, $matches);
             if ($matches) {
                 $name = $matches[1];
                 $connections[$name] = $this->container->get($id);
@@ -121,12 +121,13 @@ abstract class DoctrineCommand extends Command
         $entityManagers = array();
         $ids = $this->container->getServiceIds();
         foreach ($ids as $id) {
-            preg_match('/doctrine.orm.(.*)_entity_manager/', $id, $matches);
+            preg_match('/^doctrine\.orm\.(.*)_entity_manager$/', $id, $matches);
             if ($matches) {
                 $name = $matches[1];
                 $entityManagers[$name] = $this->container->get($id);
             }
         }
+
         return $entityManagers;
     }
 
@@ -152,4 +153,4 @@ abstract class DoctrineCommand extends Command
 
         return $bundleMetadatas;
     }
-}
+}