Merge branch 'hotfix/4990' into develop

Forward port #4990
zendframework · Aug 21, 2013 · 7be43e3 · 7be43e3
2 parents 8fcbe7b + 4c31950
commit 7be43e3
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/library/Zend/Code/Generator/ClassGenerator.php b/library/Zend/Code/Generator/ClassGenerator.php
@@ -490,7 +490,7 @@ public function addUse($use, $useAlias = null)
             $use .= ' as ' . $useAlias;
         }
 
-        $this->uses[] = $use;
+        $this->uses[$use] = $use;
         return $this;
     }
 
@@ -524,7 +524,7 @@ public function getProperty($propertyName)
      */
     public function getUses()
     {
-        return $this->uses;
+        return array_values($this->uses);
     }
 
     /**

diff --git a/tests/ZendTest/Code/Generator/ClassGeneratorTest.php b/tests/ZendTest/Code/Generator/ClassGeneratorTest.php
@@ -378,6 +378,38 @@ public function testAddUses()
         $this->assertContains('use My\Second\Use\Class as MyAlias;', $generated);
     }
 
+    /**
+     * @group gh-4990
+     */
+    public function testAddOneUseTwiceOnlyAddsOne()
+    {
+        $classGenerator = new ClassGenerator();
+        $classGenerator->setName('My\Class');
+        $classGenerator->addUse('My\First\Use\Class');
+        $classGenerator->addUse('My\First\Use\Class');
+        $generated = $classGenerator->generate();
+
+        $this->assertCount(1, $classGenerator->getUses());
+
+        $this->assertContains('use My\First\Use\Class;', $generated);
+    }
+
+    /**
+     * @group gh-4990
+     */
+    public function testAddOneUseWithAliasTwiceOnlyAddsOne()
+    {
+        $classGenerator = new ClassGenerator();
+        $classGenerator->setName('My\Class');
+        $classGenerator->addUse('My\First\Use\Class', 'MyAlias');
+        $classGenerator->addUse('My\First\Use\Class', 'MyAlias');
+        $generated = $classGenerator->generate();
+
+        $this->assertCount(1, $classGenerator->getUses());
+
+        $this->assertContains('use My\First\Use\Class as MyAlias;', $generated);
+    }
+
     public function testCreateFromArrayWithDocBlockFromArray()
     {
         $classGenerator = ClassGenerator::fromArray(array(