Skip to content

Commit

Permalink
Update configs
Browse files Browse the repository at this point in the history
  • Loading branch information
@rustamwin
rustamwin committed Mar 10, 2021
1 parent dd15a38 commit ee46dbd
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 75 deletions.
146 changes: 73 additions & 73 deletions config/packages/merge_plan.php
View file
Expand Up @@ -9,28 +9,22 @@
'config/params.php',
'?config/params-local.php',
],
'yiisoft/yii-web' => [
'config/params.php',
],
'yiisoft/yii-view' => [
'config/params.php',
],
'yiisoft/yii-debug-api' => [
'config/params.php',
],
'yiisoft/yii-debug' => [
'config/params.php',
],
'yiisoft/yii-console' => [
'yiisoft/view' => [
'config/params.php',
],
'yiisoft/yii-bulma' => [
'yiisoft/yii-console' => [
'config/params.php',
],
'yiisoft/view' => [
'yiisoft/assets' => [
'config/params.php',
],
'yiisoft/session' => [
'yiisoft/yii-web' => [
'config/params.php',
],
'yiisoft/router-fastroute' => [
Expand All @@ -42,13 +36,19 @@
'yiisoft/log-target-file' => [
'config/params.php',
],
'yiisoft/csrf' => [
'yiisoft/cache-file' => [
'config/params.php',
],
'yiisoft/cache-file' => [
'yiisoft/yii-view' => [
'config/params.php',
],
'yiisoft/assets' => [
'yiisoft/yii-bulma' => [
'config/params.php',
],
'yiisoft/session' => [
'config/params.php',
],
'yiisoft/csrf' => [
'config/params.php',
],
'yiisoft/aliases' => [
Expand All @@ -59,19 +59,13 @@
'/' => [
'config/common/*.php',
],
'yiisoft/yii-filesystem' => [
'config/common.php',
],
'yiisoft/yii-event' => [
'config/common.php',
],
'yiisoft/yii-debug' => [
'config/common.php',
],
'yiisoft/view' => [
'config/common.php',
],
'yiisoft/validator' => [
'yiisoft/yii-event' => [
'config/common.php',
],
'yiisoft/router-fastroute' => [
Expand All @@ -80,6 +74,9 @@
'yiisoft/router' => [
'config/common.php',
],
'yiisoft/validator' => [
'config/common.php',
],
'yiisoft/profiler' => [
'config/common.php',
],
Expand All @@ -92,6 +89,9 @@
'yiisoft/cache' => [
'config/common.php',
],
'yiisoft/yii-filesystem' => [
'config/common.php',
],
'yiisoft/aliases' => [
'config/common.php',
],
Expand All @@ -101,59 +101,73 @@
'$common',
'config/web/*.php',
],
'yiisoft/yii-web' => [
'yiisoft/yii-debug-api' => [
'config/web.php',
],
'yiisoft/yii-view' => [
'yiisoft/data-response' => [
'config/web.php',
],
'yiisoft/yii-event' => [
'yiisoft/yii-debug' => [
'config/web.php',
],
'yiisoft/yii-debug-api' => [
'yiisoft/view' => [
'config/web.php',
],
'yiisoft/yii-debug' => [
'yiisoft/yii-event' => [
'config/web.php',
],
'yiisoft/yii-bulma' => [
'config/web/*.php',
'yiisoft/assets' => [
'config/web.php',
],
'yiisoft/view' => [
'yiisoft/yii-web' => [
'config/web.php',
],
'yiisoft/session' => [
'yiisoft/middleware-dispatcher' => [
'config/web.php',
],
'yiisoft/router-fastroute' => [
'config/web.php',
],
'yiisoft/middleware-dispatcher' => [
'yiisoft/yii-view' => [
'config/web.php',
],
'yiisoft/error-handler' => [
'yiisoft/yii-bulma' => [
'config/web/*.php',
],
'yiisoft/session' => [
'config/web.php',
],
'yiisoft/data-response' => [
'yiisoft/error-handler' => [
'config/web.php',
],
'yiisoft/csrf' => [
'config/web.php',
],
'yiisoft/assets' => [
'config/web.php',
],
'providers' => [
'/' => [
'config/providers.php',
],
'yiisoft/yii-debug' => [
'config/providers.php',
],
'yiisoft/widget' => [
'config/providers.php',
],
'yiisoft/yii-filesystem' => [
'config/providers.php',
],
],
'events-web' => [
'/' => [
'$events',
'config/events-web.php',
],
'yiisoft/yii-event' => [
'$events',
'yiisoft/yii-debug' => [
'config/events-web.php',
],
'yiisoft/yii-debug' => [
'yiisoft/yii-event' => [
'$events',
'config/events-web.php',
],
'yiisoft/profiler' => [
Expand All @@ -163,63 +177,57 @@
'config/events-web.php',
],
],
'providers' => [
'/' => [
'config/providers.php',
],
'yiisoft/yii-filesystem' => [
'config/providers.php',
],
'tests' => [
'yiisoft/yii-debug' => [
'config/providers.php',
'config/tests.php',
],
'yiisoft/widget' => [
'config/providers.php',
'yiisoft/yii-web' => [
'$web',
],
],
'console' => [
'/' => [
'$common',
'config/console/*.php',
],
'yiisoft/yii-event' => [
'config/console.php',
],
'yiisoft/yii-debug' => [
'config/console.php',
],
'yiisoft/yii-console' => [
'config/console.php',
],
],
'providers-console' => [
'/' => [
'$providers',
'config/providers-console.php',
],
'yiisoft/yii-console' => [
'config/providers-console.php',
'yiisoft/yii-event' => [
'config/console.php',
],
],
'tests' => [
'yiisoft/yii-web' => [
'$web',
'events' => [
'/' => [
'config/events.php',
],
'yiisoft/yii-debug' => [
'config/tests.php',
'yiisoft/yii-event' => [
'config/events.php',
],
],
'events-console' => [
'/' => [
'$events',
'config/events-console.php',
],
'yiisoft/yii-debug' => [
'config/events-console.php',
],
'yiisoft/yii-event' => [
'$events',
'config/events-console.php',
],
'yiisoft/yii-debug' => [
'config/events-console.php',
],
'providers-console' => [
'/' => [
'$providers',
'config/providers-console.php',
],
'yiisoft/yii-console' => [
'config/providers-console.php',
],
],
'routes' => [
Expand All @@ -239,12 +247,4 @@
'config/providers-web.php',
],
],
'events' => [
'/' => [
'config/events.php',
],
'yiisoft/yii-event' => [
'config/events.php',
],
],
];
2 changes: 1 addition & 1 deletion config/packages/yiisoft/profiler/config/common.php
View file
Expand Up @@ -35,7 +35,7 @@
},
FileTarget::class => static function (Aliases $aliases) use ($params) {
$params = $params['yiisoft/profiler']['targets'][FileTarget::class];
$target = new FileTarget($aliases->get($params['filename']), $params['directoryMode']);
$target = new FileTarget($aliases->get($params['filename']), $params['requestBeginTime'], $params['directoryMode']);

if ((bool)$params['enabled']) {
$target = $target->enable();
Expand Down
2 changes: 1 addition & 1 deletion config/packages/yiisoft/profiler/config/dist/common.php
View file
Expand Up @@ -35,7 +35,7 @@
},
FileTarget::class => static function (Aliases $aliases) use ($params) {
$params = $params['yiisoft/profiler']['targets'][FileTarget::class];
$target = new FileTarget($aliases->get($params['filename']), $params['directoryMode']);
$target = new FileTarget($aliases->get($params['filename']), $params['requestBeginTime'], $params['directoryMode']);

if ((bool)$params['enabled']) {
$target = $target->enable();
Expand Down
1 change: 1 addition & 0 deletions config/packages/yiisoft/profiler/config/dist/params.php
View file
Expand Up @@ -19,6 +19,7 @@
'include' => [],
'exclude' => [],
'enabled' => false,
'requestBeginTime' => $_SERVER['REQUEST_TIME_FLOAT'],
'filename' => '@runtime/profiling/{date}-{time}.txt',
'directoryMode' => 0775,
],
Expand Down
1 change: 1 addition & 0 deletions config/packages/yiisoft/profiler/config/params.php
View file
Expand Up @@ -19,6 +19,7 @@
'include' => [],
'exclude' => [],
'enabled' => false,
'requestBeginTime' => $_SERVER['REQUEST_TIME_FLOAT'],
'filename' => '@runtime/profiling/{date}-{time}.txt',
'directoryMode' => 0775,
],
Expand Down

0 comments on commit ee46dbd

Please sign in to comment.