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
a92ab1ca
Commit
a92ab1ca
authored
Apr 20, 2012
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing bugs.
parent
98ea9ac4
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
42 additions
and
24 deletions
+42
-24
driver.php
laravel/cache/drivers/driver.php
+14
-2
artisan.php
laravel/cli/artisan.php
+3
-12
core.php
laravel/core.php
+1
-9
schema.php
laravel/database/schema.php
+4
-1
helpers.php
laravel/helpers.php
+20
-0
No files found.
laravel/cache/drivers/driver.php
View file @
a92ab1ca
...
...
@@ -69,15 +69,27 @@ abstract class Driver {
* @param int $minutes
* @return mixed
*/
public
function
remember
(
$key
,
$default
,
$minutes
)
public
function
remember
(
$key
,
$default
,
$minutes
,
$function
=
'put'
)
{
if
(
!
is_null
(
$item
=
$this
->
get
(
$key
,
null
)))
return
$item
;
$this
->
put
(
$key
,
$default
=
value
(
$default
),
$minutes
);
$this
->
$function
(
$key
,
$default
=
value
(
$default
),
$minutes
);
return
$default
;
}
/**
* Get an item from the cache, or cache the default value forever.
*
* @param string $key
* @param mixed $default
* @return mixed
*/
public
function
sear
(
$key
,
$default
)
{
return
$this
->
remember
(
$key
,
$default
,
null
,
'forever'
);
}
/**
* Delete an item from the cache.
*
...
...
laravel/cli/artisan.php
View file @
a92ab1ca
...
...
@@ -16,21 +16,12 @@ Bundle::start(DEFAULT_BUNDLE);
* for the "database" CLI option. This allows migrations to be run
* conveniently for a test or staging database.
*/
if
(
isset
(
$_SERVER
[
'CLI'
][
'DB'
]))
if
(
!
is_null
(
$database
=
get_cli_option
(
'db'
)))
{
Config
::
set
(
'database.default'
,
$
_SERVER
[
'CLI'
][
'DB'
]
);
Config
::
set
(
'database.default'
,
$
database
);
}
/**
* Overwrite the HttpFoundation request since we have set some of
* the server variables since it was created. This allows us to
* set the default database for the CLI task.
*/
use
Symfony\Component\HttpFoundation\LaravelRequest
as
RequestFoundation
;
Request
::
$foundation
=
RequestFoundation
::
createFromGlobals
();
/**
* We will register all of the Laravel provided tasks inside the IoC
* container so they can be resolved by the task class. This allows
...
...
laravel/core.php
View file @
a92ab1ca
...
...
@@ -156,15 +156,7 @@ Request::$foundation = RequestFoundation::createFromGlobals();
if
(
Request
::
cli
())
{
foreach
(
Request
::
foundation
()
->
server
->
get
(
'argv'
)
as
$argument
)
{
if
(
starts_with
(
$argument
,
'--env='
))
{
$environment
=
substr
(
$argument
,
6
);
break
;
}
}
$environment
=
get_cli_option
(
'env'
);
}
else
{
...
...
laravel/database/schema.php
View file @
a92ab1ca
...
...
@@ -44,12 +44,15 @@ class Schema {
* Drop a database table from the schema.
*
* @param string $table
* @param string $connection
* @return void
*/
public
static
function
drop
(
$table
)
public
static
function
drop
(
$table
,
$connection
=
null
)
{
$table
=
new
Schema\Table
(
$table
);
$table
->
on
(
$connection
);
// To indicate that the table needs to be dropped, we will run the
// "drop" command on the table instance and pass the instance to
// the execute method as calling a Closure isn't needed.
...
...
laravel/helpers.php
View file @
a92ab1ca
...
...
@@ -505,3 +505,23 @@ function yield($section)
{
return
Laravel\Section
::
yield
(
$section
);
}
/**
* Get a CLI option from the argv $_SERVER variable.
*
* @param string $option
* @param mixed $default
* @return string
*/
function
get_cli_option
(
$option
,
$default
=
null
)
{
foreach
(
Laravel\Request
::
foundation
()
->
server
->
get
(
'argv'
)
as
$argument
)
{
if
(
starts_with
(
$argument
,
"--
{
$option
}
="
))
{
return
substr
(
$argument
,
strlen
(
$option
)
+
3
);
}
}
return
value
(
$default
);
}
\ No newline at end of file
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