Merge pull request #374 from andres-montanez/revert-357-master

Revert "[FEATURE] allow exclude definition global"

src/Task/BuiltIn/Deploy/RsyncTask.php

@@ -54,7 +54,7 @@ class RsyncTask extends AbstractTask
 
     protected function getExcludes()
     {
-        $excludes = $this->runtime->getMergedOption('exclude', []);
+        $excludes = $this->runtime->getEnvOption('exclude', []);
         $excludes = array_merge(['.git'], array_filter($excludes));
 
         foreach ($excludes as &$exclude) {

src/Task/BuiltIn/Deploy/Tar/PrepareTask.php

@@ -51,7 +51,7 @@ class PrepareTask extends AbstractTask
 
     protected function getExcludes()
     {
-        $excludes = $this->runtime->getMergedOption('exclude', []);
+        $excludes = $this->runtime->getEnvOption('exclude', []);
         $excludes = array_merge(['.git'], array_filter($excludes));
 
         foreach ($excludes as &$exclude) {

tests/Command/BuiltIn/DeployCommandMiscTasksTest.php

@@ -50,27 +50,9 @@ class DeployCommandMiscTasksTest extends TestCase
         $this->assertEquals(0, $tester->getStatusCode());
     }
 
-    public function composerFlagsDataProvider() {
+    public function testComposerFlags()
-        return [
-            'default' => [
-                'yml' => __DIR__ . '/../../Resources/composer.yml'
-            ],
-            'global exclude' => [
-                'yml' => __DIR__ . '/../../Resources/global-exclude.yml'
-            ],
-        ];
-    }
-
-    /**
-     * testComposerFlags
-     *
-     * @dataProvider composerFlagsDataProvider
-     * @param string $yml
-     * @return void
-     */
-    public function testComposerFlags($yml)
     {
-        $application = new MageApplicationMockup($yml);
+        $application = new MageApplicationMockup(__DIR__ . '/../../Resources/composer.yml');
 
         /** @var AbstractCommand $command */
         $command = $application->find('deploy');

tests/Resources/global-exclude.yml

@@ -1,17 +0,0 @@
-magephp:
-    log_dir: /tmp
-    composer:
-        path: /usr/bin/composer.phar
-    exclude:
-        - ./var/cache/*
-        - ./var/log/*
-        - ./web/app_dev.php
-    environments:
-        test:
-            user: tester
-            host_path: /var/www/test
-            hosts:
-                - testhost
-            pre-deploy:
-                - composer/install: { flags: '--prefer-source' }
-                - composer/dump-autoload: { flags: '--no-scripts' }