Merge branch 'develop' into task-factory-test

Conflicts:
	Mage/Task/Factory.php
This commit is contained in:
Claudio Zizza
2015-02-23 20:59:15 +01:00
27 changed files with 904 additions and 110 deletions
+1 -1
View File
@@ -59,7 +59,7 @@ class Factory
$instance = new $className($taskConfig, $inRollback, $stage, $taskParameters);
if (!$instance instanceof AbstractTask) {
if (!($instance instanceof AbstractTask)) {
throw new Exception('The Task ' . $taskName . ' must be an instance of Mage\Task\AbstractTask.');
}