Fix container resolution of default values for non-scalar dependencies.

taylorotwell · taylorotwell · commit ea99e13e194d · 2013-07-31T09:49:48.000-05:00
diff --git a/src/Illuminate/Container/Container.php b/src/Illuminate/Container/Container.php
@@ -348,7 +348,7 @@ protected function getDependencies($parameters)
 			}
 			else
 			{
-				$dependencies[] = $this->make($dependency->name);
+				$dependencies[] = $this->resolveClass($parameter);
 			}
 		}
 
@@ -375,6 +375,35 @@ protected function resolveNonClass(ReflectionParameter $parameter)
 		}
 	}
 
+	/**
+	 * Resolve a class based dependency from the container.
+	 *
+	 * @param  \ReflectionParameter  $parameter
+	 * @return mixed
+	 */
+	protected function resolveClass(ReflectionParameter $parameter)
+	{
+		try
+		{
+			return $this->make($parameter->getClass()->name);
+		}
+
+		// If we can not resolve the class instance, we will check to see if the value
+		// is optional, and if it is we will return the optional parameter value as
+		// the value of the dependency, similarly to how we do this with scalars.
+		catch (BindingResolutionException $e)
+		{
+			if ($parameter->isOptional())
+			{
+				return $parameter->getDefaultValue();
+			}
+			else
+			{
+				throw $e;
+			}
+		}
+	}
+
 	/**
 	 * Register a new resolving callback.
 	 *
diff --git a/src/Illuminate/Foundation/changes.json b/src/Illuminate/Foundation/changes.json
@@ -26,6 +26,7 @@
 		{"message": "Restore method on Eloquent models now fires restoring and restored events.", "backport": null},
 		{"message": "Fixed re-population of radio buttons and checkboxes in FormBuilder.", "backport": null},
 		{"message": "Postgres ENUMs are now more truly implemented using 'check' constraints.", "backport": null},
-		{"message": "Added selectMonth and selectYear to FormBuilder.", "backport": null}
+		{"message": "Added selectMonth and selectYear to FormBuilder.", "backport": null},
+		{"message": "Fix container resolution of default values for non-scalar dependencies.", "backport": null}
 	]
 }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`{"message": "Restore method on Eloquent models now fires restoring and restored events.", "backport": null},`
`27`	`27`	`{"message": "Fixed re-population of radio buttons and checkboxes in FormBuilder.", "backport": null},`
`28`	`28`	`{"message": "Postgres ENUMs are now more truly implemented using 'check' constraints.", "backport": null},`
`29`		`- {"message": "Added selectMonth and selectYear to FormBuilder.", "backport": null}`
	`29`	`+ {"message": "Added selectMonth and selectYear to FormBuilder.", "backport": null},`
	`30`	`+ {"message": "Fix container resolution of default values for non-scalar dependencies.", "backport": null}`
`30`	`31`	`]`
`31`	`32`	`}`