Merge branch 'master' of https://github.com/andres-montanez/Magallanes

Conflicts: Mage/Task/Factory.php
2026-09-05 00:48:57 +02:00 · 2014-06-12 16:18:14 -03:00
parent 4e01cc3517 a73c10faed
commit 66ea107229
16 changed files with 190 additions and 41 deletions
@@ -12,8 +12,6 @@ namespace Mage\Task;

 use Mage\Config;
 use Mage\Autoload;
-use Mage\Task\ErrorWithMessageException;
-use Mage\Task\AbstractTask;

 use Exception;

@@ -29,6 +27,7 @@ class Factory
     *
     * @param string|array $taskData
     * @param \Mage\Config $taskConfig
+     * @param Config $taskConfig
     * @param boolean $inRollback
     * @param string $stage
     * @return \Mage\Task\AbstractTask
@@ -70,4 +69,4 @@ class Factory

        return $instance;
    }
-}
+}