diff --git a/laravel/core.php b/laravel/core.php index a2170611..784f65d9 100644 --- a/laravel/core.php +++ b/laravel/core.php @@ -171,9 +171,9 @@ Request::$foundation = RequestFoundation::createFromGlobals(); 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()); } @@ -240,4 +240,4 @@ $bundles = require path('app').'bundles'.EXT; foreach ($bundles as $bundle => $config) { Bundle::register($bundle, $config); -} \ No newline at end of file +} diff --git a/laravel/log.php b/laravel/log.php index f2b2b3f8..88477a69 100644 --- a/laravel/log.php +++ b/laravel/log.php @@ -33,14 +33,21 @@ class Log { * * // Write an "error" message using the class' magic method * 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 * * * @param string $type * @param string $message * @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 // to the event and not write to the log files. This allows for quick // swapping of log implementations for debugging. @@ -75,11 +82,18 @@ class Log { * * // Write a "warning" message to the log file * 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 * */ 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 diff --git a/laravel/profiling/profiler.css b/laravel/profiling/profiler.css index cbc96429..d8aad39f 100755 --- a/laravel/profiling/profiler.css +++ b/laravel/profiling/profiler.css @@ -13,6 +13,7 @@ right:0 !important; width:100%; z-index: 9999 !important; + color: #000; } .anbu-tabs