Release 2.17 (#4836)

see https://github.com/kimai/kimai/pull/4836
This commit is contained in:
Kevin Papst
2024-05-19 17:42:03 +02:00
committed by GitHub
parent 5f7114e008
commit 0c445d1bc4
41 changed files with 318 additions and 307 deletions

View File

@@ -60,7 +60,7 @@ class Kernel extends BaseKernel
}
}
if ($this->environment === 'test' && getenv('TEST_WITH_BUNDLES') === false) {
if ($this->environment === 'test') {
return;
}
@@ -145,7 +145,7 @@ class Kernel extends BaseKernel
$loader->load($file->getPathname());
}
if (is_file($confDir . '/packages/local.yaml')) {
if ($this->environment !== 'test' && is_file($confDir . '/packages/local.yaml')) {
$loader->load($confDir . '/packages/local.yaml');
}
$loader->load($confDir . '/services' . self::CONFIG_EXTS, 'glob');