diff --git a/Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php b/Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php new file mode 100644 index 0000000..e61c32d --- /dev/null +++ b/Mage/Task/BuiltIn/Composer/ComposerAbstractTask.php @@ -0,0 +1,26 @@ + +* +* For the full copyright and license information, please view the LICENSE +* file that was distributed with this source code. +*/ + +namespace Mage\Task\BuiltIn\Composer; + +use Mage\Task\AbstractTask; + +/** + * Abstract Task for Composer + * + * @author Andrés Montañez + */ +abstract class ComposerAbstractTask extends AbstractTask +{ + protected function getComposerPath() + { + return $this->getConfig()->general('composer_path', '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 fbb730d..ea1acf4 100644 --- a/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php +++ b/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php @@ -1,10 +1,10 @@ getConfig()->general('composer_path', 'php composer.phar'); - - return $this->runCommand($composerPath . ' dumpautoload --optimize'); + return $this->runCommand($this->getComposerPath() . ' dumpautoload --optimize'); } } diff --git a/Mage/Task/BuiltIn/Composer/InstallTask.php b/Mage/Task/BuiltIn/Composer/InstallTask.php index 77395aa..42c468c 100644 --- a/Mage/Task/BuiltIn/Composer/InstallTask.php +++ b/Mage/Task/BuiltIn/Composer/InstallTask.php @@ -1,10 +1,10 @@ getConfig()->general('composer_path', 'php composer.phar'); - - return $this->runCommand($composerPath . ' install'); + return $this->runCommand($this->getComposerPath() . ' install'); } } diff --git a/Mage/Task/BuiltIn/Symfony2/AsseticDumpTask.php b/Mage/Task/BuiltIn/Symfony2/AsseticDumpTask.php index 0a303e7..7b08660 100644 --- a/Mage/Task/BuiltIn/Symfony2/AsseticDumpTask.php +++ b/Mage/Task/BuiltIn/Symfony2/AsseticDumpTask.php @@ -10,14 +10,14 @@ namespace Mage\Task\BuiltIn\Symfony2; -use Mage\Task\AbstractTask; +use Mage\Task\BuiltIn\Symfony2\SymfonyAbstractTask; /** * Task for Dumping Assetics * * @author Andrés Montañez */ -class AsseticDumpTask extends AbstractTask +class AsseticDumpTask extends SymfonyAbstractTask { /** * (non-PHPdoc) @@ -37,7 +37,7 @@ class AsseticDumpTask extends AbstractTask // Options $env = $this->getParameter('env', 'dev'); - $command = 'app/console assetic:dump --env=' . $env; + $command = $this->getAppPath() . ' assetic:dump --env=' . $env; $result = $this->runCommand($command); return $result; diff --git a/Mage/Task/BuiltIn/Symfony2/AssetsInstallTask.php b/Mage/Task/BuiltIn/Symfony2/AssetsInstallTask.php index 3834f4c..c53292c 100644 --- a/Mage/Task/BuiltIn/Symfony2/AssetsInstallTask.php +++ b/Mage/Task/BuiltIn/Symfony2/AssetsInstallTask.php @@ -10,14 +10,14 @@ namespace Mage\Task\BuiltIn\Symfony2; -use Mage\Task\AbstractTask; +use Mage\Task\BuiltIn\Symfony2\SymfonyAbstractTask; /** * Task for Installing Assets * * @author Andrés Montañez */ -class AssetsInstallTask extends AbstractTask +class AssetsInstallTask extends SymfonyAbstractTask { /** * (non-PHPdoc) @@ -44,7 +44,7 @@ class AssetsInstallTask extends AbstractTask $symlink = true; } - $command = 'app/console assets:install ' . ($symlink ? '--symlink' : '') . ' ' . ($relative ? '--relative' : '') . ' --env=' . $env . ' ' . $target; + $command = $this->getAppPath() . ' assets:install ' . ($symlink ? '--symlink' : '') . ' ' . ($relative ? '--relative' : '') . ' --env=' . $env . ' ' . $target; $result = $this->runCommand($command); return $result; diff --git a/Mage/Task/BuiltIn/Symfony2/CacheClearTask.php b/Mage/Task/BuiltIn/Symfony2/CacheClearTask.php index 9b1c2ec..fff5c24 100644 --- a/Mage/Task/BuiltIn/Symfony2/CacheClearTask.php +++ b/Mage/Task/BuiltIn/Symfony2/CacheClearTask.php @@ -10,14 +10,14 @@ namespace Mage\Task\BuiltIn\Symfony2; -use Mage\Task\AbstractTask; +use Mage\Task\BuiltIn\Symfony2\SymfonyAbstractTask; /** * Task for Clearing the Cache * * @author Andrés Montañez */ -class CacheClearTask extends AbstractTask +class CacheClearTask extends SymfonyAbstractTask { /** * (non-PHPdoc) @@ -37,7 +37,7 @@ class CacheClearTask extends AbstractTask // Options $env = $this->getParameter('env', 'dev'); - $command = 'app/console cache:clear --env=' . $env; + $command = $this->getAppPath() . ' cache:clear --env=' . $env; $result = $this->runCommand($command); return $result; diff --git a/Mage/Task/BuiltIn/Symfony2/CacheWarmupTask.php b/Mage/Task/BuiltIn/Symfony2/CacheWarmupTask.php index 912b183..67e920c 100644 --- a/Mage/Task/BuiltIn/Symfony2/CacheWarmupTask.php +++ b/Mage/Task/BuiltIn/Symfony2/CacheWarmupTask.php @@ -10,14 +10,14 @@ namespace Mage\Task\BuiltIn\Symfony2; -use Mage\Task\AbstractTask; +use Mage\Task\BuiltIn\Symfony2\SymfonyAbstractTask; /** * Task for Warming Up the Cache * * @author Andrés Montañez */ -class CacheWarmupTask extends AbstractTask +class CacheWarmupTask extends SymfonyAbstractTask { /** * (non-PHPdoc) @@ -37,7 +37,7 @@ class CacheWarmupTask extends AbstractTask // Options $env = $this->getParameter('env', 'dev'); - $command = 'app/console cache:warmup --env=' . $env; + $command = $this->getAppPath() . ' cache:warmup --env=' . $env; $result = $this->runCommand($command); return $result; diff --git a/Mage/Task/BuiltIn/Symfony2/SymfonyAbstractTask.php b/Mage/Task/BuiltIn/Symfony2/SymfonyAbstractTask.php new file mode 100644 index 0000000..4fae2e2 --- /dev/null +++ b/Mage/Task/BuiltIn/Symfony2/SymfonyAbstractTask.php @@ -0,0 +1,32 @@ + +* +* For the full copyright and license information, please view the LICENSE +* file that was distributed with this source code. +*/ + +namespace Mage\Task\BuiltIn\Symfony2; + +use Mage\Task\AbstractTask; + +/** + * Abstract Task for Symfony2 + * + * @author Andrés Montañez + */ +abstract class SymfonyAbstractTask extends AbstractTask +{ + protected function getAppPath() + { + if ($this->getConfig()->general('symfony_version', '2') == '3') { + $defaultAppPath = 'bin/console'; + } else { + $defaultAppPath = 'app/console'; + } + + return $this->getConfig()->general('symfony_app_path', $defaultAppPath); + } +} \ No newline at end of file