Merge pull request #30 from salimane/upstream

replace is_object with is_array when reserving jobs
This commit is contained in:
Chris Boulton 2011-12-21 16:10:18 -08:00
commit 4700375d25
2 changed files with 5 additions and 5 deletions

View File

@ -60,7 +60,7 @@ class Resque
* exist, then create it as well. * exist, then create it as well.
* *
* @param string $queue The name of the queue to add the job to. * @param string $queue The name of the queue to add the job to.
* @param object $item Job description as an object to be JSON encoded. * @param array $item Job description as an array to be JSON encoded.
*/ */
public static function push($queue, $item) public static function push($queue, $item)
{ {
@ -73,7 +73,7 @@ class Resque
* return it. * return it.
* *
* @param string $queue The name of the queue to fetch an item from. * @param string $queue The name of the queue to fetch an item from.
* @return object Decoded item from the queue. * @return array Decoded item from the queue.
*/ */
public static function pop($queue) public static function pop($queue)
{ {
@ -113,7 +113,7 @@ class Resque
'args' => $args, 'args' => $args,
)); ));
} }
return $result; return $result;
} }

View File

@ -37,7 +37,7 @@ class Resque_Job
* Instantiate a new instance of a job. * Instantiate a new instance of a job.
* *
* @param string $queue The queue that the job belongs to. * @param string $queue The queue that the job belongs to.
* @param object $payload Object containing details of the job. * @param array $payload array containing details of the job.
*/ */
public function __construct($queue, $payload) public function __construct($queue, $payload)
{ {
@ -84,7 +84,7 @@ class Resque_Job
public static function reserve($queue) public static function reserve($queue)
{ {
$payload = Resque::pop($queue); $payload = Resque::pop($queue);
if(!is_object($payload)) { if(!is_array($payload)) {
return false; return false;
} }