Merge branch 'hotfix/69' into develop

Forward port #69

Author: weierophinney

CHANGELOG.md

@@ -41,6 +41,10 @@ All notable changes to this project will be documented in this file, in reverse
   how parameter typehints were generated; previously, fully-qualified class
   names were not being generated with the leading backslash, causing them to
   attempt to resolve as if they were relative to the current namespace.
+- [#69](https://github.com/zendframework/zend-code/pull/69) fixes an issue with
+  how class names under the same namespace are generated when generating
+  typehints, extends, and implements values; they now strip the
+  common namespace from the class name.
 
 ## 3.0.2 - 2016-04-20
 

src/Generator/ClassGenerator.php

@@ -950,12 +950,13 @@ public function generate()
         $output .= static::OBJECT_TYPE . ' ' . $this->getName();
 
         if (!empty($this->extendedClass)) {
-            $output .= ' extends ' . $this->extendedClass;
+            $output .= ' extends ' .  $this->generateShortOrCompleteClassname($this->extendedClass);
         }
 
         $implemented = $this->getImplementedInterfaces();
 
         if (!empty($implemented)) {
+            $implemented = array_map([$this, 'generateShortOrCompleteClassname'], $implemented);
             $output .= ' ' . static::IMPLEMENTS_KEYWORD . ' ' . implode(', ', $implemented);
         }
 
@@ -1009,4 +1010,23 @@ private function validateConstantValue($value)
             gettype($value)
         ));
     }
+
+    /**
+     * @param string $fqnClassName
+     *
+     * @return string
+     */
+    private function generateShortOrCompleteClassname($fqnClassName)
+    {
+        $parts = explode('\\', $fqnClassName);
+        $className = array_pop($parts);
+        $classNamespace = implode('\\', $parts);
+        $currentNamespace = (string) $this->getNamespaceName();
+
+        if ($classNamespace === $currentNamespace || in_array($fqnClassName, $this->getUses())) {
+            return $className;
+        }
+
+        return '\\' . $fqnClassName;
+    }
 }

test/Generator/ClassGeneratorTest.php

@@ -242,8 +242,8 @@ public function testClassFromReflectionThatImplementsInterfaces()
         $code = $classGenerator->generate();
 
         $expectedClassDef = 'class ClassWithInterface'
-            . ' implements ZendTest\Code\Generator\TestAsset\OneInterface'
-            . ', ZendTest\Code\Generator\TestAsset\TwoInterface';
+            . ' implements OneInterface'
+            . ', TwoInterface';
         $this->assertContains($expectedClassDef, $code);
     }
 
@@ -260,8 +260,8 @@ public function testClassFromReflectionDiscardParentImplementedInterfaces()
         $code = $classGenerator->generate();
 
         $expectedClassDef = 'class NewClassWithInterface'
-            . ' extends ZendTest\Code\Generator\TestAsset\ClassWithInterface'
-            . ' implements ZendTest\Code\Generator\TestAsset\ThreeInterface';
+            . ' extends ClassWithInterface'
+            . ' implements ThreeInterface';
         $this->assertContains($expectedClassDef, $code);
     }
 
@@ -1085,4 +1085,41 @@ final class SomeClass
         $output = $classGenerator->generate();
         $this->assertEquals($expectedOutput, $output, $output);
     }
+
+    public function testCorrectExtendNames()
+    {
+        $classGenerator = new ClassGenerator();
+        $classGenerator->setName('ClassName');
+        $classGenerator->setNamespaceName('SomeNamespace');
+        $classGenerator->addUse('Zend\Code\NameInformation');
+        $classGenerator->setExtendedClass('Zend\Code\NameInformation');
+        $this->assertContains('class ClassName extends NameInformation', $classGenerator->generate());
+
+        $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();
+        $classGenerator->setName('ClassName');
+        $classGenerator->setNamespaceName('SomeNamespace');
+        $classGenerator->addUse('Zend\Code\Generator\GeneratorInterface');
+        $classGenerator->setImplementedInterfaces([
+           'SomeNamespace\ClassInterface',
+           'Zend\Code\Generator\GeneratorInterface',
+           'Iteratable'
+        ]);
+
+        $expected = 'class ClassName implements ClassInterface, GeneratorInterface, \Iteratable';
+        $this->assertContains($expected, $classGenerator->generate());
+    }
 }