Skip to content

Commit

Permalink
Merge pull request #161 into 3.0 branch
Browse files Browse the repository at this point in the history
Conflicts:
	src/MagentoHackathon/Composer/Magento/Command/DeployCommand.php

merge did not resolve to renamed file ComposerDeployCommand.php
  • Loading branch information
Flyingmana committed Dec 27, 2014
2 parents d3c9ff4 + 34a51d2 commit 3d65df2
Showing 1 changed file with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

use MagentoHackathon\Composer\Magento\Deploy\Manager\Entry;
use MagentoHackathon\Composer\Magento\DeployManager;
use MagentoHackathon\Composer\Magento\Event\EventManager;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
Expand Down Expand Up @@ -51,8 +52,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
*/
$moduleInstaller = $im->getInstaller("magento-module");

$eventManager = new EventManager;
$deployManager = new DeployManager($eventManager);

$deployManager = new DeployManager( $this->getIO() );
$io = $this->getIo();
if ($io->isDebug()) {
$eventManager->listen('pre-package-deploy', function(PackageDeployEvent $event) use ($io) {
$io->write('Start magento deploy for ' . $event->getDeployEntry()->getPackageName());
});
}

$extra = $composer->getPackage()->getExtra();
$sortPriority = isset($extra['magento-deploy-sort-priority']) ? $extra['magento-deploy-sort-priority'] : array();
Expand Down

0 comments on commit 3d65df2

Please sign in to comment.