Updated to use latest Pathogen.

composer.json

@@ -13,10 +13,11 @@
     ],
     "require": {
         "php": ">=5.3",
-        "eloquent/pathogen": "~0.5.0",
+        "eloquent/pathogen": "dev-develop@dev",
         "icecave/isolator": "~2"
     },
     "require-dev": {
+        "eloquent/liberator": "~1",
         "icecave/archer": "~1"
     },
     "autoload": {

src/Eloquent/Cosmos/ClassName/ClassNameReference.php

@@ -12,7 +12,6 @@
 namespace Eloquent\Cosmos\ClassName;
 
 use Eloquent\Pathogen\Exception\InvalidPathAtomExceptionInterface;
-use Eloquent\Pathogen\Normalizer\PathNormalizerInterface;
 use Eloquent\Pathogen\RelativePath;
 
 /**
@@ -84,30 +83,22 @@ protected function validateAtom($atom)
     }
 
     /**
-     * Create a new class name instance.
+     * Get the class name factory.
      *
-     * @param mixed<string> $atoms                The class name atoms.
-     * @param boolean       $isQualified          True if the class name is fully qualified.
-     * @param boolean|null  $hasTrailingSeparator Ignored.
-     *
-     * @return ClassNameInterface                The newly created class name instance.
-     * @throws InvalidPathAtomExceptionInterface If any of the supplied atoms are invalid.
+     * @return Factory\ClassNameFactoryInterface The class name factory.
      */
-    protected function createPath(
-        $atoms,
-        $isQualified,
-        $hasTrailingSeparator = null
-    ) {
-        return new ClassNameReference($atoms);
+    protected static function factory()
+    {
+        return Factory\ClassNameFactory::instance();
     }
 
     /**
-     * Create a new default class name normalizer.
+     * Get the class name normalizer.
      *
-     * @return PathNormalizerInterface The newly created normalizer.
+     * @return Normalizer\ClassNameNormalizerInterface The class name normalizer.
      */
-    protected function createDefaultNormalizer()
+    protected static function normalizer()
     {
-        return new Normalizer\ClassNameNormalizer;
+        return Normalizer\ClassNameNormalizer::instance();
     }
 }

src/Eloquent/Cosmos/ClassName/Factory/ClassNameFactory.php

@@ -21,6 +21,20 @@
  */
 class ClassNameFactory implements ClassNameFactoryInterface
 {
+    /**
+     * Get a static instance of this class name factory.
+     *
+     * @return ClassNameFactoryInterface The static class name factory.
+     */
+    public static function instance()
+    {
+        if (null === static::$instance) {
+            static::$instance = new static;
+        }
+
+        return static::$instance;
+    }
+
     /**
      * Creates a new class name instance from its string representation.
      *
@@ -93,4 +107,6 @@ public function createFromAtoms(
 
         return new ClassNameReference($atoms);
     }
+
+    private static $instance;
 }

src/Eloquent/Cosmos/ClassName/Factory/Consumer/ClassNameFactoryTrait.php

@@ -51,7 +51,7 @@ public function classNameFactory()
      */
     protected function createDefaultClassNameFactory()
     {
-        return new ClassNameFactory;
+        return ClassNameFactory::instance();
     }
 
     private $classNameFactory;

src/Eloquent/Cosmos/ClassName/Normalizer/ClassNameNormalizer.php

@@ -21,6 +21,20 @@
 class ClassNameNormalizer extends PathNormalizer implements
     ClassNameNormalizerInterface
 {
+    /**
+     * Get a static instance of this class name normalizer.
+     *
+     * @return ClassNameNormalizerInterface The static class name normalizer.
+     */
+    public static function instance()
+    {
+        if (null === static::$instance) {
+            static::$instance = new static;
+        }
+
+        return static::$instance;
+    }
+
     /**
      * Construct a new class name normalizer.
      *
@@ -29,9 +43,11 @@ class ClassNameNormalizer extends PathNormalizer implements
     public function __construct(ClassNameFactoryInterface $factory = null)
     {
         if (null === $factory) {
-            $factory = new ClassNameFactory;
+            $factory = ClassNameFactory::instance();
         }
 
         parent::__construct($factory);
     }
+
+    private static $instance;
 }

src/Eloquent/Cosmos/ClassName/QualifiedClassName.php

@@ -12,8 +12,6 @@
 namespace Eloquent\Cosmos\ClassName;
 
 use Eloquent\Pathogen\AbsolutePath;
-use Eloquent\Pathogen\Exception\InvalidPathAtomExceptionInterface;
-use Eloquent\Pathogen\Normalizer\PathNormalizerInterface;
 
 /**
  * Represents a fully qualified class name.
@@ -79,34 +77,22 @@ protected function validateAtom($atom)
     }
 
     /**
-     * Create a new class name instance.
+     * Get the class name factory.
      *
-     * @param mixed<string> $atoms                The class name atoms.
-     * @param boolean       $isQualified          True if the class name is fully qualified.
-     * @param boolean|null  $hasTrailingSeparator Ignored.
-     *
-     * @return ClassNameInterface                The newly created class name instance.
-     * @throws InvalidPathAtomExceptionInterface If any of the supplied atoms are invalid.
+     * @return Factory\ClassNameFactoryInterface The class name factory.
      */
-    protected function createPath(
-        $atoms,
-        $isQualified,
-        $hasTrailingSeparator = null
-    ) {
-        if ($isQualified) {
-            return new QualifiedClassName($atoms);
-        }
-
-        return new ClassNameReference($atoms);
+    protected static function factory()
+    {
+        return Factory\ClassNameFactory::instance();
     }
 
     /**
-     * Create a new default class name normalizer.
+     * Get the class name normalizer.
      *
-     * @return PathNormalizerInterface The newly created normalizer.
+     * @return Normalizer\ClassNameNormalizerInterface The class name normalizer.
      */
-    protected function createDefaultNormalizer()
+    protected static function normalizer()
     {
-        return new Normalizer\ClassNameNormalizer;
+        return Normalizer\ClassNameNormalizer::instance();
     }
 }

src/Eloquent/Cosmos/Resolution/ResolutionContext.php

@@ -36,7 +36,7 @@ public function __construct(
         ClassNameFactoryInterface $factory = null
     ) {
         if (null === $factory) {
-            $factory = new ClassNameFactory;
+            $factory = ClassNameFactory::instance();
         }
         if (null === $primaryNamespace) {
             $primaryNamespace = $factory->createFromAtoms(array(), true);

src/Eloquent/Cosmos/Resolution/UseStatementGenerator.php

@@ -40,10 +40,10 @@ public function __construct(
             $maxReferenceAtoms = 2;
         }
         if (null === $useStatementFactory) {
-            $useStatementFactory = new UseStatementFactory;
+            $useStatementFactory = UseStatementFactory::instance();
         }
         if (null === $classNameFactory) {
-            $classNameFactory = new ClassNameFactory;
+            $classNameFactory = ClassNameFactory::instance();
         }
 
         $this->maxReferenceAtoms = $maxReferenceAtoms;