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

Revert "[FEATURE] allow exclude definition global"
andres-montanez · Apr 14, 2017 · d95e498 · d95e498
2 parents c649814 + 591ac04
commit d95e498
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 39 deletions.
diff --git a/src/Task/BuiltIn/Deploy/RsyncTask.php b/src/Task/BuiltIn/Deploy/RsyncTask.php
@@ -54,7 +54,7 @@ public function execute()
 
     protected function getExcludes()
     {
-        $excludes = $this->runtime->getMergedOption('exclude', []);
+        $excludes = $this->runtime->getEnvOption('exclude', []);
         $excludes = array_merge(['.git'], array_filter($excludes));
 
         foreach ($excludes as &$exclude) {

diff --git a/src/Task/BuiltIn/Deploy/Tar/PrepareTask.php b/src/Task/BuiltIn/Deploy/Tar/PrepareTask.php
@@ -51,7 +51,7 @@ public function execute()
 
     protected function getExcludes()
     {
-        $excludes = $this->runtime->getMergedOption('exclude', []);
+        $excludes = $this->runtime->getEnvOption('exclude', []);
         $excludes = array_merge(['.git'], array_filter($excludes));
 
         foreach ($excludes as &$exclude) {

diff --git a/tests/Command/BuiltIn/DeployCommandMiscTasksTest.php b/tests/Command/BuiltIn/DeployCommandMiscTasksTest.php
@@ -50,27 +50,9 @@ public function testSymfonyEnvironmentConfiguration()
         $this->assertEquals(0, $tester->getStatusCode());
     }
 
-    public function composerFlagsDataProvider() {
-        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)
+    public function testComposerFlags()
     {
-        $application = new MageApplicationMockup($yml);
+        $application = new MageApplicationMockup(__DIR__ . '/../../Resources/composer.yml');
 
         /** @var AbstractCommand $command */
         $command = $application->find('deploy');

diff --git a/tests/Resources/global-exclude.yml b/tests/Resources/global-exclude.yml