Fix incorrect creating instance by fromArray

AntonStoeckl · Dec 12, 2012 · 457128c · 457128c
1 parent 0ef37c6
commit 457128c
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 98 deletions.
diff --git a/library/Zend/Code/Generator/ClassGenerator.php b/library/Zend/Code/Generator/ClassGenerator.php
@@ -68,7 +68,7 @@ class ClassGenerator extends AbstractGenerator
     protected $methods = array();
 
     /**
-     * fromReflection() - build a Code Generation Php Object from a Class Reflection
+     * Build a Code Generation Php Object from a Class Reflection
      *
      * @param ClassReflection $classReflection
      * @return ClassGenerator
@@ -141,7 +141,6 @@ public static function fromReflection(ClassReflection $classReflection)
      * @configkey properties
      * @configkey methods
      *
-     *
      * @throws Exception\InvalidArgumentException
      * @param array $array
      * @return ClassGenerator
@@ -151,6 +150,7 @@ public static function fromArray(array $array)
         if (!isset($array['name'])) {
             throw new Exception\InvalidArgumentException('Class generator requires that a name is provided for this object');
         }
+
         $cg = new static($array['name']);
         foreach ($array as $name => $value) {
             // normalize key
@@ -162,7 +162,8 @@ public static function fromArray(array $array)
                     $cg->setNamespaceName($value);
                     break;
                 case 'docblock':
-                    $cg->setDocBlock((!$value instanceof DocBlockGenerator) ? : DocBlockGenerator::fromArray($value));
+                    $docBlock = ($value instanceof DocBlockGenerator) ? $value : DocBlockGenerator::fromArray($value);
+                    $cg->setDocBlock($docBlock);
                     break;
                 case 'flags':
                     $cg->setFlags($value);
@@ -181,9 +182,20 @@ public static function fromArray(array $array)
                     break;
             }
         }
+
         return $cg;
     }
 
+    /**
+     * @param string            $name
+     * @param string            $namespaceName
+     * @param array|string      $flags
+     * @param string            $extends
+     * @param array             $interfaces
+     * @param array             $properties
+     * @param array             $methods
+     * @param DocBlockGenerator $docBlock
+     */
     public function __construct($name = null, $namespaceName = null, $flags = null, $extends = null,
                                 $interfaces = array(), $properties = array(), $methods = array(), $docBlock = null)
     {
@@ -214,8 +226,6 @@ public function __construct($name = null, $namespaceName = null, $flags = null,
     }
 
     /**
-     * setName()
-     *
      * @param string $name
      * @return ClassGenerator
      */
@@ -232,8 +242,6 @@ public function setName($name)
     }
 
     /**
-     * getName()
-     *
      * @return string
      */
     public function getName()
@@ -242,8 +250,6 @@ public function getName()
     }
 
     /**
-     * getNamespaceName()
-     *
      * @return string
      */
     public function getNamespaceName()
@@ -252,9 +258,7 @@ public function getNamespaceName()
     }
 
     /**
-     * setNamespaceName()
-     *
-     * @param $namespaceName
+     * @param string $namespaceName
      * @return ClassGenerator
      */
     public function setNamespaceName($namespaceName)
@@ -294,17 +298,18 @@ public function setDocBlock(DocBlockGenerator $docBlock)
         return $this;
     }
 
-
     /**
-     * getDocBlock()
-     *
      * @return DocBlockGenerator
      */
     public function getDocBlock()
     {
         return $this->docBlock;
     }
 
+    /**
+     * @param array|string $flags
+     * @return \Zend\Code\Generator\ClassGenerator
+     */
     public function setFlags($flags)
     {
         if (is_array($flags)) {
@@ -319,21 +324,27 @@ public function setFlags($flags)
         return $this;
     }
 
+    /**
+     * @param string $flag
+     * @return ClassGenerator
+     */
     public function addFlag($flag)
     {
         $this->setFlags($this->flags | $flag);
         return $this;
     }
 
+    /**
+     * @param string $flag
+     * @return ClassGenerator
+     */
     public function removeFlag($flag)
     {
         $this->setFlags($this->flags & ~$flag);
         return $this;
     }
 
     /**
-     * setAbstract()
-     *
      * @param bool $isAbstract
      * @return AbstractMemberGenerator
      */
@@ -343,8 +354,6 @@ public function setAbstract($isAbstract)
     }
 
     /**
-     * isAbstract()
-     *
      * @return bool
      */
     public function isAbstract()
@@ -353,8 +362,6 @@ public function isAbstract()
     }
 
     /**
-     * setFinal()
-     *
      * @param bool $isFinal
      * @return AbstractMemberGenerator
      */
@@ -364,8 +371,6 @@ public function setFinal($isFinal)
     }
 
     /**
-     * isFinal()
-     *
      * @return bool
      */
     public function isFinal()
@@ -374,8 +379,6 @@ public function isFinal()
     }
 
     /**
-     * setExtendedClass()
-     *
      * @param string $extendedClass
      * @return ClassGenerator
      */
@@ -386,8 +389,6 @@ public function setExtendedClass($extendedClass)
     }
 
     /**
-     * getExtendedClass()
-     *
      * @return string
      */
     public function getExtendedClass()
@@ -396,8 +397,6 @@ public function getExtendedClass()
     }
 
     /**
-     * setImplementedInterfaces()
-     *
      * @param array $implementedInterfaces
      * @return ClassGenerator
      */
@@ -408,8 +407,6 @@ public function setImplementedInterfaces(array $implementedInterfaces)
     }
 
     /**
-     * getImplementedInterfaces
-     *
      * @return array
      */
     public function getImplementedInterfaces()
@@ -418,8 +415,6 @@ public function getImplementedInterfaces()
     }
 
     /**
-     * addProperties()
-     *
      * @param array $properties
      * @return ClassGenerator
      */
@@ -461,7 +456,7 @@ public function addProperty($name, $defaultValue = null, $flags = PropertyGenera
     }
 
     /**
-     * add property from PropertyGenerator
+     * Add property from PropertyGenerator
      *
      * @param  string|PropertyGenerator $property
      * @throws Exception\InvalidArgumentException
@@ -480,8 +475,6 @@ public function addPropertyFromGenerator(PropertyGenerator $property)
     }
 
     /**
-     * getProperties()
-     *
      * @return PropertyGenerator[]
      */
     public function getProperties()
@@ -490,8 +483,6 @@ public function getProperties()
     }
 
     /**
-     * getProperty()
-     *
      * @param string $propertyName
      * @return PropertyGenerator|false
      */
@@ -506,8 +497,6 @@ public function getProperty($propertyName)
     }
 
     /**
-     * hasProperty()
-     *
      * @param string $propertyName
      * @return bool
      */
@@ -517,8 +506,6 @@ public function hasProperty($propertyName)
     }
 
     /**
-     * addMethods()
-     *
      * @param array $methods
      * @return ClassGenerator
      */
@@ -561,7 +548,6 @@ public function addMethod($name = null, array $parameters = array(), $flags = Me
         return $this->addMethodFromGenerator(new MethodGenerator($name, $parameters, $flags, $body, $docBlock));
     }
 
-
     /**
      * Add Method from MethodGenerator
      *
@@ -582,8 +568,6 @@ public function addMethodFromGenerator(MethodGenerator $method)
     }
 
     /**
-     * getMethods()
-     *
      * @return MethodGenerator[]
      */
     public function getMethods()
@@ -592,8 +576,6 @@ public function getMethods()
     }
 
     /**
-     * getMethod()
-     *
      * @param string $methodName
      * @return MethodGenerator|false
      */
@@ -608,8 +590,6 @@ public function getMethod($methodName)
     }
 
     /**
-     * hasMethod()
-     *
      * @param string $methodName
      * @return bool
      */
@@ -619,8 +599,6 @@ public function hasMethod($methodName)
     }
 
     /**
-     * isSourceDirty()
-     *
      * @return bool
      */
     public function isSourceDirty()
@@ -645,8 +623,6 @@ public function isSourceDirty()
     }
 
     /**
-     * generate()
-     *
      * @return string
      */
     public function generate()