Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
syncEnrollments
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Yeray Santana Hualde
syncEnrollments
Commits
43614cfe
Commit
43614cfe
authored
Aug 10, 2012
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of github.com:laravel/laravel into develop
parents
749948bc
4d25f50f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
schema.md
laravel/documentation/database/schema.md
+1
-0
ioc.php
laravel/ioc.php
+2
-2
No files found.
laravel/documentation/database/schema.md
View file @
43614cfe
...
@@ -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
...
...
laravel/ioc.php
View file @
43614cfe
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment