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
abff7d8e
Commit
abff7d8e
authored
Jan 06, 2013
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into develop
parents
cb567c5e
ff7f6f67
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
5 deletions
+20
-5
core.php
laravel/core.php
+3
-3
log.php
laravel/log.php
+16
-2
profiler.css
laravel/profiling/profiler.css
+1
-0
No files found.
laravel/core.php
View file @
abff7d8e
...
@@ -171,9 +171,9 @@ Request::$foundation = RequestFoundation::createFromGlobals();
...
@@ -171,9 +171,9 @@ Request::$foundation = RequestFoundation::createFromGlobals();
if
(
Request
::
cli
())
if
(
Request
::
cli
())
{
{
$environment
=
get_cli_option
(
'env'
);
$environment
=
get_cli_option
(
'env'
,
getenv
(
'LARAVEL_ENV'
)
);
if
(
!
isset
(
$environment
))
if
(
empty
(
$environment
))
{
{
$environment
=
Request
::
detect_env
(
$environments
,
gethostname
());
$environment
=
Request
::
detect_env
(
$environments
,
gethostname
());
}
}
...
...
laravel/log.php
View file @
abff7d8e
...
@@ -33,14 +33,21 @@ class Log {
...
@@ -33,14 +33,21 @@ class Log {
*
*
* // Write an "error" message using the class' magic method
* // Write an "error" message using the class' magic method
* Log::error('Something went horribly wrong!');
* Log::error('Something went horribly wrong!');
*
* // Log an arrays data
* Log::write('info', array('name' => 'Sawny', 'passwd' => '1234', array(1337, 21, 0)), true);
* //Result: Array ( [name] => Sawny [passwd] => 1234 [0] => Array ( [0] => 1337 [1] => 21 [2] => 0 ) )
* //If we had omit the third parameter the result had been: Array
* </code>
* </code>
*
*
* @param string $type
* @param string $type
* @param string $message
* @param string $message
* @return void
* @return void
*/
*/
public
static
function
write
(
$type
,
$message
)
public
static
function
write
(
$type
,
$message
,
$pretty_print
=
false
)
{
{
$message
=
(
$pretty_print
)
?
print_r
(
$message
,
true
)
:
$message
;
// If there is a listener for the log event, we'll delegate the logging
// If there is a listener for the log event, we'll delegate the logging
// to the event and not write to the log files. This allows for quick
// to the event and not write to the log files. This allows for quick
// swapping of log implementations for debugging.
// swapping of log implementations for debugging.
...
@@ -75,11 +82,18 @@ class Log {
...
@@ -75,11 +82,18 @@ class Log {
*
*
* // Write a "warning" message to the log file
* // Write a "warning" message to the log file
* Log::warning('This is a warning!');
* Log::warning('This is a warning!');
*
* // Log an arrays data
* Log::info(array('name' => 'Sawny', 'passwd' => '1234', array(1337, 21, 0)), true);
* //Result: Array ( [name] => Sawny [passwd] => 1234 [0] => Array ( [0] => 1337 [1] => 21 [2] => 0 ) )
* //If we had omit the second parameter the result had been: Array
* </code>
* </code>
*/
*/
public
static
function
__callStatic
(
$method
,
$parameters
)
public
static
function
__callStatic
(
$method
,
$parameters
)
{
{
static
::
write
(
$method
,
$parameters
[
0
]);
$parameters
[
1
]
=
(
empty
(
$parameters
[
1
]))
?
false
:
$parameters
[
1
];
static
::
write
(
$method
,
$parameters
[
0
],
$parameters
[
1
]);
}
}
}
}
\ No newline at end of file
laravel/profiling/profiler.css
View file @
abff7d8e
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
right
:
0
!important
;
right
:
0
!important
;
width
:
100%
;
width
:
100%
;
z-index
:
9999
!important
;
z-index
:
9999
!important
;
color
:
#000
;
}
}
.anbu-tabs
.anbu-tabs
...
...
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