Merge pull request #30 from KNonen/master

fix bug: "Argument of type NULL should have been an array" when argument is optional

Author: matthiasnoback

ArgumentValidator.php

@@ -31,6 +31,9 @@ public function __construct(
     public function validate(\ReflectionParameter $parameter, $argument)
     {
         if ($parameter->isArray()) {
+            if ($parameter->allowsNull() && is_null($argument)) {
+                return;
+            }
             $this->validateArrayArgument($argument);
         } elseif ($parameter->getClass()) {
             $this->validateObjectArgument($parameter->getClass()->getName(), $argument, $parameter->allowsNull());

Tests/ArgumentValidatorTest.php

@@ -84,6 +84,22 @@ public function testFailsWhenParameterHasArrayTypeHintButArgumentIsNotArray()
         $validator->validate($parameter, $argument);
     }
 
+    public function testFailsWhenOptionalParameterHasArrayTypeHintAndResultOfExpressionIsNullButNullIsNotAllowed()
+    {
+        $class = 'Matthias\SymfonyServiceDefinitionValidator\Tests\Fixtures\ClassWithOptionalArrayConstructorArgument';
+
+        $parameter = new \ReflectionParameter(array($class, '__construct'), 'options');
+        $argument = null;
+
+        $validator = new ArgumentValidator(new ContainerBuilder(), $this->createMockResultingClassResolver());
+
+        try {
+            $validator->validate($parameter, $argument);
+        } catch (TypeHintMismatchException $exception) {
+            $this->fail('null argument should be allowed');
+        }
+    }
+
     public function testFailsWhenResultOfExpressionIsNotAnObjectOfTheExpectedClass()
     {
         $this->skipTestIfExpressionsAreNotAvailable();

Tests/Fixtures/ClassWithOptionalArrayConstructorArgument.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Matthias\SymfonyServiceDefinitionValidator\Tests\Fixtures;
+
+class ClassWithOptionalArrayConstructorArgument
+{
+    public function __construct(array $options = null)
+    {
+    }
+}