From bdfdc284d6405b49efbd67766298158b0258b893 Mon Sep 17 00:00:00 2001
From: Claudiu Cristea <clau.cristea@gmail.com>
Date: Thu, 11 Jun 2020 13:08:01 +0300
Subject: [PATCH] ISAICP-5988: Require consolidation/robo:^2.1.

---
 composer.json                                     | 12 +++++++++---
 src/Commands/DrupalCommands.php                   |  9 ---------
 src/Tasks/CollectionFactory/CollectionFactory.php |  4 ++--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 1a6085ce..83450705 100644
--- a/composer.json
+++ b/composer.json
@@ -8,10 +8,10 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.2",
-        "consolidation/robo": "^1.4.7",
+        "consolidation/robo": "^2.1",
         "gitonomy/gitlib": "^1.0",
         "jakeasmith/http_build_url": "^1.0.1",
-        "nuvoleweb/robo-config": "^0.2.1",
+        "nuvoleweb/robo-config": "dev-robo-2.x",
         "symfony/console": "^3.4.21|^4|^5"
     },
     "require-dev": {
@@ -36,5 +36,11 @@
     "bin": ["bin/run"],
     "config": {
         "sort-packages": true
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/claudiu-cristea/robo-config.git"
+        }
+    ]
 }
diff --git a/src/Commands/DrupalCommands.php b/src/Commands/DrupalCommands.php
index e10adb11..f41c3d4f 100644
--- a/src/Commands/DrupalCommands.php
+++ b/src/Commands/DrupalCommands.php
@@ -2,15 +2,6 @@
 
 namespace OpenEuropa\TaskRunner\Commands;
 
-use Consolidation\AnnotatedCommand\CommandData;
-use NuvoleWeb\Robo\Task as NuvoleWebTasks;
-use OpenEuropa\TaskRunner\Contract\FilesystemAwareInterface;
-use OpenEuropa\TaskRunner\Tasks as TaskRunnerTasks;
-use OpenEuropa\TaskRunner\Traits as TaskRunnerTraits;
-use Symfony\Component\Console\Event\ConsoleCommandEvent;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Yaml\Yaml;
-
 /**
  * Base class for commands that interact with a Drupal installation.
  *
diff --git a/src/Tasks/CollectionFactory/CollectionFactory.php b/src/Tasks/CollectionFactory/CollectionFactory.php
index a6e8d2fd..c7fe9973 100644
--- a/src/Tasks/CollectionFactory/CollectionFactory.php
+++ b/src/Tasks/CollectionFactory/CollectionFactory.php
@@ -136,10 +136,10 @@ protected function taskFactory($task)
                 return $this->taskFilesystemStack()->chmod($task['file'], $task['permissions'], $task['umask'], $task['recursive']);
 
             case "chgrp":
-                return $this->taskFilesystemStack()->chgrp($task['file'], $task['group'], $task['umask'], $task['recursive']);
+                return $this->taskFilesystemStack()->chgrp($task['file'], $task['group'], $task['recursive']);
 
             case "chown":
-                return $this->taskFilesystemStack()->chown($task['file'], $task['user'], $task['umask'], $task['recursive']);
+                return $this->taskFilesystemStack()->chown($task['file'], $task['user'], $task['recursive']);
 
             case "remove":
                 return $this->taskFilesystemStack()->remove($task['file']);