Merge branch 'develop' of github.com:laravel/laravel into develop

taylorotwell · taylorotwell · commit 43614cfeb9b6 · 2012-08-09T22:50:22.000-05:00
diff --git a/laravel/documentation/database/schema.md b/laravel/documentation/database/schema.md
@@ -62,6 +62,7 @@ Command  | Description
 `$table->string('name', 100);`  |  VARCHAR equivalent with a length
 `$table->integer('votes');`  |  INTEGER equivalent to the table
 `$table->float('amount');`  |  FLOAT equivalent to the table
+`$table->decimal('amount', 5, 2);`  |  DECIMAL equivalent with a precision and scale
 `$table->boolean('confirmed');`  |  BOOLEAN equivalent to the table
 `$table->date('created_at');`  |  DATE equivalent to the table
 `$table->timestamp('added_on');`  |  TIMESTAMP equivalent to the table
diff --git a/laravel/ioc.php b/laravel/ioc.php
@@ -159,7 +159,7 @@ protected static function build($type, $parameters = array())
 		// no binding registered for the abstraction so we need to bail out.
 		if ( ! $reflector->isInstantiable())
 		{
-			throw new Exception("Resolution target [$type] is not instantiable.");
+			throw new \Exception("Resolution target [$type] is not instantiable.");
 		}
 
 		$constructor = $reflector->getConstructor();
@@ -196,7 +196,7 @@ protected static function dependencies($parameters)
 			// we'll just bomb out with an error since we have nowhere to go.
 			if (is_null($dependency))
 			{
-				throw new Exception("Unresolvable dependency resolving [$parameter].");
+				throw new \Exception("Unresolvable dependency resolving [$parameter].");
 			}
 
 			$dependencies[] = static::resolve($dependency->name);

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ protected static function build($type, $parameters = array())`
`159`	`159`	`// no binding registered for the abstraction so we need to bail out.`
`160`	`160`	`if ( ! $reflector->isInstantiable())`
`161`	`161`	`{`
`162`		`- throw new Exception("Resolution target [$type] is not instantiable.");`
	`162`	`+ throw new \Exception("Resolution target [$type] is not instantiable.");`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`$constructor = $reflector->getConstructor();`
`@@ -196,7 +196,7 @@ protected static function dependencies($parameters)`
`196`	`196`	`// we'll just bomb out with an error since we have nowhere to go.`
`197`	`197`	`if (is_null($dependency))`
`198`	`198`	`{`
`199`		`- throw new Exception("Unresolvable dependency resolving [$parameter].");`
	`199`	`+ throw new \Exception("Unresolvable dependency resolving [$parameter].");`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`$dependencies[] = static::resolve($dependency->name);`