Merge pull request chrisboulton#52 from ebernhardson/fix-stopListening

Resque_Event::stopListening does not remove the listener

Author: Chris Boulton

lib/Resque/Event.php

@@ -73,7 +73,7 @@ public static function stopListening($event, $callback)
 
 		$key = array_search($callback, self::$events[$event]);
 		if ($key !== false) {
-			unset(self::$events[$key]);
+			unset(self::$events[$event][$key]);
 		}
 
 		return true;
@@ -86,4 +86,4 @@ public static function clearListeners()
 	{
 		self::$events = array();
 	}
-}
+}

test/Resque/Tests/EventTest.php

@@ -101,6 +101,24 @@ public function testAfterEnqueueEventCallbackFires()
 		));	
 		$this->assertContains($callback, $this->callbacksHit, $event . ' callback (' . $callback .') was not called');
 	}
+
+	public function testStopListeningRemovesListener()
+	{
+		$callback = 'beforePerformEventCallback';
+		$event = 'beforePerform';
+
+		Resque_Event::listen($event, array($this, $callback));
+		Resque_Event::stopListening($event, array($this, $callback));
+
+		$job = $this->getEventTestJob();
+		$this->worker->perform($job);
+		$this->worker->work(0);
+
+		$this->assertNotContains($callback, $this->callbacksHit, 
+			$event . ' callback (' . $callback .') was called though Resque_Event::stopListening was called'
+		);
+	}
+
 
 	public function beforePerformEventDontPerformCallback($instance)
 	{
@@ -146,4 +164,4 @@ public function afterForkEventCallback($job)
 	{
 		$this->assertValidEventCallback(__FUNCTION__, $job);
 	}
-}
+}