From 48420c1c2a3f0d3577fe023ad1e8fc947609717d Mon Sep 17 00:00:00 2001 From: Kuba Turek Date: Wed, 20 Aug 2014 17:45:30 +0200 Subject: [PATCH 1/2] Rename composer_path into composer_cmd --- Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php | 5 +++-- Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php | 2 +- Mage/Task/BuiltIn/Composer/InstallTask.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php b/Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php index e61c32d..dc9d15f 100644 --- a/Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php +++ b/Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php @@ -19,8 +19,9 @@ use Mage\Task\AbstractTask; */ abstract class ComposerAbstractTask extends AbstractTask { - protected function getComposerPath() + protected function getComposerCmd() { - return $this->getConfig()->general('composer_path', 'php composer.phar'); + + return $this->getConfig()->general('composer_cmd', 'php composer.phar'); } } \ No newline at end of file diff --git a/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php b/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php index ea1acf4..2fdafea 100644 --- a/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php +++ b/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php @@ -23,6 +23,6 @@ class GenerateAutoloadTask extends ComposerAbstractTask */ public function run() { - return $this->runCommand($this->getComposerPath() . ' dumpautoload --optimize'); + return $this->runCommand($this->getComposerCmd() . ' dumpautoload --optimize'); } } diff --git a/Mage/Task/BuiltIn/Composer/InstallTask.php b/Mage/Task/BuiltIn/Composer/InstallTask.php index 42c468c..d33ca1c 100644 --- a/Mage/Task/BuiltIn/Composer/InstallTask.php +++ b/Mage/Task/BuiltIn/Composer/InstallTask.php @@ -23,6 +23,6 @@ class InstallTask extends ComposerAbstractTask */ public function run() { - return $this->runCommand($this->getComposerPath() . ' install'); + return $this->runCommand($this->getComposerCmd() . ' install'); } } From 95ffed7e12731bff6d5684290cd7565e20922572 Mon Sep 17 00:00:00 2001 From: Kuba Turek Date: Wed, 20 Aug 2014 17:46:44 +0200 Subject: [PATCH 2/2] Add configurable composer_cmd parameter --- Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php b/Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php index dc9d15f..aa31736 100644 --- a/Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php +++ b/Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php @@ -21,7 +21,7 @@ abstract class ComposerAbstractTask extends AbstractTask { protected function getComposerCmd() { - - return $this->getConfig()->general('composer_cmd', 'php composer.phar'); + $composerCmd = $this->getParameter('composer_cmd', 'php composer.phar'); + return $this->getConfig()->general('composer_cmd', $composerCmd); } -} \ No newline at end of file +}