Monarc
/
MonarcAppBO
mirror of https://github.com/monarc-project/MonarcAppBO
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/remove-db-abstract 

* origin/master:
  Added the PROJECT_ROOT definition and usage in the core lib patch.
  Updated the backoffice dependency with the 2FA fix.
  Updated the backoffice dependency with added the missing space in the sql.
  Updated the backoffice dependency with the password reset when clients' 1st user's email is changed.
  Updated the backoffice dependency with the reset 2FA feature.
  Updated the Core dependency with the fix of typcasting.
feature/remove-db-abstract
Ruslan Baidan 2023-10-18 16:30:25 +02:00
parent 856115bb7f 3d99019bfc
commit d71edc1556
2 changed files with 662 additions and 627 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1271
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

16
config/application.config.php
View File

@ -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;
defined('PROJECT_ROOT') or define('PROJECT_ROOT', __DIR__ . '/../');
if ($env !== 'testing') {
$confPaths = ['config/autoload/{,*.}{global,local}.php']; $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));
}
} }
} }