Revert iron changes

laravel · Nov 26, 2015 · a7d98b7 · a7d98b7
1 parent 0eab0e6
commit a7d98b7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -75,7 +75,7 @@
     },
     "require-dev": {
         "aws/aws-sdk-php": "~3.0",
-        "iron-io/iron_mq": "~2.0|~4.0",
+        "iron-io/iron_mq": "~2.0",
         "mockery/mockery": "~0.9.2",
         "pda/pheanstalk": "~3.0",
         "phpunit/phpunit": "~4.0",
@@ -103,7 +103,7 @@
         "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).",
         "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
         "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers (~5.3|~6.0).",
-        "iron-io/iron_mq": "Required to use the iron queue driver (~2.0|~4.0).",
+        "iron-io/iron_mq": "Required to use the iron queue driver (~2.0).",
         "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
         "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
         "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",

diff --git a/src/Illuminate/Queue/IronQueue.php b/src/Illuminate/Queue/IronQueue.php
@@ -145,17 +145,11 @@ public function pop($queue = null)
      *
      * @param  string  $queue
      * @param  string  $id
-     * @param  string|null  $reservation
      * @return void
      */
-    public function deleteMessage($queue, $id, $reservation = null)
+    public function deleteMessage($queue, $id)
     {
-        if ($reservation) {
-            $this->iron->deleteMessage($queue, $id, $reservation);
-        } else {
-            // Version 1 of API does not use reservation_id
-            $this->iron->deleteMessage($queue, $id);
-        }
+        $this->iron->deleteMessage($queue, $id);
     }
 
     /**

diff --git a/src/Illuminate/Queue/Jobs/IronJob.php b/src/Illuminate/Queue/Jobs/IronJob.php
@@ -83,11 +83,7 @@ public function delete()
             return;
         }
 
-        if (property_exists($this->job, 'reservation_id')) {
-            $this->iron->deleteMessage($this->getQueue(), $this->job->id, $this->job->reservation_id);
-        } else {
-            $this->iron->deleteMessage($this->getQueue(), $this->job->id);
-        }
+        $this->iron->deleteMessage($this->getQueue(), $this->job->id);
     }
 
     /**

diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json
@@ -39,7 +39,7 @@
     "suggest": {
         "aws/aws-sdk-php": "Required to use the SQS queue driver (~3.0).",
         "illuminate/redis": "Required to use the redis queue driver (5.1.*).",
-        "iron-io/iron_mq": "Required to use the iron queue driver (~2.0|~4.0).",
+        "iron-io/iron_mq": "Required to use the iron queue driver (~2.0).",
         "pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0)."
     },
     "minimum-stability": "dev"