mirror of
https://github.com/RaspbianFrance/raspisms.git
synced 2025-04-23 09:56:34 +02:00
Update descartes framework to improve env.php constants handling
This commit is contained in:
parent
cf4dd2f075
commit
6321899e02
7 changed files with 48 additions and 40 deletions
|
@ -21,6 +21,7 @@
|
|||
$environment = [];
|
||||
$env = [];
|
||||
|
||||
// Load descartes base env
|
||||
require_once(__DIR__ . '/env.php');
|
||||
$environment = array_merge($environment, $env);
|
||||
|
||||
|
@ -31,11 +32,8 @@
|
|||
$environment = array_merge($environment, $env);
|
||||
}
|
||||
|
||||
//Define all Descartes constants
|
||||
define_array($environment);
|
||||
|
||||
### GLOBAL ENV ###
|
||||
$environment = [];
|
||||
//Load global app env
|
||||
$env = [];
|
||||
if (file_exists(__DIR__ . '/../env.php'))
|
||||
{
|
||||
|
@ -43,19 +41,30 @@
|
|||
$environment = array_merge($environment, $env);
|
||||
}
|
||||
|
||||
define_array($environment);
|
||||
|
||||
|
||||
### SPECIFIC ENV ###
|
||||
$environment = [];
|
||||
// Load specific environment env
|
||||
$env = [];
|
||||
|
||||
if (defined('ENV') && file_exists(__DIR__ . '/../env.' . ENV . '.php'))
|
||||
if (isset($environment['ENV']) && file_exists(__DIR__ . '/../env.' . $environment['ENV'] . '.php'))
|
||||
{
|
||||
require_once(__DIR__ . '/../env.' . ENV . '.php');
|
||||
require_once(__DIR__ . '/../env.' . $environment['ENV'] . '.php');
|
||||
$environment = array_merge($environment, $env);
|
||||
}
|
||||
|
||||
### BUILD HTTP PWD CONSTS ###
|
||||
// We compute http pwd at last minute to allow for simple overriding by user
|
||||
// by simply defining custom HTTP_* (PROTOCOL, SERVER_NAME, SERVER_PORT, DIR_PATH)
|
||||
$http_pwd = $environment['HTTP_PROTOCOL'] . $environment['HTTP_SERVER_NAME'] . $environment['HTTP_SERVER_PORT'] . $environment['HTTP_DIR_PATH'];
|
||||
$env = [
|
||||
"HTTP_PWD" => $http_pwd,
|
||||
'HTTP_PWD_ASSETS' => $http_pwd . '/assets', //HTTP path of asset dir
|
||||
'HTTP_PWD_IMG' => $http_pwd . '/assets' . '/img',
|
||||
'HTTP_PWD_CSS' => $http_pwd . '/assets' . '/css',
|
||||
'HTTP_PWD_JS' => $http_pwd . '/assets' . '/js',
|
||||
'HTTP_PWD_FONT' => $http_pwd . '/assets' . '/font',
|
||||
];
|
||||
$environment = array_merge($environment, $env);
|
||||
|
||||
define_array($environment);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue