Merge branch 'hotfix/75'

Close #75
Fixes #74
Fixes #80
Fixes #81

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.0.4 - TBD
+## 3.0.4 - 2016-06-30
 
 ### Added
 
@@ -20,6 +20,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#59](https://github.com/zendframework/zend-code/pull/59) fixes an issue with
   detection of multiple trait `use` statements.
+- [#75](https://github.com/zendframework/zend-code/pull/75) provides a patch to
+  ensure that `extends` statements qualify the parent class based on the current
+  namespace and/or import statements.
 
 ## 3.0.3 - 2016-06-27
 

src/Generator/ClassGenerator.php

@@ -1018,6 +1018,7 @@ private function validateConstantValue($value)
      */
     private function generateShortOrCompleteClassname($fqnClassName)
     {
+        $fqnClassName = ltrim($fqnClassName, '\\');
         $parts = explode('\\', $fqnClassName);
         $className = array_pop($parts);
         $classNamespace = implode('\\', $parts);

test/Generator/ClassGeneratorTest.php

@@ -1094,19 +1094,48 @@ public function testCorrectExtendNames()
         $classGenerator->addUse('Zend\Code\NameInformation');
         $classGenerator->setExtendedClass('Zend\Code\NameInformation');
         $this->assertContains('class ClassName extends NameInformation', $classGenerator->generate());
+    }
 
+    /**
+     * @group 75
+     */
+    public function testCorrectlyExtendsFullyQualifiedParentClass()
+    {
         $classGenerator = new ClassGenerator();
         $classGenerator->setName('ClassName');
         $classGenerator->setNamespaceName('SomeNamespace');
         $classGenerator->setExtendedClass('DateTime');
         $this->assertContains('class ClassName extends \DateTime', $classGenerator->generate());
+    }
 
+    /**
+     * @group 75
+     */
+    public function testCorrectlyExtendsRelativeParentClass()
+    {
         $classGenerator = new ClassGenerator();
         $classGenerator->setName('ClassName');
         $classGenerator->setExtendedClass('DateTime');
         $this->assertContains('class ClassName extends DateTime', $classGenerator->generate());
     }
 
+    /**
+     * @group 75
+     */
+    public function testCorrectExtendNamesFromGlobalNamespace()
+    {
+        $classGenerator = new ClassGenerator();
+        $classGenerator->setName('ClassName');
+        $classGenerator->setNamespaceName('SomeNamespace');
+        $classGenerator->setExtendedClass('\DateTime');
+        $this->assertContains('class ClassName extends \DateTime', $classGenerator->generate());
+
+        $classGenerator = new ClassGenerator();
+        $classGenerator->setName('ClassName');
+        $classGenerator->setExtendedClass('\DateTime');
+        $this->assertContains('class ClassName extends DateTime', $classGenerator->generate());
+    }
+
     public function testCorrectImplementNames()
     {
         $classGenerator = new ClassGenerator();