Merge 7db28f946d into b0d41af3ee

Mage/Task/Factory.php

@@ -43,11 +43,22 @@ class Factory
         $instance = null;
         $taskName = ucwords(str_replace('-', ' ', $taskName));
         $taskName = str_replace(' ', '', $taskName);
+        $taskName = ucwords(str_replace('/', ' ', $taskName));
+        $taskName = str_replace(' ', '\\', $taskName);
 
-        if (strpos($taskName, '/') === false) {
+        $className = $taskName;
-            $className = 'Task\\' . $taskName;
+        $patterns  = array(
-        } else {
+            'Task\\%s',
-            $className = 'Mage\\Task\\BuiltIn\\' . str_replace(' ', '\\', ucwords(str_replace('/', ' ', $taskName))) . 'Task';
+            '%s\\Task',
+            'Mage\\Task\\BuiltIn\\%sTask',
+            '%s',
+        );
+
+        foreach ($patterns as $classNamePattern) {
+            $className = sprintf($classNamePattern, $taskName);
+            if (class_exists($className)) {
+                break;
+            }
         }
 
         if (!class_exists($className)) {

tests/MageTest/Task/FactoryTest.php

@@ -50,19 +50,30 @@ class FactoryTest extends PHPUnit_Framework_TestCase
      */
     public function testGetCustomTask()
     {
-        $this->getMockBuilder('Mage\\Task\\AbstractTask')
+        $tasks = array(
-            ->setConstructorArgs(array($this->config))
+            'Task\\MyFirstTask' => 'my-first-task',
-            ->setMockClassName('MyTask')
+            'MySecond\\Task' => 'my-second',
-            ->getMock();
+            'Mage\\Task\\BuiltIn\\CustomThirdTask' => 'custom-third',
+            'Mage\\Task\\BuiltIn\\Custom\\FourthTask' => 'custom/fourth',
+            'My\\Fifth\\TaskClass' => 'my/fifth/task-class',
+        );
 
-        /*
+        foreach ($tasks as $taskClass => $taskName) {
-         * current workaround
+            $alias = uniqid('DummyTask');
-         * @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/134
+            $this->getMockBuilder('Mage\\Task\\AbstractTask')
-         */
+                ->setConstructorArgs(array($this->config))
-        class_alias('MyTask', 'Task\\MyTask');
+                ->setMockClassName($alias)
+                ->getMock();
 
-        $task = Factory::get('my-task', $this->config);
+            /*
-        $this->assertInstanceOf('Task\\MyTask', $task);
+             * current workaround
+             * @link https://github.com/sebastianbergmann/phpunit-mock-objects/issues/134
+             */
+            class_alias($alias, $taskClass);
+
+            $task = Factory::get($taskName, $this->config);
+            $this->assertInstanceOf($taskClass, $task);
+        }
     }
 
     /**