Revert "Merge pull request #7 from fromYukki/master"

This reverts commit eca8097, reversing
changes made to adc4db7.

spec/Memio/Model/ContractSpec.php

@@ -19,9 +19,9 @@
 
 class ContractSpec extends ObjectBehavior
 {
-    const FULLY_QUALIFIED_NAME = '\Vendor\Project\MyInterface';
+    const FULLY_QUALIFIED_NAME = 'Vendor\Project\MyInterface';
     const NAME = 'MyInterface';
-    const NAMESPACE_ = '\Vendor\Project';
+    const NAMESPACE_ = 'Vendor\Project';
 
     function let()
     {

spec/Memio/Model/FullyQualifiedNameSpec.php

@@ -22,7 +22,7 @@ function let()
 
     function it_has_fully_qualified_classname()
     {
-        $this->getFullyQualifiedName()->shouldBe('\Vendor\Project\MyClass');
+        $this->getFullyQualifiedName()->shouldBe('Vendor\Project\MyClass');
     }
 
     function it_has_name()
@@ -32,7 +32,7 @@ function it_has_name()
 
     function it_has_namespace()
     {
-        $this->getNamespace()->shouldBe('\Vendor\Project');
+        $this->getNamespace()->shouldBe('Vendor\Project');
     }
 
     function it_can_have_an_alias()

spec/Memio/Model/ObjectSpec.php

@@ -21,9 +21,9 @@
 
 class ObjectSpec extends ObjectBehavior
 {
-    const FULLY_QUALIFIED_NAME = '\Vendor\Project\MyClass';
+    const FULLY_QUALIFIED_NAME = 'Vendor\Project\MyClass';
     const NAME = 'MyClass';
-    const NAMESPACE_ = '\Vendor\Project';
+    const NAMESPACE_ = 'Vendor\Project';
 
     function let()
     {

src/Memio/Model/Constant.php

@@ -41,7 +41,6 @@ public function __construct($name, $value)
     /**
      * @param string $name
      * @param string $value
-     * @return Constant
      *
      * @api
      */

src/Memio/Model/File.php

@@ -34,7 +34,7 @@ class File
     private $fullyQualifiedNames = array();
 
     /**
-     * @var Structure
+     * @var Strucutre
      */
     private $structure;
 
@@ -106,7 +106,7 @@ public function removeLicensePhpdoc()
     public function getNamespace()
     {
         if (null === $this->structure) {
-            return null;
+            return;
         }
 
         return $this->structure->getNamespace();

src/Memio/Model/FullyQualifiedName.php

@@ -19,22 +19,17 @@ class FullyQualifiedName
     /**
      * @var string
      */
-    private $qualifiedName;
-
-    /**
-     * @var string
-     */
-    private $unqualifiedName;
+    private $fullyQualifiedName;
 
     /**
      * @var string
      */
-    private $fullyQualifiedName;
+    private $name;
 
     /**
      * @var string
      */
-    private $namespace;
+    private $namepace;
 
     /**
      * @var string
@@ -48,24 +43,11 @@ class FullyQualifiedName
      */
     public function __construct($fullyQualifiedName)
     {
-        // Lets say that we have 'Foo\Bar' here
-        $parts = explode('\\', trim($fullyQualifiedName, '\\'));
+        $namespaces = explode('\\', $fullyQualifiedName);
 
-        // Bar
-        $this->unqualifiedName = end($parts);
-
-        // Foo\Bar
-        $this->qualifiedName = implode('\\', $parts);
-
-        // \Foo\Bar
-        $this->fullyQualifiedName = '\\' . $this->qualifiedName;
-
-        // Build namespace (Foo)
-        array_pop($parts);
-
-        if (count($parts)) {
-            $this->namespace = self::make(implode('\\', $parts));
-        }
+        $this->name = array_pop($namespaces);
+        $this->namepace = implode('\\', $namespaces);
+        $this->fullyQualifiedName = trim($fullyQualifiedName, '\\');
     }
 
     /**
@@ -88,36 +70,20 @@ public function getFullyQualifiedName()
         return $this->fullyQualifiedName;
     }
 
-    /**
-     * @return string
-     */
-    public function getQualifiedName()
-    {
-        return $this->qualifiedName;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUnqualifiedName()
-    {
-        return $this->unqualifiedName;
-    }
-
     /**
      * @return string
      */
     public function getName()
     {
-        return (null === $this->alias) ? $this->getUnqualifiedName() : $this->alias;
+        return (null === $this->alias) ? $this->name : $this->alias;
     }
 
     /**
      * @return string
      */
     public function getNamespace()
     {
-        return (null === $this->namespace) ? '' : $this->namespace->getFullyQualifiedName();
+        return $this->namepace;
     }
 
     /**

src/Memio/Model/Object.php

@@ -195,7 +195,7 @@ public function removeFinal()
     }
 
     /**
-     * @param \Memio\Model\Object $parent
+     * @param Object $parent
      *
      * @return self
      *