Support for namespace keyword in resolver.

eloquent · Feb 22, 2014 · 7b686c8 · 7b686c8
1 parent c6a1826
commit 7b686c8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/src/ClassName/ClassNameReference.php b/src/ClassName/ClassNameReference.php
@@ -35,6 +35,11 @@ class ClassNameReference extends RelativePath implements
      */
     const CLASS_NAME_PATTERN = '/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/';
 
+    /**
+     * The atom used to represent the current namespace.
+     */
+    const NAMESPACE_ATOM = 'namespace';
+
     /**
      * Construct a new class name reference.
      *

diff --git a/src/Resolution/ClassNameResolver.php b/src/Resolution/ClassNameResolver.php
@@ -12,6 +12,7 @@
 namespace Eloquent\Cosmos\Resolution;
 
 use Eloquent\Cosmos\ClassName\ClassNameInterface;
+use Eloquent\Cosmos\ClassName\ClassNameReference;
 use Eloquent\Cosmos\ClassName\QualifiedClassNameInterface;
 use Eloquent\Pathogen\AbsolutePathInterface;
 use Eloquent\Pathogen\PathInterface;
@@ -101,7 +102,13 @@ public function resolveAgainstContext(
         }
 
         if ($firstAtom = $className->firstAtomShortName()) {
-            if ($parent = $context->classNameByShortName($firstAtom)) {
+            if (ClassNameReference::NAMESPACE_ATOM === $firstAtom->atomAt(0)) {
+                $parent = $context->primaryNamespace();
+            } else {
+                $parent = $context->classNameByShortName($firstAtom);
+            }
+
+            if ($parent) {
                 if (count($className->atoms()) < 2) {
                     return $parent;
                 }

diff --git a/test/suite/Resolution/ClassNameResolverTest.php b/test/suite/Resolution/ClassNameResolverTest.php
@@ -103,6 +103,11 @@ public function testResolveAgainstContextDocumentationExamples()
             )
         );
 
+        $this->assertSame(
+            '\foo\Another',
+            $this->resolver->resolveAgainstContext($this->context, $this->classNameFactory->create('namespace\Another'))
+                ->string()
+        );
         $this->assertSame(
             '\My\Full\Classname',
             $this->resolver->resolveAgainstContext($this->context, $this->classNameFactory->create('Another'))->string()