From 6cda08de2570b9a4ba67157c3d296857e2bf0ab1 Mon Sep 17 00:00:00 2001
From: "Axel K." <theaxel@users.noreply.github.com>
Date: Mon, 10 Nov 2014 15:38:58 +0100
Subject: [PATCH] #218 Remove item from queue as well when args match

---
 lib/Resque.php | 63 +++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/lib/Resque.php b/lib/Resque.php
index 6b067ae..0b621bf 100644
--- a/lib/Resque.php
+++ b/lib/Resque.php
@@ -253,41 +253,42 @@ class Resque
 	 */
 	private static function removeItems($queue, $items = Array())
 	{
-	    $counter = 0;
-	    $originalQueue = 'queue:'. $queue;
-	    $tempQueue = $originalQueue. ':temp:'. time();
-	    $requeueQueue = $tempQueue. ':requeue';
-
-	    // move each item from original queue to temp queue and process it
-	    $finished = false;
-	    while(!$finished) {
-		$string = self::redis()->rpoplpush($originalQueue, self::redis()->getPrefix() . $tempQueue);
-
-		if(!empty($string)) {
-		    if(self::matchItem($string, $items)) {
-			$counter++;
-		    } else {
-			self::redis()->rpoplpush($tempQueue, self::redis()->getPrefix() . $requeueQueue);
-		    }
-		} else {
-		    $finished = true;
+		$counter = 0;
+		$originalQueue = 'queue:'. $queue;
+		$tempQueue = $originalQueue. ':temp:'. time();
+		$requeueQueue = $tempQueue. ':requeue';
+		
+		// move each item from original queue to temp queue and process it
+		$finished = false;
+		while (!$finished) {
+			$string = self::redis()->rpoplpush($originalQueue, self::redis()->getPrefix() . $tempQueue);
+	
+			if (!empty($string)) {
+				if(self::matchItem($string, $items)) {
+					self::redis()->rpop($tempQueue);
+					$counter++;
+				} else {
+					self::redis()->rpoplpush($tempQueue, self::redis()->getPrefix() . $requeueQueue);
+				}
+			} else {
+				$finished = true;
+			}
 		}
-	    }
 
-	    // move back from temp queue to original queue
-	    $finished = false;
-	    while(!$finished) {
-		$string = self::redis()->rpoplpush($requeueQueue, self::redis()->getPrefix() .$originalQueue);
-		if (empty($string)) {
-		    $finished = true;
+		// move back from temp queue to original queue
+		$finished = false;
+		while (!$finished) {
+			$string = self::redis()->rpoplpush($requeueQueue, self::redis()->getPrefix() .$originalQueue);
+			if (empty($string)) {
+			    $finished = true;
+			}
 		}
-	    }
 
-	    // remove temp queue and requeue queue
-	    self::redis()->del($requeueQueue);
-	    self::redis()->del($tempQueue);
-
-	    return $counter;
+		// remove temp queue and requeue queue
+		self::redis()->del($requeueQueue);
+		self::redis()->del($tempQueue);
+		
+		return $counter;
 	}
 
 	/**