mirror of
https://github.com/hauke68/Magallanes.git
synced 2025-09-13 12:40:18 +02:00
Added support for environment specific composer settings
This commit is contained in:
parent
dc48f19b26
commit
b2099105fc
@ -43,10 +43,9 @@ class DumpAutoloadTask extends AbstractTask
|
|||||||
|
|
||||||
protected function getOptions()
|
protected function getOptions()
|
||||||
{
|
{
|
||||||
$userOptions = $this->runtime->getConfigOption('composer', []);
|
|
||||||
$options = array_merge(
|
$options = array_merge(
|
||||||
['path' => 'composer', 'flags' => '--optimize'],
|
['path' => 'composer', 'flags' => '--optimize'],
|
||||||
(is_array($userOptions) ? $userOptions : []),
|
$this->runtime->getMergedEnvAndConfigOption('composer', [], []),
|
||||||
$this->options
|
$this->options
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -43,10 +43,9 @@ class InstallTask extends AbstractTask
|
|||||||
|
|
||||||
protected function getOptions()
|
protected function getOptions()
|
||||||
{
|
{
|
||||||
$userOptions = $this->runtime->getConfigOption('composer', []);
|
|
||||||
$options = array_merge(
|
$options = array_merge(
|
||||||
['path' => 'composer', 'flags' => '--optimize-autoloader'],
|
['path' => 'composer', 'flags' => '--optimize-autoloader'],
|
||||||
(is_array($userOptions) ? $userOptions : []),
|
$this->runtime->getMergedEnvAndConfigOption('composer', [], []),
|
||||||
$this->options
|
$this->options
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -80,6 +80,36 @@ class DeployCommandMiscTasksTest extends TestCase
|
|||||||
$this->assertEquals(0, $tester->getStatusCode());
|
$this->assertEquals(0, $tester->getStatusCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testComposerEnvFlags()
|
||||||
|
{
|
||||||
|
$application = new MageApplicationMockup(__DIR__ . '/../../Resources/composer-env.yml');
|
||||||
|
|
||||||
|
/** @var AbstractCommand $command */
|
||||||
|
$command = $application->find('deploy');
|
||||||
|
$this->assertTrue($command instanceof DeployCommand);
|
||||||
|
|
||||||
|
$tester = new CommandTester($command);
|
||||||
|
$tester->execute(['command' => $command->getName(), 'environment' => 'test']);
|
||||||
|
|
||||||
|
$ranCommands = $application->getRuntime()->getRanCommands();
|
||||||
|
|
||||||
|
$testCase = array(
|
||||||
|
0 => '/usr/foobar/composer install --prefer-source',
|
||||||
|
1 => '/usr/foobar/composer dump-autoload --no-scripts',
|
||||||
|
2 => 'rsync -e "ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./ tester@testhost:/var/www/test',
|
||||||
|
);
|
||||||
|
|
||||||
|
// Check total of Executed Commands
|
||||||
|
$this->assertEquals(count($testCase), count($ranCommands));
|
||||||
|
|
||||||
|
// Check Generated Commands
|
||||||
|
foreach ($testCase as $index => $command) {
|
||||||
|
$this->assertEquals($command, $ranCommands[$index]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->assertEquals(0, $tester->getStatusCode());
|
||||||
|
}
|
||||||
|
|
||||||
public function testInvalidTaskName()
|
public function testInvalidTaskName()
|
||||||
{
|
{
|
||||||
$application = new MageApplicationMockup(__DIR__ . '/../../Resources/invalid-task.yml');
|
$application = new MageApplicationMockup(__DIR__ . '/../../Resources/invalid-task.yml');
|
||||||
|
19
tests/Resources/composer-env.yml
Normal file
19
tests/Resources/composer-env.yml
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
magephp:
|
||||||
|
log_dir: /tmp
|
||||||
|
composer:
|
||||||
|
path: /usr/bin/composer.phar
|
||||||
|
environments:
|
||||||
|
test:
|
||||||
|
composer:
|
||||||
|
path: /usr/foobar/composer
|
||||||
|
user: tester
|
||||||
|
host_path: /var/www/test
|
||||||
|
exclude:
|
||||||
|
- ./var/cache/*
|
||||||
|
- ./var/log/*
|
||||||
|
- ./web/app_dev.php
|
||||||
|
hosts:
|
||||||
|
- testhost
|
||||||
|
pre-deploy:
|
||||||
|
- composer/install: { flags: '--prefer-source' }
|
||||||
|
- composer/dump-autoload: { flags: '--no-scripts' }
|
Loading…
Reference in New Issue
Block a user