Fix locating files for classes without namespace

schmittjoh · Apr 5, 2012 · 64ce1d4 · 64ce1d4
1 parent 7d97f17
commit 64ce1d4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/src/Metadata/Driver/FileLocator.php b/src/Metadata/Driver/FileLocator.php
@@ -10,7 +10,7 @@ public function __construct(array $dirs)
  {
  $this->dirs = $dirs;
  }
- 
+
  public function getDirs()
  {
  return $this->dirs;
@@ -19,11 +19,12 @@ public function getDirs()
  public function findFileForClass(\ReflectionClass $class, $extension)
  {
  foreach ($this->dirs as $prefix => $dir) {
- if (0 !== strpos($class->getNamespaceName(), $prefix)) {
+ if ('' !== $prefix && 0 !== strpos($class->getNamespaceName(), $prefix)) {
  continue;
  }
 
- $path = $dir.'/'.str_replace('\\', '.', substr($class->getName(), strlen($prefix)+1)).'.'.$extension;
+ $len = '' === $prefix ? 0 : strlen($prefix) + 1;
+ $path = $dir.'/'.str_replace('\\', '.', substr($class->getName(), $len)).'.'.$extension;
  if (file_exists($path)) {
  return $path;
  }

diff --git a/tests/Metadata/Tests/Driver/FileLocatorTest.php b/tests/Metadata/Tests/Driver/FileLocatorTest.php
@@ -23,4 +23,15 @@ public function testFindFileForClass()
  $ref = new \ReflectionClass('Metadata\Tests\Driver\Fixture\C\SubDir\C');
  $this->assertEquals(realpath(__DIR__.'/Fixture/C/SubDir.C.yml'), realpath($locator->findFileForClass($ref, 'yml')));
  }
+
+ public function testFindFileForGlobalNamespacedClass()
+ {
+ $locator = new FileLocator(array(
+ '' => __DIR__.'/Fixture/D',
+ ));
+
+ require_once __DIR__.'/Fixture/D/D.php';
+ $ref = new \ReflectionClass('D');
+ $this->assertEquals(realpath(__DIR__.'/Fixture/D/D.yml'), realpath($locator->findFileForClass($ref, 'yml')));
+ }
 }
diff --git a/tests/Metadata/Tests/Driver/Fixture/D/D.php b/tests/Metadata/Tests/Driver/Fixture/D/D.php
@@ -0,0 +1,3 @@
+<?php
+
+class D { }
diff --git a/tests/Metadata/Tests/Driver/Fixture/D/D.yml b/tests/Metadata/Tests/Driver/Fixture/D/D.yml