From 97797baadf3194ad5fab9099026b2e24073494b2 Mon Sep 17 00:00:00 2001 From: Julien Roche Date: Fri, 18 Aug 2023 09:24:24 +0200 Subject: [PATCH 1/3] escape binary php path --- src/Manager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Manager.php b/src/Manager.php index cedc414..73a03a5 100644 --- a/src/Manager.php +++ b/src/Manager.php @@ -38,7 +38,7 @@ public function run(Settings $settings = null) $settings = $settings ?: new Settings(); $output = $this->output ?: $this->getDefaultOutput($settings); - $phpExecutable = PhpExecutable::getPhpExecutable($settings->phpExecutable); + $phpExecutable = PhpExecutable::getPhpExecutable(escapeshellarg($settings->phpExecutable)); $olderThanPhp54 = $phpExecutable->getVersionId() < 50400; // From PHP version 5.4 are tokens translated by default $translateTokens = $phpExecutable->isIsHhvmType() || $olderThanPhp54; From ebc984ba923bb26086f4ac0133076637770b7252 Mon Sep 17 00:00:00 2001 From: Julien Roche Date: Fri, 18 Aug 2023 10:22:34 +0200 Subject: [PATCH 2/3] fix path according to os family --- src/Manager.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Manager.php b/src/Manager.php index 73a03a5..56be502 100644 --- a/src/Manager.php +++ b/src/Manager.php @@ -38,7 +38,12 @@ public function run(Settings $settings = null) $settings = $settings ?: new Settings(); $output = $this->output ?: $this->getDefaultOutput($settings); - $phpExecutable = PhpExecutable::getPhpExecutable(escapeshellarg($settings->phpExecutable)); + $settingsPhpExecutable = escapeshellarg($settings->phpExecutable); + if (stripos(PHP_OS, 'WIN') === 0) { + $settingsPhpExecutable = preg_replace('`(?phpExecutable)); + } + + $phpExecutable = PhpExecutable::getPhpExecutable($settingsPhpExecutable); $olderThanPhp54 = $phpExecutable->getVersionId() < 50400; // From PHP version 5.4 are tokens translated by default $translateTokens = $phpExecutable->isIsHhvmType() || $olderThanPhp54; From 691a642d729de1ee96913aad5d4520a9803ab2e3 Mon Sep 17 00:00:00 2001 From: Julien Roche Date: Mon, 21 Aug 2023 08:11:10 +0200 Subject: [PATCH 3/3] fix path according to os family --- src/Manager.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Manager.php b/src/Manager.php index 56be502..73a03a5 100644 --- a/src/Manager.php +++ b/src/Manager.php @@ -38,12 +38,7 @@ public function run(Settings $settings = null) $settings = $settings ?: new Settings(); $output = $this->output ?: $this->getDefaultOutput($settings); - $settingsPhpExecutable = escapeshellarg($settings->phpExecutable); - if (stripos(PHP_OS, 'WIN') === 0) { - $settingsPhpExecutable = preg_replace('`(?phpExecutable)); - } - - $phpExecutable = PhpExecutable::getPhpExecutable($settingsPhpExecutable); + $phpExecutable = PhpExecutable::getPhpExecutable(escapeshellarg($settings->phpExecutable)); $olderThanPhp54 = $phpExecutable->getVersionId() < 50400; // From PHP version 5.4 are tokens translated by default $translateTokens = $phpExecutable->isIsHhvmType() || $olderThanPhp54;