jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

improve configurations for usage in multi-environment setups (#1775)

Browse Source
This commit is contained in:
Kevin Papst
2020-06-11 01:26:57 +02:00
committed by GitHub
parent 57b4473bc8
commit 21d8e8bbb8
17 changed files with 66 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Kernel.php
View File

@@ -98,6 +98,23 @@ class Kernel extends BaseKernel
}
}
if ($this->environment === 'test' && getenv('TEST_WITH_BUNDLES') === false) {
return;
}
// we can either define all kimai bundles hardcoded ...
if (is_file($this->getProjectDir() . '/config/bundles-local.php')) {
$contents = require $this->getProjectDir() . '/config/bundles-local.php';
foreach ($contents as $class => $envs) {
if (isset($envs['all']) || isset($envs[$this->environment])) {
yield new $class();
}
}
return;
}
// ... or we load them dynamically from the plugins directory
foreach ($this->getBundleDirectories() as $bundleDir) {
$bundleName = $bundleDir->getRelativePathname();
$pluginClass = 'KimaiPlugin\\' . $bundleName . '\\' . $bundleName;
@@ -112,10 +129,6 @@ class Kernel extends BaseKernel
return [];
}
if ($this->environment === 'test' && getenv('TEST_WITH_BUNDLES') === false) {
return [];
}
$directories = [];
$finder = new Finder();
$finder->ignoreUnreadableDirs()->directories()->name('*Bundle');
@@ -207,9 +220,10 @@ class Kernel extends BaseKernel
// load application routes
$routes->import($confDir . '/routes' . self::CONFIG_EXTS, '/', 'glob');
/** @var SplFileInfo $bundleDir */
foreach ($this->getBundleDirectories() as $bundleDir) {
$routes->import($bundleDir->getRealPath() . '/Resources/config/routes' . self::CONFIG_EXTS, '/', 'glob');
foreach ($this->bundles as $bundle) {
if (strpos(\get_class($bundle), 'KimaiPlugin\\') !== false) {
$routes->import($bundle->getPath() . '/Resources/config/routes' . self::CONFIG_EXTS, '/', 'glob');
}
}
}