Commit 43614cfe authored by Taylor Otwell's avatar Taylor Otwell

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

parents 749948bc 4d25f50f
...@@ -62,6 +62,7 @@ Command | Description ...@@ -62,6 +62,7 @@ Command | Description
`$table->string('name', 100);` | VARCHAR equivalent with a length `$table->string('name', 100);` | VARCHAR equivalent with a length
`$table->integer('votes');` | INTEGER equivalent to the table `$table->integer('votes');` | INTEGER equivalent to the table
`$table->float('amount');` | FLOAT 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->boolean('confirmed');` | BOOLEAN equivalent to the table
`$table->date('created_at');` | DATE equivalent to the table `$table->date('created_at');` | DATE equivalent to the table
`$table->timestamp('added_on');` | TIMESTAMP equivalent to the table `$table->timestamp('added_on');` | TIMESTAMP equivalent to the table
......
...@@ -159,7 +159,7 @@ class IoC { ...@@ -159,7 +159,7 @@ class IoC {
// no binding registered for the abstraction so we need to bail out. // no binding registered for the abstraction so we need to bail out.
if ( ! $reflector->isInstantiable()) if ( ! $reflector->isInstantiable())
{ {
throw new Exception("Resolution target [$type] is not instantiable."); throw new \Exception("Resolution target [$type] is not instantiable.");
} }
$constructor = $reflector->getConstructor(); $constructor = $reflector->getConstructor();
...@@ -196,7 +196,7 @@ class IoC { ...@@ -196,7 +196,7 @@ class IoC {
// we'll just bomb out with an error since we have nowhere to go. // we'll just bomb out with an error since we have nowhere to go.
if (is_null($dependency)) if (is_null($dependency))
{ {
throw new Exception("Unresolvable dependency resolving [$parameter]."); throw new \Exception("Unresolvable dependency resolving [$parameter].");
} }
$dependencies[] = static::resolve($dependency->name); $dependencies[] = static::resolve($dependency->name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment