deblan-mirror/magallanes
1
0
Fork 0
mirror of https://github.com/andres-montanez/Magallanes synced 2024-05-25 01:42:14 +02:00
Code Issues Projects Releases Wiki Activity

Merge 7db28f946d into b0d41af3ee

Browse source
This commit is contained in:
garfieldius 2017-01-02 22:49:22 +00:00 committed by GitHub
parent b0d41af3ee 7db28f946d
commit 2dbc2bcaa2
2 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Mage/Task/Factory.php
View file

@ -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 = 'Task\\' . $taskName;
} else {
$className = 'Mage\\Task\\BuiltIn\\' . str_replace(' ', '\\', ucwords(str_replace('/', ' ', $taskName))) . 'Task';
$className = $taskName;
$patterns = array(
'Task\\%s',
'%s\\Task',
'Mage\\Task\\BuiltIn\\%sTask',
'%s',
);
foreach ($patterns as $classNamePattern) {
$className = sprintf($classNamePattern, $taskName);
if (class_exists($className)) {
break;
}
}
if (!class_exists($className)) {

33
tests/MageTest/Task/FactoryTest.php
View file

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