Oefenweb / cakephp-queue

tests/TestCase/Queue/TaskFinderTest.php

Indentation +46 added lines, -46 removed lines

@@ -7,50 +7,50 @@
 class TaskFinderTest extends TestCase
 {
 
-    /**
-     *
-     * @var \Queue\Shell\QueueShell|\PHPUnit_Framework_MockObject_MockObject
-     */
-    public $QueueShell;
-
-    /**
-     *
-     * @var \Queue\Queue\TaskFinder
-     */
-    protected $taskFinder;
-
-    /**
-     * Fixtures to load
-     *
-     * @var array
-     */
-    public $fixtures = [
-        'plugin.Queue.QueuedTasks',
-    ];
-
-    /**
-     * Setup Defaults
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-    }
-
-    /**
-     *
-     * @return void
-     */
-    public function testAllAppAndPluginTasks()
-    {
-        $this->taskFinder = new TaskFinder();
-
-        $result = $this->taskFinder->allAppAndPluginTasks();
-        $this->assertCount(1, $result);
-        $this->assertArraySubset([
-            'Queue.QueueExample'
-        ], $result);
-        $this->assertTrue(!in_array('Foo.QueueFoo', $result));
-    }
+	/**
+	 *
+	 * @var \Queue\Shell\QueueShell|\PHPUnit_Framework_MockObject_MockObject
+	 */
+	public $QueueShell;
+
+	/**
+	 *
+	 * @var \Queue\Queue\TaskFinder
+	 */
+	protected $taskFinder;
+
+	/**
+	 * Fixtures to load
+	 *
+	 * @var array
+	 */
+	public $fixtures = [
+		'plugin.Queue.QueuedTasks',
+	];
+
+	/**
+	 * Setup Defaults
+	 *
+	 * @return void
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+	}
+
+	/**
+	 *
+	 * @return void
+	 */
+	public function testAllAppAndPluginTasks()
+	{
+		$this->taskFinder = new TaskFinder();
+
+		$result = $this->taskFinder->allAppAndPluginTasks();
+		$this->assertCount(1, $result);
+		$this->assertArraySubset([
+			'Queue.QueueExample'
+		], $result);
+		$this->assertTrue(!in_array('Foo.QueueFoo', $result));
+	}
 }

tests/TestCase/Model/Table/QueuedTasksTableTest.php

Indentation +260 added lines, -260 removed lines

@@ -19,292 +19,292 @@
 class QueuedTasksTableTest extends TestCase
 {
 
-    /**
-     *
-     * @var \Queue\Model\Table\QueuedTasksTable
-     */
-    protected $QueuedTasks;
+	/**
+	 *
+	 * @var \Queue\Model\Table\QueuedTasksTable
+	 */
+	protected $QueuedTasks;
 
-    /**
-     * Fixtures
-     *
-     * @var array
-     */
-    public $fixtures = [
-        'plugin.Queue.QueuedTasks'
-    ];
+	/**
+	 * Fixtures
+	 *
+	 * @var array
+	 */
+	public $fixtures = [
+		'plugin.Queue.QueuedTasks'
+	];
 
-    /**
-     * setUp method
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $config = TableRegistry::getTableLocator()->exists('QueuedTasks') ? [] : [
-            'className' => QueuedTasksTable::class
-        ];
-        $this->QueuedTasks = TableRegistry::getTableLocator()->get('QueuedTasks', $config);
-    }
+	/**
+	 * setUp method
+	 *
+	 * @return void
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+		$config = TableRegistry::getTableLocator()->exists('QueuedTasks') ? [] : [
+			'className' => QueuedTasksTable::class
+		];
+		$this->QueuedTasks = TableRegistry::getTableLocator()->get('QueuedTasks', $config);
+	}
 
-    /**
-     * Basic Instance test
-     *
-     * @return void
-     */
-    public function testQueueInstance()
-    {
-        $this->assertInstanceOf(QueuedTasksTable::class, $this->QueuedTasks);
-    }
+	/**
+	 * Basic Instance test
+	 *
+	 * @return void
+	 */
+	public function testQueueInstance()
+	{
+		$this->assertInstanceOf(QueuedTasksTable::class, $this->QueuedTasks);
+	}
 
-    /**
-     * Test the basic create and length evaluation functions.
-     *
-     * @return void
-     */
-    public function testCreateAndCount()
-    {
-        // at first, the queue should contain 0 items.
-        $this->assertSame(0, $this->QueuedTasks->getLength());
+	/**
+	 * Test the basic create and length evaluation functions.
+	 *
+	 * @return void
+	 */
+	public function testCreateAndCount()
+	{
+		// at first, the queue should contain 0 items.
+		$this->assertSame(0, $this->QueuedTasks->getLength());
 
-        // create a job
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('test1', [
-            'some' => 'random',
-            'test' => 'data'
-        ]));
+		// create a job
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('test1', [
+			'some' => 'random',
+			'test' => 'data'
+		]));
 
-        // test if queue Length is 1 now.
-        $this->assertSame(1, $this->QueuedTasks->getLength());
+		// test if queue Length is 1 now.
+		$this->assertSame(1, $this->QueuedTasks->getLength());
 
-        // create some more jobs
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('test2', [
-            'some' => 'random',
-            'test' => 'data2'
-        ]));
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('test2', [
-            'some' => 'random',
-            'test' => 'data3'
-        ]));
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('test3', [
-            'some' => 'random',
-            'test' => 'data4'
-        ]));
+		// create some more jobs
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('test2', [
+			'some' => 'random',
+			'test' => 'data2'
+		]));
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('test2', [
+			'some' => 'random',
+			'test' => 'data3'
+		]));
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('test3', [
+			'some' => 'random',
+			'test' => 'data4'
+		]));
 
-        // overall queueLength shpould now be 4
-        $this->assertSame(4, $this->QueuedTasks->getLength());
+		// overall queueLength shpould now be 4
+		$this->assertSame(4, $this->QueuedTasks->getLength());
 
-        // there should be 1 task of type 'test1', one of type 'test3' and 2 of type 'test2'
-        $this->assertSame(1, $this->QueuedTasks->getLength('test1'));
-        $this->assertSame(2, $this->QueuedTasks->getLength('test2'));
-        $this->assertSame(1, $this->QueuedTasks->getLength('test3'));
-    }
+		// there should be 1 task of type 'test1', one of type 'test3' and 2 of type 'test2'
+		$this->assertSame(1, $this->QueuedTasks->getLength('test1'));
+		$this->assertSame(2, $this->QueuedTasks->getLength('test2'));
+		$this->assertSame(1, $this->QueuedTasks->getLength('test3'));
+	}
 
-    /**
-     * Test the basic create and fetch functions.
-     *
-     * @return void
-     */
-    public function testCreateAndFetch()
-    {
-        $this->_needsConnection();
+	/**
+	 * Test the basic create and fetch functions.
+	 *
+	 * @return void
+	 */
+	public function testCreateAndFetch()
+	{
+		$this->_needsConnection();
 
-        // $capabilities is a list of tasks the worker can run.
-        $capabilities = [
-            'task1' => [
-                'name' => 'task1',
-                'timeout' => 100,
-                'retries' => 2
-            ]
-        ];
-        $testData = [
-            'x1' => 'y1',
-            'x2' => 'y2',
-            'x3' => 'y3',
-            'x4' => 'y4'
-        ];
+		// $capabilities is a list of tasks the worker can run.
+		$capabilities = [
+			'task1' => [
+				'name' => 'task1',
+				'timeout' => 100,
+				'retries' => 2
+			]
+		];
+		$testData = [
+			'x1' => 'y1',
+			'x2' => 'y2',
+			'x3' => 'y3',
+			'x4' => 'y4'
+		];
 
-        // start off empty.
-        $this->assertSame([], $this->QueuedTasks->find()
-            ->toArray());
-        // at first, the queue should contain 0 items.
-        $this->assertSame(0, $this->QueuedTasks->getLength());
-        // there are no jobs, so we cant fetch any.
-        $this->assertNull($this->QueuedTasks->requestJob($capabilities));
-        // insert one job.
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', $testData));
+		// start off empty.
+		$this->assertSame([], $this->QueuedTasks->find()
+			->toArray());
+		// at first, the queue should contain 0 items.
+		$this->assertSame(0, $this->QueuedTasks->getLength());
+		// there are no jobs, so we cant fetch any.
+		$this->assertNull($this->QueuedTasks->requestJob($capabilities));
+		// insert one job.
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('task1', $testData));
 
-        // fetch and check the first job.
-        $job = $this->QueuedTasks->requestJob($capabilities);
-        $this->assertSame(1, $job->id);
-        $this->assertSame('task1', $job->task);
-        $this->assertSame(0, $job->failed_count);
-        $this->assertNull($job->completed);
-        $this->assertSame($testData, unserialize($job->data));
+		// fetch and check the first job.
+		$job = $this->QueuedTasks->requestJob($capabilities);
+		$this->assertSame(1, $job->id);
+		$this->assertSame('task1', $job->task);
+		$this->assertSame(0, $job->failed_count);
+		$this->assertNull($job->completed);
+		$this->assertSame($testData, unserialize($job->data));
 
-        // after this job has been fetched, it may not be reassigned.
-        $result = $this->QueuedTasks->requestJob($capabilities);
-        $this->assertNull($result);
+		// after this job has been fetched, it may not be reassigned.
+		$result = $this->QueuedTasks->requestJob($capabilities);
+		$this->assertNull($result);
 
-        // queue length is still 1 since the first job did not finish.
-        $this->assertSame(1, $this->QueuedTasks->getLength());
+		// queue length is still 1 since the first job did not finish.
+		$this->assertSame(1, $this->QueuedTasks->getLength());
 
-        // Now mark Task1 as done
-        $this->assertTrue($this->QueuedTasks->markJobDone($job));
+		// Now mark Task1 as done
+		$this->assertTrue($this->QueuedTasks->markJobDone($job));
 
-        // Should be 0 again.
-        $this->assertSame(0, $this->QueuedTasks->getLength());
-    }
+		// Should be 0 again.
+		$this->assertSame(0, $this->QueuedTasks->getLength());
+	}
 
-    /**
-     * Test the delivery of jobs in sequence, skipping fetched but not completed tasks.
-     *
-     * @return void
-     */
-    public function testSequence()
-    {
-        $this->_needsConnection();
+	/**
+	 * Test the delivery of jobs in sequence, skipping fetched but not completed tasks.
+	 *
+	 * @return void
+	 */
+	public function testSequence()
+	{
+		$this->_needsConnection();
 
-        // $capabilities is a list of tasks the worker can run.
-        $capabilities = [
-            'task1' => [
-                'name' => 'task1',
-                'timeout' => 100,
-                'retries' => 2
-            ]
-        ];
-        // at first, the queue should contain 0 items.
-        $this->assertSame(0, $this->QueuedTasks->getLength());
-        // create some more jobs
-        foreach (range(0, 9) as $num) {
-            $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
-                'tasknum' => $num
-            ]));
-        }
-        // 10 jobs in the queue.
-        $this->assertSame(10, $this->QueuedTasks->getLength());
+		// $capabilities is a list of tasks the worker can run.
+		$capabilities = [
+			'task1' => [
+				'name' => 'task1',
+				'timeout' => 100,
+				'retries' => 2
+			]
+		];
+		// at first, the queue should contain 0 items.
+		$this->assertSame(0, $this->QueuedTasks->getLength());
+		// create some more jobs
+		foreach (range(0, 9) as $num) {
+			$this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
+				'tasknum' => $num
+			]));
+		}
+		// 10 jobs in the queue.
+		$this->assertSame(10, $this->QueuedTasks->getLength());
 
-        // jobs should be fetched in the original sequence.
-        $array = [];
-        foreach (range(0, 4) as $num) {
-            $array[$num] = $this->QueuedTasks->requestJob($capabilities);
-            $jobData = unserialize($array[$num]['data']);
-            $this->assertSame($num, $jobData['tasknum']);
-        }
-        // now mark them as done
-        foreach (range(0, 4) as $num) {
-            $this->assertTrue($this->QueuedTasks->markJobDone($array[$num]));
-            $this->assertSame(9 - $num, $this->QueuedTasks->getLength());
-        }
+		// jobs should be fetched in the original sequence.
+		$array = [];
+		foreach (range(0, 4) as $num) {
+			$array[$num] = $this->QueuedTasks->requestJob($capabilities);
+			$jobData = unserialize($array[$num]['data']);
+			$this->assertSame($num, $jobData['tasknum']);
+		}
+		// now mark them as done
+		foreach (range(0, 4) as $num) {
+			$this->assertTrue($this->QueuedTasks->markJobDone($array[$num]));
+			$this->assertSame(9 - $num, $this->QueuedTasks->getLength());
+		}
 
-        // jobs should be fetched in the original sequence.
-        foreach (range(5, 9) as $num) {
-            $job = $this->QueuedTasks->requestJob($capabilities);
-            $jobData = unserialize($job->data);
-            $this->assertSame($num, $jobData['tasknum']);
-            $this->assertTrue($this->QueuedTasks->markJobDone($job));
-            $this->assertSame(9 - $num, $this->QueuedTasks->getLength());
-        }
-    }
+		// jobs should be fetched in the original sequence.
+		foreach (range(5, 9) as $num) {
+			$job = $this->QueuedTasks->requestJob($capabilities);
+			$jobData = unserialize($job->data);
+			$this->assertSame($num, $jobData['tasknum']);
+			$this->assertTrue($this->QueuedTasks->markJobDone($job));
+			$this->assertSame(9 - $num, $this->QueuedTasks->getLength());
+		}
+	}
 
-    /**
-     * Test creating Jobs to run close to a specified time, and strtotime parsing.
-     * Using toUnixString() function to convert Time object to timestamp, instead of strtotime
-     *
-     * @return null
-     */
-    public function testNotBefore()
-    {
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', null, '+ 1 Min'));
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', null, '+ 1 Day'));
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', null, '2009-07-01 12:00:00'));
-        $data = $this->QueuedTasks->find('all')->toArray();
-        $this->assertWithinRange((new Time('+ 1 Min'))->toUnixString(), $data[0]['not_before']->toUnixString(), 60);
-        $this->assertWithinRange((new Time('+ 1 Day'))->toUnixString(), $data[1]['not_before']->toUnixString(), 60);
-        $this->assertWithinRange((new Time('2009-07-01 12:00:00'))->toUnixString(), $data[2]['not_before']->toUnixString(), 60);
-    }
+	/**
+	 * Test creating Jobs to run close to a specified time, and strtotime parsing.
+	 * Using toUnixString() function to convert Time object to timestamp, instead of strtotime
+	 *
+	 * @return null
+	 */
+	public function testNotBefore()
+	{
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('task1', null, '+ 1 Min'));
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('task1', null, '+ 1 Day'));
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('task1', null, '2009-07-01 12:00:00'));
+		$data = $this->QueuedTasks->find('all')->toArray();
+		$this->assertWithinRange((new Time('+ 1 Min'))->toUnixString(), $data[0]['not_before']->toUnixString(), 60);
+		$this->assertWithinRange((new Time('+ 1 Day'))->toUnixString(), $data[1]['not_before']->toUnixString(), 60);
+		$this->assertWithinRange((new Time('2009-07-01 12:00:00'))->toUnixString(), $data[2]['not_before']->toUnixString(), 60);
+	}
 
-    /**
-     * Test Job reordering depending on 'notBefore' field.
-     * Jobs with an expired not_before field should be executed before any other job without specific timing info.
-     *
-     * @return void
-     */
-    public function testNotBeforeOrder()
-    {
-        $this->_needsConnection();
+	/**
+	 * Test Job reordering depending on 'notBefore' field.
+	 * Jobs with an expired not_before field should be executed before any other job without specific timing info.
+	 *
+	 * @return void
+	 */
+	public function testNotBeforeOrder()
+	{
+		$this->_needsConnection();
 
-        $capabilities = [
-            'task1' => [
-                'name' => 'task1',
-                'timeout' => 100,
-                'retries' => 2
-            ],
-            'dummytask' => [
-                'name' => 'dummytask',
-                'timeout' => 100,
-                'retries' => 2
-            ]
-        ];
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('dummytask'));
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('dummytask'));
-        // create a task with it's execution target some seconds in the past, so it should jump to the top of the testCreateAndFetchlist.
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
-            'three'
-        ], '- 3 Seconds'));
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
-            'two'
-        ], '- 5 Seconds'));
-        $this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
-            'one'
-        ], '- 7 Seconds'));
+		$capabilities = [
+			'task1' => [
+				'name' => 'task1',
+				'timeout' => 100,
+				'retries' => 2
+			],
+			'dummytask' => [
+				'name' => 'dummytask',
+				'timeout' => 100,
+				'retries' => 2
+			]
+		];
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('dummytask'));
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('dummytask'));
+		// create a task with it's execution target some seconds in the past, so it should jump to the top of the testCreateAndFetchlist.
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
+			'three'
+		], '- 3 Seconds'));
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
+			'two'
+		], '- 5 Seconds'));
+		$this->assertTrue((bool)$this->QueuedTasks->createJob('task1', [
+			'one'
+		], '- 7 Seconds'));
 
-        // when using requestJob, the jobs we just created should be delivered in this order, NOT the order in which they where created.
-        $expected = [
-            [
-                'name' => 'task1',
-                'data' => [
-                    'one'
-                ]
-            ],
-            [
-                'name' => 'task1',
-                'data' => [
-                    'two'
-                ]
-            ],
-            [
-                'name' => 'task1',
-                'data' => [
-                    'three'
-                ]
-            ],
-            [
-                'name' => 'dummytask',
-                'data' => null
-            ],
-            [
-                'name' => 'dummytask',
-                'data' => null
-            ]
-        ];
+		// when using requestJob, the jobs we just created should be delivered in this order, NOT the order in which they where created.
+		$expected = [
+			[
+				'name' => 'task1',
+				'data' => [
+					'one'
+				]
+			],
+			[
+				'name' => 'task1',
+				'data' => [
+					'two'
+				]
+			],
+			[
+				'name' => 'task1',
+				'data' => [
+					'three'
+				]
+			],
+			[
+				'name' => 'dummytask',
+				'data' => null
+			],
+			[
+				'name' => 'dummytask',
+				'data' => null
+			]
+		];
 
-        foreach ($expected as $item) {
-            $tmp = $this->QueuedTasks->requestJob($capabilities);
+		foreach ($expected as $item) {
+			$tmp = $this->QueuedTasks->requestJob($capabilities);
 
-            $this->assertSame($item['name'], $tmp['task']);
-            $this->assertEquals($item['data'], unserialize($tmp['data']));
-        }
-    }
+			$this->assertSame($item['name'], $tmp['task']);
+			$this->assertEquals($item['data'], unserialize($tmp['data']));
+		}
+	}
 
-    /**
-     * Helper method for skipping tests that need a real connection.
-     *
-     * @return void
-     */
-    protected function _needsConnection()
-    {
-        $config = ConnectionManager::getConfig('test');
-        $this->skipIf(strpos($config['driver'], 'Mysql') === false, 'Only Mysql is working yet for this.');
-    }
+	/**
+	 * Helper method for skipping tests that need a real connection.
+	 *
+	 * @return void
+	 */
+	protected function _needsConnection()
+	{
+		$config = ConnectionManager::getConfig('test');
+		$this->skipIf(strpos($config['driver'], 'Mysql') === false, 'Only Mysql is working yet for this.');
+	}
 }

tests/TestCase/Shell/QueueShellTest.php

Indentation +183 added lines, -183 removed lines

@@ -11,187 +11,187 @@
 
 class QueueShellTest extends TestCase
 {
-    use ToolsTestTrait;
-
-    /**
-     *
-     * @var \Queue\Shell\QueueShell|\PHPUnit_Framework_MockObject_MockObject
-     */
-    public $QueueShell;
-
-    /**
-     *
-     * @var \Tools\TestSuite\ConsoleOutput
-     */
-    public $out;
-
-    /**
-     *
-     * @var \Tools\TestSuite\ConsoleOutput
-     */
-    public $err;
-
-    /**
-     * Fixtures to load
-     *
-     * @var array
-     */
-    public $fixtures = [
-        'plugin.Queue.QueuedTasks'
-    ];
-
-    /**
-     * Setup Defaults
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-
-        $this->out = new ConsoleOutput();
-        $this->err = new ConsoleOutput();
-        $io = new ConsoleIo($this->out, $this->err);
-
-        $this->QueueShell = $this->getMockBuilder(QueueShell::class)
-            ->setMethods([
-                'in',
-                'err',
-                '_stop'
-            ])
-            ->setConstructorArgs([
-                $io
-            ])
-            ->getMock();
-        $this->QueueShell->initialize();
-
-        Configure::write('Queue', [
-            'sleepTime' => 2,
-            'defaultWorkerTimeout' => 3,
-            'workerMaxRuntime' => 5,
-            'cleanupTimeout' => 10,
-            'exitWhenNothingToDo' => false,
-            'log' => false
-        ]);
-    }
-
-    /**
-     *
-     * @return void
-     */
-    public function testObject()
-    {
-        $this->assertTrue(is_object($this->QueueShell));
-        $this->assertInstanceOf(QueueShell::class, $this->QueueShell);
-    }
-
-    /**
-     *
-     * @return void
-     */
-    public function testStats()
-    {
-        $this->_needsConnection();
-
-        $this->QueueShell->stats();
-        $this->assertContains('Total unfinished jobs: 0', $this->out->output());
-    }
-
-    /**
-     *
-     * @return void
-     */
-    public function testSettings()
-    {
-        $this->QueueShell->settings();
-        $this->assertContains('* cleanupTimeout: 10', $this->out->output());
-    }
-
-    /**
-     *
-     * @return void
-     */
-    public function testAddInexistent()
-    {
-        $this->QueueShell->args[] = 'FooBar';
-        $this->QueueShell->add();
-        $this->assertContains('Error: Task not found: FooBar', $this->out->output());
-    }
-
-    /**
-     *
-     * @return void
-     */
-    public function testAdd()
-    {
-        $this->QueueShell->args[] = 'Example';
-        $this->QueueShell->add();
-
-        $this->assertContains('OK, job created, now run the worker', $this->out->output(), print_r($this->out->output(), true));
-    }
-
-    /**
-     *
-     * @return void
-     */
-    public function testTimeNeeded()
-    {
-        $this->QueueShell = $this->getMockBuilder(QueueShell::class)
-            ->setMethods([
-                '_time'
-            ])
-            ->getMock();
-
-        $first = time();
-        $second = $first - HOUR + MINUTE;
-        $this->QueueShell->expects($this->at(0))
-            ->method('_time')
-            ->will($this->returnValue($first));
-        $this->QueueShell->expects($this->at(1))
-            ->method('_time')
-            ->will($this->returnValue($second));
-        $this->QueueShell->expects($this->exactly(2))
-            ->method('_time')
-            ->withAnyParameters();
-
-        $result = $this->invokeMethod($this->QueueShell, '_timeNeeded');
-        $this->assertSame('3540s', $result);
-    }
-
-    /**
-     *
-     * @return void
-     */
-    public function testMemoryUsage()
-    {
-        $result = $this->invokeMethod($this->QueueShell, '_memoryUsage');
-        $this->assertRegExp('/^\d+MB/', $result, 'Should be e.g. `17MB` or `17MB/1GB` etc.');
-    }
-
-    /**
-     *
-     * @return void
-     */
-    public function testStringToArray()
-    {
-        $string = 'Foo,Bar,';
-        $result = $this->invokeMethod($this->QueueShell, '_stringToArray', [$string]);
-
-        $expected = [
-            'Foo',
-            'Bar'
-        ];
-        $this->assertSame($expected, $result);
-    }
-
-    /**
-     * Helper method for skipping tests that need a real connection.
-     *
-     * @return void
-     */
-    protected function _needsConnection()
-    {
-        $config = ConnectionManager::getConfig('test');
-        $this->skipIf(strpos($config['driver'], 'Mysql') === false, 'Only Mysql is working yet for this.');
-    }
+	use ToolsTestTrait;
+
+	/**
+	 *
+	 * @var \Queue\Shell\QueueShell|\PHPUnit_Framework_MockObject_MockObject
+	 */
+	public $QueueShell;
+
+	/**
+	 *
+	 * @var \Tools\TestSuite\ConsoleOutput
+	 */
+	public $out;
+
+	/**
+	 *
+	 * @var \Tools\TestSuite\ConsoleOutput
+	 */
+	public $err;
+
+	/**
+	 * Fixtures to load
+	 *
+	 * @var array
+	 */
+	public $fixtures = [
+		'plugin.Queue.QueuedTasks'
+	];
+
+	/**
+	 * Setup Defaults
+	 *
+	 * @return void
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->out = new ConsoleOutput();
+		$this->err = new ConsoleOutput();
+		$io = new ConsoleIo($this->out, $this->err);
+
+		$this->QueueShell = $this->getMockBuilder(QueueShell::class)
+			->setMethods([
+				'in',
+				'err',
+				'_stop'
+			])
+			->setConstructorArgs([
+				$io
+			])
+			->getMock();
+		$this->QueueShell->initialize();
+
+		Configure::write('Queue', [
+			'sleepTime' => 2,
+			'defaultWorkerTimeout' => 3,
+			'workerMaxRuntime' => 5,
+			'cleanupTimeout' => 10,
+			'exitWhenNothingToDo' => false,
+			'log' => false
+		]);
+	}
+
+	/**
+	 *
+	 * @return void
+	 */
+	public function testObject()
+	{
+		$this->assertTrue(is_object($this->QueueShell));
+		$this->assertInstanceOf(QueueShell::class, $this->QueueShell);
+	}
+
+	/**
+	 *
+	 * @return void
+	 */
+	public function testStats()
+	{
+		$this->_needsConnection();
+
+		$this->QueueShell->stats();
+		$this->assertContains('Total unfinished jobs: 0', $this->out->output());
+	}
+
+	/**
+	 *
+	 * @return void
+	 */
+	public function testSettings()
+	{
+		$this->QueueShell->settings();
+		$this->assertContains('* cleanupTimeout: 10', $this->out->output());
+	}
+
+	/**
+	 *
+	 * @return void
+	 */
+	public function testAddInexistent()
+	{
+		$this->QueueShell->args[] = 'FooBar';
+		$this->QueueShell->add();
+		$this->assertContains('Error: Task not found: FooBar', $this->out->output());
+	}
+
+	/**
+	 *
+	 * @return void
+	 */
+	public function testAdd()
+	{
+		$this->QueueShell->args[] = 'Example';
+		$this->QueueShell->add();
+
+		$this->assertContains('OK, job created, now run the worker', $this->out->output(), print_r($this->out->output(), true));
+	}
+
+	/**
+	 *
+	 * @return void
+	 */
+	public function testTimeNeeded()
+	{
+		$this->QueueShell = $this->getMockBuilder(QueueShell::class)
+			->setMethods([
+				'_time'
+			])
+			->getMock();
+
+		$first = time();
+		$second = $first - HOUR + MINUTE;
+		$this->QueueShell->expects($this->at(0))
+			->method('_time')
+			->will($this->returnValue($first));
+		$this->QueueShell->expects($this->at(1))
+			->method('_time')
+			->will($this->returnValue($second));
+		$this->QueueShell->expects($this->exactly(2))
+			->method('_time')
+			->withAnyParameters();
+
+		$result = $this->invokeMethod($this->QueueShell, '_timeNeeded');
+		$this->assertSame('3540s', $result);
+	}
+
+	/**
+	 *
+	 * @return void
+	 */
+	public function testMemoryUsage()
+	{
+		$result = $this->invokeMethod($this->QueueShell, '_memoryUsage');
+		$this->assertRegExp('/^\d+MB/', $result, 'Should be e.g. `17MB` or `17MB/1GB` etc.');
+	}
+
+	/**
+	 *
+	 * @return void
+	 */
+	public function testStringToArray()
+	{
+		$string = 'Foo,Bar,';
+		$result = $this->invokeMethod($this->QueueShell, '_stringToArray', [$string]);
+
+		$expected = [
+			'Foo',
+			'Bar'
+		];
+		$this->assertSame($expected, $result);
+	}
+
+	/**
+	 * Helper method for skipping tests that need a real connection.
+	 *
+	 * @return void
+	 */
+	protected function _needsConnection()
+	{
+		$config = ConnectionManager::getConfig('test');
+		$this->skipIf(strpos($config['driver'], 'Mysql') === false, 'Only Mysql is working yet for this.');
+	}
 }

src/Queue/Config.php

Indentation +53 added lines, -53 removed lines

@@ -6,57 +6,57 @@
 class Config
 {
 
-    /**
-     *
-     * @return int
-     */
-    public static function defaultWorkerTimeout()
-    {
-        return Configure::read('Queue.defaultWorkerTimeout', 600); // 10min
-    }
-
-    /**
-     *
-     * @return int
-     */
-    public static function workerMaxRuntime()
-    {
-        return Configure::read('Queue.workerMaxRuntime', 120);
-    }
-
-    /**
-     *
-     * @return int
-     */
-    public static function cleanupTimeout()
-    {
-        return Configure::read('Queue.cleanupTimeout', 2592000); // 30 days
-    }
-
-    /**
-     *
-     * @return int
-     */
-    public static function sleepTime()
-    {
-        return Configure::read('Queue.sleepTime', 10);
-    }
-
-    /**
-     *
-     * @return int
-     */
-    public static function gcprob()
-    {
-        return Configure::read('Queue.gcprob', 10);
-    }
-
-    /**
-     *
-     * @return int
-     */
-    public static function defaultWorkerRetries()
-    {
-        return Configure::read('Queue.defaultWorkerRetries', 1);
-    }
+	/**
+	 *
+	 * @return int
+	 */
+	public static function defaultWorkerTimeout()
+	{
+		return Configure::read('Queue.defaultWorkerTimeout', 600); // 10min
+	}
+
+	/**
+	 *
+	 * @return int
+	 */
+	public static function workerMaxRuntime()
+	{
+		return Configure::read('Queue.workerMaxRuntime', 120);
+	}
+
+	/**
+	 *
+	 * @return int
+	 */
+	public static function cleanupTimeout()
+	{
+		return Configure::read('Queue.cleanupTimeout', 2592000); // 30 days
+	}
+
+	/**
+	 *
+	 * @return int
+	 */
+	public static function sleepTime()
+	{
+		return Configure::read('Queue.sleepTime', 10);
+	}
+
+	/**
+	 *
+	 * @return int
+	 */
+	public static function gcprob()
+	{
+		return Configure::read('Queue.gcprob', 10);
+	}
+
+	/**
+	 *
+	 * @return int
+	 */
+	public static function defaultWorkerRetries()
+	{
+		return Configure::read('Queue.defaultWorkerRetries', 1);
+	}
 }

src/Mailer/Transport/SimpleQueueTransport.php

Indentation +105 added lines, -105 removed lines

@@ -15,115 +15,115 @@
 class SimpleQueueTransport extends AbstractTransport
 {
 
-    /**
-     * Send mail
-     *
-     * @param \Cake\Mailer\Email $email Email
-     * @return array
-     */
-    public function send(Email $email)
-    {
-        if (!empty($this->_config['queue'])) {
-            $this->_config = $this->_config['queue'] + $this->_config;
-            $email->setConfig((array)$this->_config['queue'] + [
-                'queue' => []
-            ]);
-            unset($this->_config['queue']);
-        }
+	/**
+	 * Send mail
+	 *
+	 * @param \Cake\Mailer\Email $email Email
+	 * @return array
+	 */
+	public function send(Email $email)
+	{
+		if (!empty($this->_config['queue'])) {
+			$this->_config = $this->_config['queue'] + $this->_config;
+			$email->setConfig((array)$this->_config['queue'] + [
+				'queue' => []
+			]);
+			unset($this->_config['queue']);
+		}
 
-        $settings = [
-            'from' => [
-                $email->getFrom()
-            ],
-            'to' => [
-                $email->getTo()
-            ],
-            'cc' => [
-                $email->getCc()
-            ],
-            'bcc' => [
-                $email->getBcc()
-            ],
-            'charset' => [
-                $email->getCharset()
-            ],
-            'replyTo' => [
-                $email->getReplyTo()
-            ],
-            'readReceipt' => [
-                $email->getReadReceipt()
-            ],
-            'returnPath' => [
-                $email->getReturnPath()
-            ],
-            'messageId' => [
-                $email->getMessageId()
-            ],
-            'domain' => [
-                $email->getDomain()
-            ],
-            'headers' => [
-                $email->getHeaders()
-            ],
-            'headerCharset' => [
-                $email->getHeaderCharset()
-            ],
-            'theme' => [
-                $email->viewBuilder()->getTheme()
-            ],
-            'profile' => [
-                $email->getProfile()
-            ],
-            'emailFormat' => [
-                $email->getEmailFormat()
-            ],
-            'subject' => method_exists($email, 'getOriginalSubject') ? [
-                $email->getOriginalSubject()
-            ] : [
-                $email->getSubject()
-            ],
-            'transport' => [
-                $this->_config['transport']
-            ],
-            'attachments' => [
-                $email->getAttachments()
-            ],
-            'template' => [
-                $email->viewBuilder()->getTemplate()
-            ],
-            'layout' => [
-                $email->viewBuilder()->getLayout()
-            ],
-            'viewVars' => [
-                $email->getViewVars()
-            ]
-        ];
+		$settings = [
+			'from' => [
+				$email->getFrom()
+			],
+			'to' => [
+				$email->getTo()
+			],
+			'cc' => [
+				$email->getCc()
+			],
+			'bcc' => [
+				$email->getBcc()
+			],
+			'charset' => [
+				$email->getCharset()
+			],
+			'replyTo' => [
+				$email->getReplyTo()
+			],
+			'readReceipt' => [
+				$email->getReadReceipt()
+			],
+			'returnPath' => [
+				$email->getReturnPath()
+			],
+			'messageId' => [
+				$email->getMessageId()
+			],
+			'domain' => [
+				$email->getDomain()
+			],
+			'headers' => [
+				$email->getHeaders()
+			],
+			'headerCharset' => [
+				$email->getHeaderCharset()
+			],
+			'theme' => [
+				$email->viewBuilder()->getTheme()
+			],
+			'profile' => [
+				$email->getProfile()
+			],
+			'emailFormat' => [
+				$email->getEmailFormat()
+			],
+			'subject' => method_exists($email, 'getOriginalSubject') ? [
+				$email->getOriginalSubject()
+			] : [
+				$email->getSubject()
+			],
+			'transport' => [
+				$this->_config['transport']
+			],
+			'attachments' => [
+				$email->getAttachments()
+			],
+			'template' => [
+				$email->viewBuilder()->getTemplate()
+			],
+			'layout' => [
+				$email->viewBuilder()->getLayout()
+			],
+			'viewVars' => [
+				$email->getViewVars()
+			]
+		];
 
-        foreach ($settings as $setting => $value) {
-            if (array_key_exists(0, $value) && ($value[0] === null || $value[0] === [])) {
-                unset($settings[$setting]);
-            }
-        }
+		foreach ($settings as $setting => $value) {
+			if (array_key_exists(0, $value) && ($value[0] === null || $value[0] === [])) {
+				unset($settings[$setting]);
+			}
+		}
 
-        $QueuedJobs = $this->getQueuedJobsModel();
-        $result = $QueuedJobs->createJob('Email', [
-            'settings' => $settings
-        ]);
-        $result['headers'] = '';
-        $result['message'] = '';
+		$QueuedJobs = $this->getQueuedJobsModel();
+		$result = $QueuedJobs->createJob('Email', [
+			'settings' => $settings
+		]);
+		$result['headers'] = '';
+		$result['message'] = '';
 
-        return $result->toArray();
-    }
+		return $result->toArray();
+	}
 
-    /**
-     *
-     * @return \Queue\Model\Table\QueuedTasksTable
-     */
-    protected function getQueuedJobsModel()
-    {
-        /** @var \Queue\Model\Table\QueuedTasksTable $table */
-        $table = TableRegistry::getTableLocator()->get('Queue.QueuedTasks');
+	/**
+	 *
+	 * @return \Queue\Model\Table\QueuedTasksTable
+	 */
+	protected function getQueuedJobsModel()
+	{
+		/** @var \Queue\Model\Table\QueuedTasksTable $table */
+		$table = TableRegistry::getTableLocator()->get('Queue.QueuedTasks');
 
-        return $table;
-    }
+		return $table;
+	}
 }

src/Mailer/Transport/QueueTransport.php

Indentation +27 added lines, -27 removed lines

@@ -15,34 +15,34 @@
 class QueueTransport extends AbstractTransport
 {
 
-    /**
-     * Send mail
-     *
-     * @param \Cake\Mailer\Email $email Email
-     * @return array
-     */
-    public function send(Email $email)
-    {
-        if (!empty($this->_config['queue'])) {
-            $this->_config = $this->_config['queue'] + $this->_config;
-            $email->setConfig((array)$this->_config['queue'] + [
-                'queue' => []
-            ]);
-            unset($this->_config['queue']);
-        }
+	/**
+	 * Send mail
+	 *
+	 * @param \Cake\Mailer\Email $email Email
+	 * @return array
+	 */
+	public function send(Email $email)
+	{
+		if (!empty($this->_config['queue'])) {
+			$this->_config = $this->_config['queue'] + $this->_config;
+			$email->setConfig((array)$this->_config['queue'] + [
+				'queue' => []
+			]);
+			unset($this->_config['queue']);
+		}
 
-        $transport = $this->_config['transport'];
-        $email->setTransport($transport);
+		$transport = $this->_config['transport'];
+		$email->setTransport($transport);
 
-        /** @var \Queue\Model\Table\QueuedTasksTable $QueuedTasks */
-        $QueuedTasks = TableRegistry::getTableLocator()->get('Queue.QueuedTasks');
-        $result = $QueuedTasks->createJob('Email', [
-            'transport' => $transport,
-            'settings' => $email
-        ]);
-        $result['headers'] = '';
-        $result['message'] = '';
+		/** @var \Queue\Model\Table\QueuedTasksTable $QueuedTasks */
+		$QueuedTasks = TableRegistry::getTableLocator()->get('Queue.QueuedTasks');
+		$result = $QueuedTasks->createJob('Email', [
+			'transport' => $transport,
+			'settings' => $email
+		]);
+		$result['headers'] = '';
+		$result['message'] = '';
 
-        return $result->toArray();
-    }
+		return $result->toArray();
+	}
 }

tests/TestCase/Mailer/Transport/SimpleQueueTransportTest.php

Indentation +107 added lines, -107 removed lines

@@ -11,121 +11,121 @@
 class SimpleQueueTransportTest extends TestCase
 {
 
-    /**
-     * Fixtures to load
-     *
-     * @var array
-     */
-    public $fixtures = [
-        'plugin.Queue.QueuedTasks'
-    ];
+	/**
+	 * Fixtures to load
+	 *
+	 * @var array
+	 */
+	public $fixtures = [
+		'plugin.Queue.QueuedTasks'
+	];
 
-    /**
-     *
-     * @var \Queue\Mailer\Transport\SimpleQueueTransport
-     */
-    protected $QueueTransport;
+	/**
+	 *
+	 * @var \Queue\Mailer\Transport\SimpleQueueTransport
+	 */
+	protected $QueueTransport;
 
-    /**
-     * Setup
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->QueueTransport = new SimpleQueueTransport();
-    }
+	/**
+	 * Setup
+	 *
+	 * @return void
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+		$this->QueueTransport = new SimpleQueueTransport();
+	}
 
-    /**
-     *
-     * @return void
-     */
-    public function testSendWithEmail()
-    {
-        $config = [
-            'transport' => 'queue',
-            'charset' => 'utf-8',
-            'headerCharset' => 'utf-8'
-        ];
+	/**
+	 *
+	 * @return void
+	 */
+	public function testSendWithEmail()
+	{
+		$config = [
+			'transport' => 'queue',
+			'charset' => 'utf-8',
+			'headerCharset' => 'utf-8'
+		];
 
-        $this->QueueTransport->setConfig($config);
-        $Email = new Email($config);
+		$this->QueueTransport->setConfig($config);
+		$Email = new Email($config);
 
-        $Email->setFrom('noreply@cakephp.org', 'CakePHP Test');
-        $Email->setTo('cake@cakephp.org', 'CakePHP');
-        $Email->setCc([
-            'mark@cakephp.org' => 'Mark Story',
-            'juan@cakephp.org' => 'Juan Basso'
-        ]);
-        $Email->setBcc('phpnut@cakephp.org');
-        $Email->setSubject('Testing Message');
-        $Email->setAttachments([
-            'wow.txt' => [
-                'data' => 'much wow!',
-                'mimetype' => 'text/plain',
-                'contentId' => 'important'
-            ]
-        ]);
+		$Email->setFrom('noreply@cakephp.org', 'CakePHP Test');
+		$Email->setTo('cake@cakephp.org', 'CakePHP');
+		$Email->setCc([
+			'mark@cakephp.org' => 'Mark Story',
+			'juan@cakephp.org' => 'Juan Basso'
+		]);
+		$Email->setBcc('phpnut@cakephp.org');
+		$Email->setSubject('Testing Message');
+		$Email->setAttachments([
+			'wow.txt' => [
+				'data' => 'much wow!',
+				'mimetype' => 'text/plain',
+				'contentId' => 'important'
+			]
+		]);
 
-        $Email->viewBuilder()->setLayout('test_layout');
-        $Email->viewBuilder()->setTemplate('test_template');
-        $Email->setSubject("L'utilisateur n'a pas pu être enregistré");
-        $Email->setReplyTo('noreply@cakephp.org');
-        $Email->setReadReceipt('noreply2@cakephp.org');
-        $Email->setReturnPath('noreply3@cakephp.org');
-        $Email->setDomain('cakephp.org');
-        $Email->viewBuilder()->setTheme('EuroTheme');
-        $Email->setEmailFormat('both');
-        $Email->set('var1', 1);
-        $Email->set('var2', 2);
+		$Email->viewBuilder()->setLayout('test_layout');
+		$Email->viewBuilder()->setTemplate('test_template');
+		$Email->setSubject("L'utilisateur n'a pas pu être enregistré");
+		$Email->setReplyTo('noreply@cakephp.org');
+		$Email->setReadReceipt('noreply2@cakephp.org');
+		$Email->setReturnPath('noreply3@cakephp.org');
+		$Email->setDomain('cakephp.org');
+		$Email->viewBuilder()->setTheme('EuroTheme');
+		$Email->setEmailFormat('both');
+		$Email->set('var1', 1);
+		$Email->set('var2', 2);
 
-        $result = $this->QueueTransport->send($Email);
-        $this->assertSame('Email', $result['task']);
-        $this->assertTrue(strlen($result['data']) < 10000);
+		$result = $this->QueueTransport->send($Email);
+		$this->assertSame('Email', $result['task']);
+		$this->assertTrue(strlen($result['data']) < 10000);
 
-        $output = unserialize($result['data']);
-        $emailReconstructed = new Email($config);
+		$output = unserialize($result['data']);
+		$emailReconstructed = new Email($config);
 
-        foreach ($output['settings'] as $method => $setting) {
-            $callable = $emailReconstructed;
-            if (in_array($method, [
-                'theme',
-                'template',
-                'layout'
-            ])) {
-                $callable = $callable->viewBuilder();
-            }
-            $setter = 'set' . ucfirst($method);
-            call_user_func_array([
-                $callable,
-                $setter
-            ], (array)$setting);
-        }
+		foreach ($output['settings'] as $method => $setting) {
+			$callable = $emailReconstructed;
+			if (in_array($method, [
+				'theme',
+				'template',
+				'layout'
+			])) {
+				$callable = $callable->viewBuilder();
+			}
+			$setter = 'set' . ucfirst($method);
+			call_user_func_array([
+				$callable,
+				$setter
+			], (array)$setting);
+		}
 
-        $this->assertEquals($emailReconstructed->getFrom(), $Email->getFrom());
-        $this->assertEquals($emailReconstructed->getTo(), $Email->getTo());
-        $this->assertEquals($emailReconstructed->getCc(), $Email->getCc());
-        $this->assertEquals($emailReconstructed->getBcc(), $Email->getBcc());
-        $this->assertEquals($emailReconstructed->getSubject(), $Email->getSubject());
-        $this->assertEquals($emailReconstructed->getCharset(), $Email->getCharset());
-        $this->assertEquals($emailReconstructed->getHeaderCharset(), $Email->getHeaderCharset());
-        $this->assertEquals($emailReconstructed->getEmailFormat(), $Email->getEmailFormat());
-        $this->assertEquals($emailReconstructed->getReplyTo(), $Email->getReplyTo());
-        $this->assertEquals($emailReconstructed->getReadReceipt(), $Email->getReadReceipt());
-        $this->assertEquals($emailReconstructed->getReturnPath(), $Email->getReturnPath());
-        // $this->assertEquals($emailReconstructed->getMessageId(), $Email->getMessageId());
-        $this->assertEquals($emailReconstructed->getDomain(), $Email->getDomain());
-        $this->assertEquals($emailReconstructed->viewBuilder()
-            ->getTheme(), $Email->viewBuilder()
-            ->getTheme());
-        $this->assertEquals($emailReconstructed->getProfile(), $Email->getProfile());
-        $this->assertEquals($emailReconstructed->getViewVars(), $Email->getViewVars());
-        $this->assertEquals($emailReconstructed->viewBuilder()
-            ->getTemplate(), $Email->viewBuilder()
-            ->getTemplate());
-        $this->assertEquals($emailReconstructed->viewBuilder()
-            ->getLayout(), $Email->viewBuilder()
-            ->getLayout());
-    }
+		$this->assertEquals($emailReconstructed->getFrom(), $Email->getFrom());
+		$this->assertEquals($emailReconstructed->getTo(), $Email->getTo());
+		$this->assertEquals($emailReconstructed->getCc(), $Email->getCc());
+		$this->assertEquals($emailReconstructed->getBcc(), $Email->getBcc());
+		$this->assertEquals($emailReconstructed->getSubject(), $Email->getSubject());
+		$this->assertEquals($emailReconstructed->getCharset(), $Email->getCharset());
+		$this->assertEquals($emailReconstructed->getHeaderCharset(), $Email->getHeaderCharset());
+		$this->assertEquals($emailReconstructed->getEmailFormat(), $Email->getEmailFormat());
+		$this->assertEquals($emailReconstructed->getReplyTo(), $Email->getReplyTo());
+		$this->assertEquals($emailReconstructed->getReadReceipt(), $Email->getReadReceipt());
+		$this->assertEquals($emailReconstructed->getReturnPath(), $Email->getReturnPath());
+		// $this->assertEquals($emailReconstructed->getMessageId(), $Email->getMessageId());
+		$this->assertEquals($emailReconstructed->getDomain(), $Email->getDomain());
+		$this->assertEquals($emailReconstructed->viewBuilder()
+			->getTheme(), $Email->viewBuilder()
+			->getTheme());
+		$this->assertEquals($emailReconstructed->getProfile(), $Email->getProfile());
+		$this->assertEquals($emailReconstructed->getViewVars(), $Email->getViewVars());
+		$this->assertEquals($emailReconstructed->viewBuilder()
+			->getTemplate(), $Email->viewBuilder()
+			->getTemplate());
+		$this->assertEquals($emailReconstructed->viewBuilder()
+			->getLayout(), $Email->viewBuilder()
+			->getLayout());
+	}
 }

tests/TestCase/Mailer/Transport/QueueTransportTest.php

Indentation +48 added lines, -48 removed lines

@@ -11,57 +11,57 @@
 class QueueTransportTest extends TestCase
 {
 
-    /**
-     * Fixtures to load
-     *
-     * @var array
-     */
-    public $fixtures = [
-        'plugin.Queue.QueuedTasks'
-    ];
+	/**
+	 * Fixtures to load
+	 *
+	 * @var array
+	 */
+	public $fixtures = [
+		'plugin.Queue.QueuedTasks'
+	];
 
-    /**
-     *
-     * @var \Queue\Mailer\Transport\QueueTransport
-     */
-    protected $QueueTransport;
+	/**
+	 *
+	 * @var \Queue\Mailer\Transport\QueueTransport
+	 */
+	protected $QueueTransport;
 
-    /**
-     * Setup
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-        $this->QueueTransport = new QueueTransport();
-    }
+	/**
+	 * Setup
+	 *
+	 * @return void
+	 */
+	public function setUp()
+	{
+		parent::setUp();
+		$this->QueueTransport = new QueueTransport();
+	}
 
-    /**
-     * TestSend method
-     *
-     * @return void
-     */
-    public function testSendWithEmail()
-    {
-        $Email = new Email();
-        $Email->setFrom('noreply@cakephp.org', 'CakePHP Test');
-        $Email->setTo('cake@cakephp.org', 'CakePHP');
-        $Email->setCc([
-            'mark@cakephp.org' => 'Mark Story',
-            'juan@cakephp.org' => 'Juan Basso'
-        ]);
-        $Email->setBcc('phpnut@cakephp.org');
-        $Email->setSubject('Testing Message');
-        $Email->setTransport('queue');
-        $config = $Email->getConfig('default');
-        $this->QueueTransport->setConfig($config);
+	/**
+	 * TestSend method
+	 *
+	 * @return void
+	 */
+	public function testSendWithEmail()
+	{
+		$Email = new Email();
+		$Email->setFrom('noreply@cakephp.org', 'CakePHP Test');
+		$Email->setTo('cake@cakephp.org', 'CakePHP');
+		$Email->setCc([
+			'mark@cakephp.org' => 'Mark Story',
+			'juan@cakephp.org' => 'Juan Basso'
+		]);
+		$Email->setBcc('phpnut@cakephp.org');
+		$Email->setSubject('Testing Message');
+		$Email->setTransport('queue');
+		$config = $Email->getConfig('default');
+		$this->QueueTransport->setConfig($config);
 
-        $result = $this->QueueTransport->send($Email);
-        $this->assertSame('Email', $result['task']);
-        $this->assertTrue(strlen($result['data']) < 10000);
+		$result = $this->QueueTransport->send($Email);
+		$this->assertSame('Email', $result['task']);
+		$this->assertTrue(strlen($result['data']) < 10000);
 
-        // $output = unserialize($result['data']);
-        // $this->assertEquals('Testing Message', $output['settings']['_subject']);
-    }
+		// $output = unserialize($result['data']);
+		// $this->assertEquals('Testing Message', $output['settings']['_subject']);
+	}
 }

src/Queue/TaskFinder.php

Indentation +68 added lines, -68 removed lines

@@ -8,80 +8,80 @@
 class TaskFinder
 {
 
-    /**
-     *
-     * @var array|null
-     */
-    protected $tasks;
+	/**
+	 *
+	 * @var array|null
+	 */
+	protected $tasks;
 
-    /**
-     * Returns all possible Queue tasks.
-     *
-     * Makes sure that app tasks are prioritized over plugin ones.
-     *
-     * @return array
-     */
-    public function allAppAndPluginTasks()
-    {
-        if ($this->tasks !== null) {
-            return $this->tasks;
-        }
+	/**
+	 * Returns all possible Queue tasks.
+	 *
+	 * Makes sure that app tasks are prioritized over plugin ones.
+	 *
+	 * @return array
+	 */
+	public function allAppAndPluginTasks()
+	{
+		if ($this->tasks !== null) {
+			return $this->tasks;
+		}
 
-        $paths = App::path('Shell/Task');
-        $this->tasks = [];
+		$paths = App::path('Shell/Task');
+		$this->tasks = [];
 
-        foreach ($paths as $path) {
-            $folder = new Folder($path);
-            $this->tasks = $this->getAppPaths($folder);
-        }
-        $plugins = Plugin::loaded();
-        foreach ($plugins as $plugin) {
-            $pluginPaths = App::path('Shell/Task', $plugin);
-            foreach ($pluginPaths as $pluginPath) {
-                $folder = new Folder($pluginPath);
-                $pluginTasks = $this->getPluginPaths($folder, $plugin);
-                $this->tasks = array_merge($this->tasks, $pluginTasks);
-            }
-        }
+		foreach ($paths as $path) {
+			$folder = new Folder($path);
+			$this->tasks = $this->getAppPaths($folder);
+		}
+		$plugins = Plugin::loaded();
+		foreach ($plugins as $plugin) {
+			$pluginPaths = App::path('Shell/Task', $plugin);
+			foreach ($pluginPaths as $pluginPath) {
+				$folder = new Folder($pluginPath);
+				$pluginTasks = $this->getPluginPaths($folder, $plugin);
+				$this->tasks = array_merge($this->tasks, $pluginTasks);
+			}
+		}
 
-        return $this->tasks;
-    }
+		return $this->tasks;
+	}
 
-    /**
-     *
-     * @param \Cake\Filesystem\Folder $folder The directory
-     *
-     * @return array
-     */
-    protected function getAppPaths(Folder $folder)
-    {
-        $res = array_merge($this->tasks, $folder->find('Queue.+\.php'));
-        foreach ($res as &$r) {
-            $r = basename($r, 'Task.php');
-        }
+	/**
+	 *
+	 * @param \Cake\Filesystem\Folder $folder The directory
+	 *
+	 * @return array
+	 */
+	protected function getAppPaths(Folder $folder)
+	{
+		$res = array_merge($this->tasks, $folder->find('Queue.+\.php'));
+		foreach ($res as &$r) {
+			$r = basename($r, 'Task.php');
+		}
 
-        return $res;
-    }
+		return $res;
+	}
 
-    /**
-     *
-     * @param \Cake\Filesystem\Folder $folder The directory
-     * @param string $plugin The plugin name
-     *
-     * @return array
-     */
-    protected function getPluginPaths(Folder $folder, $plugin)
-    {
-        $res = $folder->find('Queue.+Task\.php');
-        foreach ($res as $key => $r) {
-            $name = basename($r, 'Task.php');
-            if (in_array($name, $this->tasks)) {
-                unset($res[$key]);
-                continue;
-            }
-            $res[$key] = $plugin . '.' . $name;
-        }
+	/**
+	 *
+	 * @param \Cake\Filesystem\Folder $folder The directory
+	 * @param string $plugin The plugin name
+	 *
+	 * @return array
+	 */
+	protected function getPluginPaths(Folder $folder, $plugin)
+	{
+		$res = $folder->find('Queue.+Task\.php');
+		foreach ($res as $key => $r) {
+			$name = basename($r, 'Task.php');
+			if (in_array($name, $this->tasks)) {
+				unset($res[$key]);
+				continue;
+			}
+			$res[$key] = $plugin . '.' . $name;
+		}
 
-        return $res;
-    }
+		return $res;
+	}
 }