Merge branch 'hotfix/144-generator-aliases'

Close #144

Author: weierophinney

CHANGELOG.md

@@ -22,6 +22,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#144](https://github.com/zendframework/zend-code/pull/144) fixes the class generator such that it now resolves
+  `setExtendedClass()` arguments to aliases provided to the generator.
+
 - [#140](https://github.com/zendframework/zend-code/pull/140) fixes `MethodScanner::setVisibility()` such that it no longer
   casts the provided visibility token to lower case; this fix is necessary, as
   the method is supposed to expect only the appropriate

src/Generator/ClassGenerator.php

@@ -1145,6 +1145,20 @@ private function generateShortOrCompleteClassname($fqnClassName)
         $classNamespace = implode('\\', $parts);
         $currentNamespace = (string) $this->getNamespaceName();
 
+        if ($this->hasUseAlias($fqnClassName)) {
+            return $this->traitUsageGenerator->getUseAlias($fqnClassName);
+        }
+        if ($this->hasUseAlias($classNamespace)) {
+            $namespaceAlias = $this->traitUsageGenerator->getUseAlias($classNamespace);
+
+            return $namespaceAlias . '\\' . $className;
+        }
+        if ($this->traitUsageGenerator->isUseAlias($fqnClassName)) {
+            return $fqnClassName;
+        }
+        if ($this->traitUsageGenerator->isUseAlias($classNamespace)) {
+            return $fqnClassName;
+        }
         if ($classNamespace === $currentNamespace || in_array($fqnClassName, $this->getUses())) {
             return $className;
         }

src/Generator/TraitUsageGenerator.php

@@ -112,6 +112,40 @@ public function hasUseAlias($use)
         return false;
     }
 
+    /**
+     * Returns the alias of the provided FQCN
+     *
+     * @param string $use
+     * @return string|null
+     */
+    public function getUseAlias(string $use): ?string
+    {
+        foreach ($this->uses as $key => $value) {
+            $parts = explode(' as ', $key);
+            if ($parts[0] === $use && count($parts) == 2) {
+                return $parts[1];
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Returns true if the alias is defined in the use list
+     *
+     * @param string $alias
+     * @return bool
+     */
+    public function isUseAlias(string $alias): bool
+    {
+        foreach ($this->uses as $key => $value) {
+            $parts = explode(' as ', $key);
+            if (count($parts) === 2 && $parts[1] === $alias) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * @param string $use
      * @return TraitUsageGenerator

test/Generator/ClassGeneratorTest.php

@@ -1228,6 +1228,50 @@ public function testCorrectExtendNamesFromGlobalNamespace()
         self::assertContains('class ClassName extends DateTime', $classGenerator->generate());
     }
 
+    public function testCorrectlyExtendsProvidedAliasIfUseAliasExists()
+    {
+        $classGenerator = new ClassGenerator();
+        $classGenerator->setName('ClassName');
+        $classGenerator->setNamespaceName('SomeNamespace');
+        $classGenerator->addUse('Foo\\Bar', 'BarAlias');
+        $classGenerator->setExtendedClass('BarAlias');
+        $generated = $classGenerator->generate();
+        self::assertContains('class ClassName extends BarAlias', $generated);
+    }
+
+    public function testCorrectlyExtendsProvidedNamespaceAliasIfUseAliasExistsForNamespace()
+    {
+        $classGenerator = new ClassGenerator();
+        $classGenerator->setName('ClassName');
+        $classGenerator->setNamespaceName('SomeNamespace');
+        $classGenerator->addUse('Foo\\Bar', 'BarAlias');
+        $classGenerator->setExtendedClass('BarAlias\\FooBar');
+        $generated = $classGenerator->generate();
+        self::assertContains('class ClassName extends BarAlias\\FooBar', $generated);
+    }
+
+    public function testCorrectlyExtendsAliasOfProvidedFQCNIfUseAliasExists()
+    {
+        $classGenerator = new ClassGenerator();
+        $classGenerator->setName('ClassName');
+        $classGenerator->setNamespaceName('SomeNamespace');
+        $classGenerator->addUse('Foo\\Bar', 'BarAlias');
+        $classGenerator->setExtendedClass('Foo\\Bar');
+        $generated = $classGenerator->generate();
+        self::assertContains('class ClassName extends BarAlias', $generated);
+    }
+
+    public function testCorrectlyExtendsWithNamespaceAliasOfProvidedFQCNIfUseAliasExistsForNamespace()
+    {
+        $classGenerator = new ClassGenerator();
+        $classGenerator->setName('ClassName');
+        $classGenerator->setNamespaceName('SomeNamespace');
+        $classGenerator->addUse('Foo\\Bar', 'BarAlias');
+        $classGenerator->setExtendedClass('Foo\\Bar\\FooBar');
+        $generated = $classGenerator->generate();
+        self::assertContains('class ClassName extends BarAlias\\FooBar', $generated);
+    }
+
     public function testCorrectImplementNames()
     {
         $classGenerator = new ClassGenerator();