Making the factory responsible to set the arguments and the queue

Author: Sebastian Machuca

lib/Resque/Job.php

@@ -182,13 +182,14 @@ public function getInstance()
 		}
 
         if ($this->jobFactory !== null) {
-            $this->instance = $this->jobFactory->create($this->payload['class']);
-        } else {
-            $this->instance = new $this->payload['class'];
+            $this->instance = $this->jobFactory->create($this->payload['class'], $this->getArguments(), $this->queue);
+            return $this->instance;
         }
-		$this->instance->job = $this;
-		$this->instance->args = $this->getArguments();
-		$this->instance->queue = $this->queue;
+        $this->instance = new $this->payload['class'];
+        $this->instance->job = $this;
+        $this->instance->args = $this->getArguments();
+        $this->instance->queue = $this->queue;
+
 		return $this->instance;
 	}
 

lib/Resque/Job/FactoryInterface.php

@@ -4,7 +4,9 @@ interface Resque_Job_FactoryInterface
 {
     /**
      * @param $className
+     * @param array $args
+     * @param $queue
      * @return Resque_JobInterface
      */
-    public function create($className);
+    public function create($className, array $args, $queue);
 }

test/Resque/Tests/JobTest.php

@@ -369,10 +369,8 @@ public function testUseFactoryToGetJobInstance()
             'args' => null
         );
         $job = new Resque_Job('jobs', $payload);
-        $factory = $this->getMock('Resque_Job_FactoryInterface');
+        $factory = new Some_Stub_Factory();
         $job->setJobFactory($factory);
-        $testJob = $this->getMock('Resque_JobInterface');
-        $factory->expects(self::once())->method('create')->will($this->returnValue($testJob));
         $instance = $job->getInstance();
         $this->assertInstanceOf('Resque_JobInterface', $instance);
     }
@@ -403,3 +401,18 @@ public function perform()
         return true;
     }
 }
+
+class Some_Stub_Factory implements Resque_Job_FactoryInterface
+{
+
+    /**
+     * @param $className
+     * @param array $args
+     * @param $queue
+     * @return Resque_JobInterface
+     */
+    public function create($className, array $args, $queue)
+    {
+        return new Some_Job_Class();
+    }
+}