Merge remote branch 'pkruithof/master'

* pkruithof/master:
  Global mapping file is not seen as class name anymore
  Global mapping file is not seen as class name anymore

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;
                     }
 

src/Symfony/Bundle/DoctrineBundle/Mapping/Driver/YamlDriver.php

@@ -50,7 +50,15 @@ class YamlDriver extends BaseYamlDriver
                 );
 
                 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;
                     }