Skip to content

Commit

Permalink
Merge pull request #41 from viralsolani/analysis-qrQ3o1
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
viralsolani committed Nov 26, 2017
2 parents 18da374 + 51cfd46 commit 3ef5087
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 22 deletions.
22 changes: 11 additions & 11 deletions config/debugbar.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
|
| Debugbar is enabled by default, when debug is set to true in app.php.
| You can override the value by setting enable to true or false instead of null.
|
|
| You can provide an array of URI's that must be ignored (eg. 'api/*')
|
*/

'enabled' => env('DEBUGBAR_ENABLED', null),
'except' => [
'except' => [
//
],

Expand All @@ -36,7 +36,7 @@
'driver' => 'file', // redis, file, pdo, custom
'path' => storage_path('debugbar'), // For file driver
'connection' => null, // Leave null for default connection (Redis/PDO)
'provider' => '' // Instance of StorageInterface for custom driver
'provider' => '', // Instance of StorageInterface for custom driver
],

/*
Expand Down Expand Up @@ -66,7 +66,7 @@
| Optionally, you can also send ServerTiming headers on ajax requests for the Chrome DevTools.
*/

'capture_ajax' => true,
'capture_ajax' => true,
'add_ajax_timing' => false,

/*
Expand All @@ -79,7 +79,7 @@
|
*/
'error_handler' => false,

/*
|--------------------------------------------------------------------------
| Clockwork integration
Expand Down Expand Up @@ -141,26 +141,26 @@
'with_params' => true, // Render SQL with the parameters substituted
'backtrace' => true, // Use a backtrace to find the origin of the query in your files.
'timeline' => false, // Add the queries to the timeline
'explain' => [ // Show EXPLAIN output on queries
'explain' => [ // Show EXPLAIN output on queries
'enabled' => false,
'types' => ['SELECT'], // ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+
'types' => ['SELECT'], // ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+
],
'hints' => true, // Show hints for common mistakes
],
'mail' => [
'full_log' => false
'full_log' => false,
],
'views' => [
'data' => false, //Note: Can slow down the application, because the data can be quite large..
],
'route' => [
'label' => true // show complete route on bar
'label' => true, // show complete route on bar
],
'logs' => [
'file' => null
'file' => null,
],
'cache' => [
'values' => true // collect cache values
'values' => true, // collect cache values
],
],

Expand Down
3 changes: 1 addition & 2 deletions config/generators.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

'view_template_path' => base_path('vendor/xethron/laravel-4-generators/src/Way/Generators/templates/view.txt'),


/*
|--------------------------------------------------------------------------
| Where the generated files will be saved...
Expand All @@ -37,6 +36,6 @@

'seed_target_path' => base_path('database/seeds'),

'view_target_path' => base_path('resources/views')
'view_target_path' => base_path('resources/views'),

];
18 changes: 9 additions & 9 deletions config/trustedproxy.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
* Or, to trust all proxies that connect
* directly to your server, uncomment this:
*/
# 'proxies' => '*',
// 'proxies' => '*',

/*
* Or, to trust ALL proxies, including those that
* are in a chain of forwarding, uncomment this:
*/
# 'proxies' => '**',
// 'proxies' => '**',

/*
* Default Header Names
Expand All @@ -56,16 +56,16 @@
* for them to be considered untrusted instead. Ex:
*
* Illuminate\Http\Request::HEADER_CLIENT_HOST => null,
*
*
* WARNING: If you're using AWS Elastic Load Balancing or Heroku,
* the FORWARDED and X_FORWARDED_HOST headers should be set to null
* the FORWARDED and X_FORWARDED_HOST headers should be set to null
* as they are currently unsupported there.
*/
'headers' => [
(defined('Illuminate\Http\Request::HEADER_FORWARDED') ? Illuminate\Http\Request::HEADER_FORWARDED : 'forwarded') => 'FORWARDED',
Illuminate\Http\Request::HEADER_CLIENT_IP => 'X_FORWARDED_FOR',
Illuminate\Http\Request::HEADER_CLIENT_HOST => 'X_FORWARDED_HOST',
Illuminate\Http\Request::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO',
Illuminate\Http\Request::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT',
]
Illuminate\Http\Request::HEADER_CLIENT_IP => 'X_FORWARDED_FOR',
Illuminate\Http\Request::HEADER_CLIENT_HOST => 'X_FORWARDED_HOST',
Illuminate\Http\Request::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO',
Illuminate\Http\Request::HEADER_CLIENT_PORT => 'X_FORWARDED_PORT',
],
];

0 comments on commit 3ef5087

Please sign in to comment.