Skip to content
This repository has been archived by the owner on May 16, 2024. It is now read-only.

Commit

Permalink
Apply fixes from StyleCI (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
astroanu authored Mar 8, 2018
1 parent 9876ba0 commit d076c77
Show file tree
Hide file tree
Showing 15 changed files with 275 additions and 278 deletions.
2 changes: 1 addition & 1 deletion bootstrap/app.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

$app = new Collejo\App\Foundation\Application(
realpath(__DIR__ . '/../')
realpath(__DIR__.'/../')
);

$app->singleton(
Expand Down
3 changes: 1 addition & 2 deletions config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
*/

'providers' => [

],

/*
Expand All @@ -138,7 +138,6 @@

'aliases' => [


],

];
14 changes: 7 additions & 7 deletions config/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/

'defaults' => [
'guard' => 'web',
'guard' => 'web',
'passwords' => 'users',
],

Expand All @@ -37,12 +37,12 @@

'guards' => [
'web' => [
'driver' => 'session',
'driver' => 'session',
'provider' => 'users',
],

'api' => [
'driver' => 'token',
'driver' => 'token',
'provider' => 'users',
],
],
Expand All @@ -67,7 +67,7 @@
'providers' => [
'users' => [
'driver' => 'eloquent',
'model' => Collejo\App\Models\User::class,
'model' => Collejo\App\Models\User::class,
],

// 'users' => [
Expand Down Expand Up @@ -98,9 +98,9 @@
'passwords' => [
'users' => [
'provider' => 'users',
'email' => 'auth.emails.password',
'table' => 'password_resets',
'expire' => 60,
'email' => 'auth.emails.password',
'table' => 'password_resets',
'expire' => 60,
],
],

Expand Down
10 changes: 5 additions & 5 deletions config/broadcasting.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
'connections' => [

'pusher' => [
'driver' => 'pusher',
'key' => env('PUSHER_KEY'),
'secret' => env('PUSHER_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'driver' => 'pusher',
'key' => env('PUSHER_KEY'),
'secret' => env('PUSHER_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
//
],
],

'redis' => [
'driver' => 'redis',
'driver' => 'redis',
'connection' => 'default',
],

Expand Down
14 changes: 7 additions & 7 deletions config/cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,29 @@
],

'database' => [
'driver' => 'database',
'table' => 'cache',
'driver' => 'database',
'table' => 'cache',
'connection' => null,
],

'file' => [
'driver' => 'file',
'path' => storage_path('framework/cache'),
'path' => storage_path('framework/cache'),
],

'memcached' => [
'driver' => 'memcached',
'driver' => 'memcached',
'servers' => [
[
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
'weight' => 100,
],
],
],

'redis' => [
'driver' => 'redis',
'driver' => 'redis',
'connection' => 'default',
],

Expand Down
260 changes: 130 additions & 130 deletions config/clockwork.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,135 +2,135 @@

return [

/*
|--------------------------------------------------------------------------
| Enable Clockwork
|--------------------------------------------------------------------------
|
| You can explicitly enable or disable Clockwork here. When enabled, special
| headers for communication with the Clockwork Chrome extension will be
| included in your application responses and requests data will be available
| at /__clockwork url.
| When set to null, Clockwork behavior is controlled by app.debug setting.
| Default: null
|
*/

'enable' => null,

/*
|--------------------------------------------------------------------------
| Enable data collection, when Clockwork is disabled
|--------------------------------------------------------------------------
|
| This setting controls, whether data about application requests will be
| recorded even when Clockwork is disabled (useful for later analysis).
| Default: false
|
*/

'collect_data_always' => false,

/*
|--------------------------------------------------------------------------
| Metadata storage
|--------------------------------------------------------------------------
|
| You can configure how are the metadata collected by Clockwork stored.
| Valid options are: files or sql.
| Files storage stores the metadata in one-per-request files in a specified
| directory.
| Sql storage stores the metadata as rows in a sql database. You can specify
| the database by name if defined in database.php or by path to Sqlite
| database. Database table will be automatically created.
| Sql storage requires PDO.
|
*/

'storage' => 'files',

'storage_files_path' => storage_path('clockwork'),

'storage_sql_database' => storage_path('clockwork.sqlite'),
'storage_sql_table' => 'clockwork',

/*
|--------------------------------------------------------------------------
| Filter collected data
|--------------------------------------------------------------------------
|
| You can filter collected data by specifying what you don't want to collect
| here.
|
*/

'filter' => [
'routes', // collecting routes data on every request might use a lot of disk space
'viewsData', // collecting views data, including all variables passed to the view on every request might use a lot of disk space
],

/*
|--------------------------------------------------------------------------
| Disable data collection for certain URIs
|--------------------------------------------------------------------------
|
| You can disable data collection for specific URIs by adding matching
| regular expressions here.
|
*/

'filter_uris' => [
'/__clockwork/.*', // disable collecting data for clockwork-web assets
],

/*
|--------------------------------------------------------------------------
| Additional data sources
|--------------------------------------------------------------------------
|
| You can use this option to register additional data sources with Clockwork.
| Keys specify the name under which the data source will be registered in the
| IoC container, values are closures accepting Laravel application instance as
| the only argument and returning an instance of the data source.
|
*/

'additional_data_sources' => [
// Note, this is for example only, laravel-doctrine contains Clockwork support out of the box, please follow the
// documentation at http://www.laraveldoctrine.org/docs/current/orm/config-file

// 'clockwork.doctrine' => function($app)
// {
// return new \Clockwork\DataSource\DoctrineDataSource($app['Doctrine\ORM\EntityManager']);
// }
],

/*
|--------------------------------------------------------------------------
| Register helpers
|--------------------------------------------------------------------------
|
| This setting controls whether the "clock" helper function will be registered. You can use the "clock" function to
| quickly log something to Clockwork or access the Clockwork instance.
|
*/

'register_helpers' => true,

/*
|--------------------------------------------------------------------------
| Send Headers for AJAX request
|--------------------------------------------------------------------------
|
| When trying to collect data the AJAX method can sometimes fail if it is
| missing required headers. For example, an API might require a version
| number using Accept headers to route the HTTP request to the correct
| codebase.
|
*/

'headers' => [
// 'Accept' => 'application/vnd.com.whatever.v1+json',
]
/*
|--------------------------------------------------------------------------
| Enable Clockwork
|--------------------------------------------------------------------------
|
| You can explicitly enable or disable Clockwork here. When enabled, special
| headers for communication with the Clockwork Chrome extension will be
| included in your application responses and requests data will be available
| at /__clockwork url.
| When set to null, Clockwork behavior is controlled by app.debug setting.
| Default: null
|
*/

'enable' => null,

/*
|--------------------------------------------------------------------------
| Enable data collection, when Clockwork is disabled
|--------------------------------------------------------------------------
|
| This setting controls, whether data about application requests will be
| recorded even when Clockwork is disabled (useful for later analysis).
| Default: false
|
*/

'collect_data_always' => false,

/*
|--------------------------------------------------------------------------
| Metadata storage
|--------------------------------------------------------------------------
|
| You can configure how are the metadata collected by Clockwork stored.
| Valid options are: files or sql.
| Files storage stores the metadata in one-per-request files in a specified
| directory.
| Sql storage stores the metadata as rows in a sql database. You can specify
| the database by name if defined in database.php or by path to Sqlite
| database. Database table will be automatically created.
| Sql storage requires PDO.
|
*/

'storage' => 'files',

'storage_files_path' => storage_path('clockwork'),

'storage_sql_database' => storage_path('clockwork.sqlite'),
'storage_sql_table' => 'clockwork',

/*
|--------------------------------------------------------------------------
| Filter collected data
|--------------------------------------------------------------------------
|
| You can filter collected data by specifying what you don't want to collect
| here.
|
*/

'filter' => [
'routes', // collecting routes data on every request might use a lot of disk space
'viewsData', // collecting views data, including all variables passed to the view on every request might use a lot of disk space
],

/*
|--------------------------------------------------------------------------
| Disable data collection for certain URIs
|--------------------------------------------------------------------------
|
| You can disable data collection for specific URIs by adding matching
| regular expressions here.
|
*/

'filter_uris' => [
'/__clockwork/.*', // disable collecting data for clockwork-web assets
],

/*
|--------------------------------------------------------------------------
| Additional data sources
|--------------------------------------------------------------------------
|
| You can use this option to register additional data sources with Clockwork.
| Keys specify the name under which the data source will be registered in the
| IoC container, values are closures accepting Laravel application instance as
| the only argument and returning an instance of the data source.
|
*/

'additional_data_sources' => [
// Note, this is for example only, laravel-doctrine contains Clockwork support out of the box, please follow the
// documentation at http://www.laraveldoctrine.org/docs/current/orm/config-file

// 'clockwork.doctrine' => function($app)
// {
// return new \Clockwork\DataSource\DoctrineDataSource($app['Doctrine\ORM\EntityManager']);
// }
],

/*
|--------------------------------------------------------------------------
| Register helpers
|--------------------------------------------------------------------------
|
| This setting controls whether the "clock" helper function will be registered. You can use the "clock" function to
| quickly log something to Clockwork or access the Clockwork instance.
|
*/

'register_helpers' => true,

/*
|--------------------------------------------------------------------------
| Send Headers for AJAX request
|--------------------------------------------------------------------------
|
| When trying to collect data the AJAX method can sometimes fail if it is
| missing required headers. For example, an API might require a version
| number using Accept headers to route the HTTP request to the correct
| codebase.
|
*/

'headers' => [
// 'Accept' => 'application/vnd.com.whatever.v1+json',
],

];
Loading

0 comments on commit d076c77

Please sign in to comment.