ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Taylor Otwell
2012-08-09 22:50:22 -05:00
parent 749948bc9d 4d25f50f4b
commit 43614cfeb9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
laravel/documentation/database/schema.md
View File

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

4
laravel/ioc.php
View File

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