Skip to content

TASK: Tweak Core\Bootstrap #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

TASK: Tweak Core\Bootstrap #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions Neos.Flow/Classes/Core/Bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ protected function defineConstants()
}

if (!defined('FLOW_PATH_ROOT')) {
$rootPath = isset($_SERVER['FLOW_ROOTPATH']) ? $_SERVER['FLOW_ROOTPATH'] : false;
$rootPath = $_SERVER['FLOW_ROOTPATH'] ?? false;
if ($rootPath === false && isset($_SERVER['REDIRECT_FLOW_ROOTPATH'])) {
$rootPath = $_SERVER['REDIRECT_FLOW_ROOTPATH'];
}
Expand Down Expand Up @@ -536,7 +536,7 @@ protected function defineConstants()
define('FLOW_PATH_PACKAGES', FLOW_PATH_ROOT . 'Packages/');

if (!defined('FLOW_PATH_TEMPORARY_BASE')) {
define('FLOW_PATH_TEMPORARY_BASE', self::getEnvironmentConfigurationSetting('FLOW_PATH_TEMPORARY_BASE') ?: FLOW_PATH_DATA . '/Temporary');
define('FLOW_PATH_TEMPORARY_BASE', self::getEnvironmentConfigurationSetting('FLOW_PATH_TEMPORARY_BASE') ?: FLOW_PATH_DATA . 'Temporary');
$temporaryDirectoryPath = Environment::composeTemporaryDirectoryName(FLOW_PATH_TEMPORARY_BASE, $this->context);
define('FLOW_PATH_TEMPORARY', $temporaryDirectoryPath);
}
Expand All @@ -552,8 +552,8 @@ protected function defineConstants()
*/
protected function ensureRequiredEnvironment()
{
if (version_compare(phpversion(), self::MINIMUM_PHP_VERSION, '<')) {
echo('Flow requires PHP version ' . self::MINIMUM_PHP_VERSION . ' or higher but your installed version is currently ' . phpversion() . '. (Error #1172215790)' . PHP_EOL);
if (version_compare(PHP_VERSION, self::MINIMUM_PHP_VERSION, '<')) {
echo('Flow requires PHP version ' . self::MINIMUM_PHP_VERSION . ' or higher but your installed version is currently ' . PHP_VERSION . '. (Error #1172215790)' . PHP_EOL);
exit(1);
}
if (!extension_loaded('mbstring')) {
Expand Down Expand Up @@ -628,7 +628,9 @@ public static function getEnvironmentConfigurationSetting(string $variableName)
return $variableValue;
}

$variableValue = getenv('REDIRECT_' . $variableName);
$redirectVariableName = 'REDIRECT_' . $variableName;

$variableValue = getenv($redirectVariableName);
if ($variableValue !== false) {
return $variableValue;
}
Expand All @@ -637,8 +639,8 @@ public static function getEnvironmentConfigurationSetting(string $variableName)
return $_SERVER[$variableName];
}

if (isset($_SERVER['REDIRECT_' . $variableName])) {
return $_SERVER['REDIRECT_' . $variableName];
if (isset($_SERVER[$redirectVariableName])) {
return $_SERVER[$redirectVariableName];
}

return null;
Expand Down