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

This commit is contained in:
Taylor Otwell 2012-08-09 22:50:22 -05:00
commit 43614cfeb9
2 changed files with 3 additions and 2 deletions

View File

@ -62,6 +62,7 @@ ## Adding Columns
`$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

View File

@ -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);