Merge branch 'feature/zf2-151' into develop

weierophinney · weierophinney · commit 9253e52975e4 · 2012-10-10T09:50:47.000-05:00
Close #2702
diff --git a/library/Zend/Code/Generator/ClassGenerator.php b/library/Zend/Code/Generator/ClassGenerator.php
@@ -67,6 +67,11 @@ class ClassGenerator extends AbstractGenerator
      */
     protected $methods = array();
 
+    /**
+     * @var array Array of string names
+     */
+    protected $uses = array();
+
     /**
      * fromReflection() - build a Code Generation Php Object from a Class Reflection
      *
@@ -479,6 +484,19 @@ public function addPropertyFromGenerator(PropertyGenerator $property)
         return $this;
     }
 
+    /**
+     * Add a class to "use" classes
+     *
+     * @param string $useClass
+     */
+    public function addUse($use, $useAlias = null)
+    {
+        if (!empty($useAlias)) {
+            $use .= ' as ' . $useAlias;
+        }
+        $this->uses[] = $use;
+    }
+
     /**
      * getProperties()
      *
@@ -505,6 +523,16 @@ public function getProperty($propertyName)
         return false;
     }
 
+    /**
+     * Returns the "use" classes
+     *
+     * @return array
+     */
+    public function getUses()
+    {
+        return $this->uses;
+    }
+
     /**
      * hasProperty()
      *
@@ -664,6 +692,14 @@ public function generate()
             $output .= 'namespace ' . $namespace . ';' . self::LINE_FEED . self::LINE_FEED;
         }
 
+        $uses = $this->getUses();
+        if (!empty($uses)) {
+            foreach ($uses as $use) {
+                $output .= 'use ' . $use . ';' . self::LINE_FEED;
+            }
+            $output .= self::LINE_FEED;
+        }
+
         if (null !== ($docBlock = $this->getDocBlock())) {
             $docBlock->setIndentation('');
             $output .= $docBlock->generate();
diff --git a/tests/ZendTest/Code/Generator/ClassGeneratorTest.php b/tests/ZendTest/Code/Generator/ClassGeneratorTest.php
@@ -362,4 +362,19 @@ public function testPassingANamespacedClassnameShouldGenerateAClassnameWithoutIt
         $received = $classGeneratorClass->generate();
         $this->assertContains('class FunClass', $received, $received);
     }
+
+    /**
+     * @group ZF2-151
+     */
+    public function testAddUses()
+    {
+        $classGenerator = new ClassGenerator();
+        $classGenerator->setName('My\Class');
+        $classGenerator->addUse('My\First\Use\Class');
+        $classGenerator->addUse('My\Second\Use\Class', 'MyAlias');
+        $generated = $classGenerator->generate();
+
+        $this->assertContains('use My\First\Use\Class;', $generated);
+        $this->assertContains('use My\Second\Use\Class as MyAlias;', $generated);
+    }
 }
