Created
June 29, 2015 07:47
-
-
Save benjaminrau/0fea6411fb55c5e7360d to your computer and use it in GitHub Desktop.
Fixed buildSubprocessCommand for Expose Beard Patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/** | |
* @param string $commandIdentifier E.g. typo3.flow:cache:flush | |
* @param array $settings The TYPO3.Flow settings | |
* @param array $commandArguments Command arguments | |
* | |
* @return string A command line command ready for being exec()uted | |
*/ | |
protected static function buildSubprocessCommand($commandIdentifier, $settings, array $commandArguments = array()) { | |
$subRequestEnvironmentVariables = array( | |
'FLOW_ROOTPATH' => FLOW_PATH_ROOT, | |
'FLOW_CONTEXT' => $settings['core']['context'] | |
); | |
if (isset($settings['core']['subRequestEnvironmentVariables'])) { | |
$subRequestEnvironmentVariables = array_merge($subRequestEnvironmentVariables, $settings['core']['subRequestEnvironmentVariables']); | |
} | |
$command = ''; | |
foreach ($subRequestEnvironmentVariables as $argumentKey => $argumentValue) { | |
if (DIRECTORY_SEPARATOR === '/') { | |
$command .= sprintf('%s=%s ', $argumentKey, escapeshellarg($argumentValue)); | |
} else { | |
$command .= sprintf('SET %s=%s&', $argumentKey, escapeshellarg($argumentValue)); | |
} | |
} | |
if (DIRECTORY_SEPARATOR === '/') { | |
$phpBinaryPathAndFilename = '"' . escapeshellcmd(\TYPO3\Flow\Utility\Files::getUnixStylePath($settings['core']['phpBinaryPathAndFilename'])) . '"'; | |
} else { | |
$phpBinaryPathAndFilename = escapeshellarg(\TYPO3\Flow\Utility\Files::getUnixStylePath($settings['core']['phpBinaryPathAndFilename'])); | |
} | |
$command .= $phpBinaryPathAndFilename; | |
if (!isset($settings['core']['subRequestPhpIniPathAndFilename']) || $settings['core']['subRequestPhpIniPathAndFilename'] !== FALSE) { | |
if (!isset($settings['core']['subRequestPhpIniPathAndFilename'])) { | |
$useIniFile = php_ini_loaded_file(); | |
} else { | |
$useIniFile = $settings['core']['subRequestPhpIniPathAndFilename']; | |
} | |
$command .= ' -c ' . escapeshellarg($useIniFile); | |
} | |
$escapedArguments = ''; | |
if ($commandArguments !== array()) { | |
foreach ($commandArguments as $argument=>$argumentValue) { | |
$escapedArguments .= ' ' . escapeshellarg('--' . trim($argument)); | |
if (trim($argumentValue) !== '') { | |
$escapedArguments .= ' ' . escapeshellarg(trim($argumentValue)); | |
} | |
} | |
} | |
$command .= sprintf(' %s %s %s', escapeshellarg(FLOW_PATH_FLOW . 'Scripts/flow.php'), escapeshellarg($commandIdentifier), trim($escapedArguments)); | |
return trim($command); | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment