Added the PROJECT_ROOT definition and usage in the core lib patch.
parent
5d92aa8aa5
commit
3d99019bfc
File diff suppressed because it is too large
Load Diff
|
@ -6,17 +6,23 @@
|
||||||
* @see https://github.com/zendframework/ZFTool
|
* @see https://github.com/zendframework/ZFTool
|
||||||
*/
|
*/
|
||||||
$env = getenv('APP_ENV') ?: 'production';
|
$env = getenv('APP_ENV') ?: 'production';
|
||||||
$appConfDir = getenv('APP_CONF_DIR') ?: '';
|
$appConfDir = getenv('APP_CONF_DIR') ?: null;
|
||||||
|
|
||||||
$confPaths = ['config/autoload/{,*.}{global,local}.php'];
|
defined('PROJECT_ROOT') or define('PROJECT_ROOT', __DIR__ . '/../');
|
||||||
|
|
||||||
|
if ($env !== 'testing') {
|
||||||
|
$confPaths = ['config/autoload/{,*.}{global,local}.php'];
|
||||||
|
}
|
||||||
$dataPath = 'data';
|
$dataPath = 'data';
|
||||||
if (!empty($appConfDir)) {
|
if (!empty($appConfDir)) {
|
||||||
$confPaths[] = $appConfDir . '/local.php';
|
$confPaths[] = $appConfDir . '/local.php';
|
||||||
$dataPath = $appConfDir . '/data';
|
$dataPath = $appConfDir . '/data';
|
||||||
if (!is_dir($dataPath . '/cache')
|
if (!is_dir($dataPath . '/cache')) {
|
||||||
&& !mkdir($concurrentDirectory = $dataPath . '/cache') && !is_dir($concurrentDirectory)
|
if (is_dir(PROJECT_ROOT . 'data/cache')) {
|
||||||
) {
|
$dataPath = PROJECT_ROOT . 'data';
|
||||||
throw new RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
|
} elseif (!mkdir($concurrentDirectory = $dataPath . '/cache') && !is_dir($concurrentDirectory)) {
|
||||||
|
throw new \RuntimeException(sprintf('Directory "%s" was not created', $concurrentDirectory));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue