Merge branch 'hotfix/#4-allow-class-constants-with-all-possible-scalar-values' into develop

Close #4
Forward port #4

Author: Ocramius

src/Generator/ClassGenerator.php

@@ -510,28 +510,27 @@ public function addConstantFromGenerator(PropertyGenerator $constant)
     /**
      * Add Constant
      *
-     * @param  string $name
-     * @param  string $value
+     * @param  string                      $name non-empty string
+     * @param  string|int|null|float|array $value scalar
+     *
      * @throws Exception\InvalidArgumentException
+     *
      * @return ClassGenerator
      */
     public function addConstant($name, $value)
     {
-        if (!is_string($name)) {
+        if (empty($name) || !is_string($name)) {
             throw new Exception\InvalidArgumentException(sprintf(
                 '%s expects string for name',
                 __METHOD__
             ));
         }
 
-        if (empty($value) || !is_string($value)) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                '%s expects value for constant, value must be a string',
-                __METHOD__
-            ));
-        }
+        $this->validateConstantValue($value);
 
-        return $this->addConstantFromGenerator(new PropertyGenerator($name, $value, PropertyGenerator::FLAG_CONSTANT));
+        return $this->addConstantFromGenerator(
+            new PropertyGenerator($name, new PropertyValueGenerator($value), PropertyGenerator::FLAG_CONSTANT)
+        );
     }
 
     /**
@@ -984,4 +983,29 @@ public function generate()
 
         return $output;
     }
+
+    /**
+     * @param mixed $value
+     *
+     * @return void
+     *
+     * @throws Exception\InvalidArgumentException
+     */
+    private function validateConstantValue($value)
+    {
+        if (null === $value || is_scalar($value)) {
+            return;
+        }
+
+        if (is_array($value)) {
+            array_walk($value, [$this, 'validateConstantValue']);
+
+            return;
+        }
+
+        throw new Exception\InvalidArgumentException(sprintf(
+            'Expected value for constant, value must be a "scalar" or "null", "%s" found',
+            gettype($value)
+        ));
+    }
 }

test/Generator/ClassGeneratorTest.php

@@ -12,6 +12,7 @@
 use ReflectionMethod;
 use Zend\Code\Generator\ClassGenerator;
 use Zend\Code\Generator\DocBlockGenerator;
+use Zend\Code\Generator\Exception\InvalidArgumentException;
 use Zend\Code\Generator\PropertyGenerator;
 use Zend\Code\Generator\MethodGenerator;
 use Zend\Code\Reflection\ClassReflection;
@@ -563,16 +564,69 @@ public function testAddConstantThrowsExceptionWithInvalidName()
         $classGenerator->addConstant([], 'value1');
     }
 
-    /**
-     * @group 6274
-     */
-    public function testAddConstantThrowsExceptionWithInvalidValue()
+    public function testAddConstantThrowsExceptionWithEmptyConstantName()
     {
-        $this->setExpectedException('InvalidArgumentException');
+        $classGenerator = new ClassGenerator();
+
+        $this->setExpectedException(InvalidArgumentException::class);
+
+        $classGenerator->addConstant('', 'value');
+    }
+
+    public function testAddConstantAcceptsMixedScalars()
+    {
+        $classGenerator = new ClassGenerator();
+
+        $classGenerator->addConstant('a', 'v');
+        $classGenerator->addConstant('b', 123);
+        $classGenerator->addConstant('c', 123.456);
+        $classGenerator->addConstant('d', []);
+        $classGenerator->addConstant('e', ['v1' => 'v2']);
+        $classGenerator->addConstant('f', ['v1' => ['v2' => 'v3']]);
+        $classGenerator->addConstant('g', null);
+
+        $this->assertEquals('v', $classGenerator->getConstant('a')->getDefaultValue()->getValue());
+        $this->assertEquals(123, $classGenerator->getConstant('b')->getDefaultValue()->getValue());
+        $this->assertEquals(123.456, $classGenerator->getConstant('c')->getDefaultValue()->getValue());
+        $this->assertEquals([], $classGenerator->getConstant('d')->getDefaultValue()->getValue());
+        $this->assertEquals(['v1' => 'v2'], $classGenerator->getConstant('e')->getDefaultValue()->getValue());
+        $this->assertEquals(['v1' => ['v2' => 'v3']], $classGenerator->getConstant('f')->getDefaultValue()->getValue());
+        $this->assertEquals(null, $classGenerator->getConstant('g')->getDefaultValue()->getValue());
+    }
+
+    public function testAddConstantRejectsObjectConstantValue()
+    {
+        $classGenerator = new ClassGenerator();
+
+        $this->setExpectedException(InvalidArgumentException::class);
+
+        $classGenerator->addConstant('a', new \stdClass());
+    }
 
+    public function testAddConstantRejectsResourceConstantValue()
+    {
         $classGenerator = new ClassGenerator();
 
-        $classGenerator->addConstant('x', null);
+        $resource = fopen('php://memory', 'r');
+
+        try {
+            $classGenerator->addConstant('a', $resource);
+
+            $this->fail('Not supposed to be reached');
+        } catch (InvalidArgumentException $e) {
+            $this->assertEmpty($classGenerator->getConstants());
+        } finally {
+            fclose($resource);
+        }
+    }
+
+    public function testAddConstantRejectsArrayWithInvalidNestedValue()
+    {
+        $classGenerator = new ClassGenerator();
+
+        $this->setExpectedException(InvalidArgumentException::class);
+
+        $classGenerator->addConstant('a', [new \stdClass()]);
     }
 
     /**