Browse Source

Merge pull request #112 from edpauto/composer

Add composer_cmd as parameter for composer tasks
1.0
Andrés Montañez 10 years ago
parent
commit
e54baf726a
  1. 7
      Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php
  2. 2
      Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php
  3. 2
      Mage/Task/BuiltIn/Composer/InstallTask.php

7
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');
$composerCmd = $this->getParameter('composer_cmd', 'php composer.phar');
return $this->getConfig()->general('composer_cmd', $composerCmd);
}
}
}

2
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');
}
}

2
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');
}
}

Loading…
Cancel
Save