From 0ca6f7966e34379c6d45c76f5669aaaa2648f850 Mon Sep 17 00:00:00 2001 From: Peter Kruithof Date: Tue, 24 May 2011 05:14:38 -0700 Subject: [PATCH] Global mapping file is not seen as class name anymore --- .../Bundle/DoctrineBundle/Mapping/Driver/XmlDriver.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/DoctrineBundle/Mapping/Driver/XmlDriver.php b/src/Symfony/Bundle/DoctrineBundle/Mapping/Driver/XmlDriver.php index 29f418b296..e19c2048a2 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Mapping/Driver/XmlDriver.php +++ b/src/Symfony/Bundle/DoctrineBundle/Mapping/Driver/XmlDriver.php @@ -50,7 +50,15 @@ class XmlDriver extends BaseXmlDriver ); foreach ($iterator as $file) { - if (($fileName = $file->getBasename($this->_fileExtension)) == $file->getBasename()) { + + $fileName = $file->getBasename($this->_fileExtension); + + if ($fileName == $file->getBasename()) { + continue; + } + + // check if file is not global file + if ($fileName == $this->_globalFile) { continue; }