Use default value for scalars if present.

Author: weierophinney

doc/book/reflection-abstract-factory.md

@@ -36,7 +36,8 @@ The factory operates with the following constraints/features:
   application "config" service (i.e., the merged configuration).
 - Parameters typehinted against array, but not named `$config`, will
   be injected with an empty array.
-- Scalar parameters will result in the factory raising an exception.
+- Scalar parameters will result in the factory raising an exception,
+  unless a default value is present; if it is, that value will be used.
 - If a service cannot be found for a given typehint, the factory will
   raise an exception detailing this.
 

src/AbstractFactory/ReflectionBasedAbstractFactory.php

@@ -49,7 +49,8 @@
  *   application "config" service (i.e., the merged configuration).
  * - Parameters type-hinted against array, but not named `$config` will
  *   be injected with an empty array.
- * - Scalar parameters will result in an exception being thrown.
+ * - Scalar parameters will result in an exception being thrown, unless
+ *   a default value is present; if the default is present, that will be used.
  * - If a service cannot be found for a given typehint, the factory will
  *   raise an exception detailing this.
  * - Some services provided by Zend Framework components do not have
@@ -202,12 +203,16 @@ private function resolveParameter(ReflectionParameter $parameter, ContainerInter
         }
 
         if (! $parameter->getClass()) {
-            throw new ServiceNotFoundException(sprintf(
-                'Unable to create service "%s"; unable to resolve parameter "%s" '
-                . 'to a class, interface, or array type',
-                $requestedName,
-                $parameter->getName()
-            ));
+            if (! $parameter->isDefaultValueAvailable()) {
+                throw new ServiceNotFoundException(sprintf(
+                    'Unable to create service "%s"; unable to resolve parameter "%s" '
+                    . 'to a class, interface, or array type',
+                    $requestedName,
+                    $parameter->getName()
+                ));
+            }
+
+            return $parameter->getDefaultValue();
         }
 
         $type = $parameter->getClass()->getName();

test/AbstractFactory/ReflectionBasedAbstractFactoryTest.php

@@ -146,4 +146,13 @@ public function testFactoryCanSupplyAMixOfParameterTypes()
         $this->assertSame($sample, $instance->sample);
         $this->assertSame($validators, $instance->validators);
     }
+
+    public function testFactoryWillUseDefaultValueWhenPresentForScalarArgument()
+    {
+        $this->container->has('config')->willReturn(false);
+        $factory = new ReflectionBasedAbstractFactory();
+        $instance = $factory($this->container->reveal(), TestAsset\ClassWithScalarDependencyDefiningDefaultValue::class);
+        $this->assertInstanceOf(TestAsset\ClassWithScalarDependencyDefiningDefaultValue::class, $instance);
+        $this->assertEquals('bar', $instance->foo);
+    }
 }

test/AbstractFactory/TestAsset/ClassWithScalarDependencyDefiningDefaultValue.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-servicemanager for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\ServiceManager\AbstractFactory\TestAsset;
+
+class ClassWithScalarDependencyDefiningDefaultValue
+{
+    public $foo;
+
+    /**
+     * @param string $foo
+     */
+    public function __construct($foo = 'bar')
+    {
+        $this->foo = $foo;
+    }
+}