Merge branch 'fix/#94-allow-array-as-generated-constant-value-3-0-5'

Close #94

Author: Ocramius

src/Generator/ValueGenerator.php

@@ -172,8 +172,10 @@ public function isValidConstantType()
             $type = $this->type;
         }
 
-        // valid types for constants
-        $scalarTypes = [
+        $validConstantTypes = [
+            self::TYPE_ARRAY,
+            self::TYPE_ARRAY_LONG,
+            self::TYPE_ARRAY_SHORT,
             self::TYPE_BOOLEAN,
             self::TYPE_BOOL,
             self::TYPE_NUMBER,
@@ -186,7 +188,7 @@ public function isValidConstantType()
             self::TYPE_NULL
         ];
 
-        return in_array($type, $scalarTypes);
+        return in_array($type, $validConstantTypes);
     }
 
     /**

test/Generator/ValueGeneratorTest.php

@@ -12,6 +12,8 @@
 use ArrayAccess;
 use ArrayObject as SplArrayObject;
 use Zend\Code\Exception\InvalidArgumentException;
+use Zend\Code\Generator\PropertyGenerator;
+use Zend\Code\Generator\PropertyValueGenerator;
 use Zend\Stdlib\ArrayObject as StdlibArrayObject;
 use Zend\Code\Generator\ValueGenerator;
 
@@ -64,6 +66,38 @@ public function constantsTypeProvider()
         ];
     }
 
+    /**
+     * @group #94
+     * @dataProvider validConstantTypesProvider
+     */
+    public function testValidConstantTypes($generator, $expectedOutput)
+    {
+        $propertyGenerator = new PropertyGenerator('FOO', $generator);
+        $propertyGenerator->setConst(true);
+        $this->assertSame($expectedOutput, $propertyGenerator->generate());
+    }
+
+    /**
+     * @return array
+     */
+    public function validConstantTypesProvider()
+    {
+        return [
+            [new PropertyValueGenerator([], PropertyValueGenerator::TYPE_ARRAY, ValueGenerator::OUTPUT_SINGLE_LINE), "    const FOO = array();"],
+            [new PropertyValueGenerator([], PropertyValueGenerator::TYPE_ARRAY_LONG, ValueGenerator::OUTPUT_SINGLE_LINE), "    const FOO = array();"],
+            [new PropertyValueGenerator([], PropertyValueGenerator::TYPE_ARRAY_SHORT, ValueGenerator::OUTPUT_SINGLE_LINE), "    const FOO = [];"],
+            [new PropertyValueGenerator(true, PropertyValueGenerator::TYPE_BOOL), "    const FOO = true;"],
+            [new PropertyValueGenerator(true, PropertyValueGenerator::TYPE_BOOLEAN), "    const FOO = true;"],
+            [new PropertyValueGenerator(1, PropertyValueGenerator::TYPE_INT), "    const FOO = 1;"],
+            [new PropertyValueGenerator(1, PropertyValueGenerator::TYPE_INTEGER), "    const FOO = 1;"],
+            [new PropertyValueGenerator(0.1, PropertyValueGenerator::TYPE_DOUBLE), "    const FOO = 0.1;"],
+            [new PropertyValueGenerator(0.1, PropertyValueGenerator::TYPE_FLOAT), "    const FOO = 0.1;"],
+            [new PropertyValueGenerator('bar', PropertyValueGenerator::TYPE_STRING), "    const FOO = 'bar';"],
+            [new PropertyValueGenerator(null, PropertyValueGenerator::TYPE_NULL), "    const FOO = null;"],
+            [new PropertyValueGenerator('PHP_EOL', PropertyValueGenerator::TYPE_CONSTANT), "    const FOO = PHP_EOL;"],
+        ];
+    }
+
     /**
      * @return array
      */