Merge branch 'hotfix/3214'

Close #3214
zendframework · Dec 13, 2012 · 09bac30 · 09bac30
2 parents c9eea75 + 6965b0a
commit 09bac30
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 22 deletions.
diff --git a/library/Zend/Code/Generator/DocBlock/Tag.php b/library/Zend/Code/Generator/DocBlock/Tag.php
@@ -19,7 +19,9 @@
  */
 class Tag extends AbstractGenerator
 {
-
+    /**
+     * @var array
+     */
     protected static $typeFormats = array(
         array(
             'param',
@@ -50,18 +52,18 @@ class Tag extends AbstractGenerator
      */
     public function __construct(array $options = array())
     {
-        if (array_key_exists('name', $options)) {
+        if (isset($options['name'])) {
             $this->setName($options['name']);
         }
-        if (array_key_exists('description', $options)) {
+        if (isset($options['description'])) {
             $this->setDescription($options['description']);
         }
     }
 
     /**
-     * fromReflection()
+     * Build a Tag generator object from a reflection object
      *
-     * @param ReflectionDocBlockTag $reflectionTag
+     * @param  ReflectionDocBlockTag $reflectionTag
      * @return Tag
      */
     public static function fromReflection(ReflectionDocBlockTag $reflectionTag)
@@ -86,20 +88,17 @@ public static function fromReflection(ReflectionDocBlockTag $reflectionTag)
     }
 
     /**
-     * setName()
-     *
-     * @param string $name
+     * @param  string $name
      * @return Tag
      */
     public function setName($name)
     {
         $this->name = ltrim($name, '@');
+
         return $this;
     }
 
     /**
-     * getName()
-     *
      * @return string
      */
     public function getName()
@@ -108,20 +107,17 @@ public function getName()
     }
 
     /**
-     * setDescription()
-     *
-     * @param string $description
+     * @param  string $description
      * @return Tag
      */
     public function setDescription($description)
     {
         $this->description = $description;
+
         return $this;
     }
 
     /**
-     * getDescription()
-     *
      * @return string
      */
     public function getDescription()
@@ -130,14 +126,13 @@ public function getDescription()
     }
 
     /**
-     * generate()
-     *
      * @return string
      */
     public function generate()
     {
         $output = '@' . $this->name
             . (($this->description != null) ? ' ' . $this->description : '');
+
         return $output;
     }
 

diff --git a/library/Zend/Code/Generator/DocBlockGenerator.php b/library/Zend/Code/Generator/DocBlockGenerator.php
@@ -100,14 +100,14 @@ public static function fromArray(array $array)
      */
     public function __construct($shortDescription = null, $longDescription = null, array $tags = array())
     {
-        if ($shortDescription !== null) {
+        if ($shortDescription) {
             $this->setShortDescription($shortDescription);
         }
-        if ($longDescription !== null) {
+        if ($longDescription) {
             $this->setLongDescription($longDescription);
         }
-        if ($this->tags !== array()) {
-            $this->setTag($tags);
+        if (is_array($tags) && $tags) {
+            $this->setTags($tags);
         }
     }
 
@@ -184,7 +184,7 @@ public function setTag($tag)
     }
 
     /**
-     * @return array
+     * @return DocBlock\Tag[]
      */
     public function getTags()
     {

diff --git a/tests/ZendTest/Code/Generator/DocBlockGeneratorTest.php b/tests/ZendTest/Code/Generator/DocBlockGeneratorTest.php
@@ -33,6 +33,18 @@ protected function setUp()
         $this->docBlockGenerator = $this->docBlockGenerator = new DocBlockGenerator();
     }
 
+    public function testCanPassTagsToConstructor()
+    {
+        $docBlockGenerator = new DocBlockGenerator(null, null, array(
+            array('name' => 'foo')
+        ));
+
+        $tags = $docBlockGenerator->getTags();
+        $this->assertCount(1, $tags);
+
+        $this->assertEquals('foo', $tags[0]->getName());
+    }
+
     public function testShortDescriptionGetterAndSetter()
     {
         $this->docBlockGenerator->setShortDescription('Short Description');