Merge pull request #9 from php-enqueue/0.9

0.9 version

Author: makasim

composer.json

@@ -5,17 +5,18 @@
     "keywords": ["messaging", "queue", "laravel"],
     "license": "MIT",
     "require": {
-        "php": ">=5.6",
-        "illuminate/queue": "^5.4",
-        "queue-interop/queue-interop": "^0.6",
-        "queue-interop/amqp-interop": "^0.7",
-        "enqueue/amqp-tools": "^0.8"
+        "php": ">=7.1",
+        "illuminate/queue": "^5.6",
+        "queue-interop/amqp-interop": "0.8.x-dev",
+        "queue-interop/queue-interop": "0.7.x-dev",
+        "enqueue/enqueue": "0.9.x-dev",
+        "enqueue/dsn": "0.9.x-dev"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.5",
-        "enqueue/enqueue": "^0.8@dev",
-        "enqueue/null": "^0.8@dev",
-        "enqueue/test": "^0.8@dev"
+        "enqueue/enqueue": "0.9.x-dev",
+        "enqueue/null": "0.9.x-dev",
+        "enqueue/test": "0.9.x-dev"
     },
     "autoload": {
         "psr-4": { "Enqueue\\LaravelQueue\\": "src/" },
@@ -33,7 +34,7 @@
             ]
         },
         "branch-alias": {
-            "dev-master": "0.8.x-dev"
+            "dev-master": "0.9.x-dev"
         }
     }
 }

src/AmqpConnector.php

@@ -5,18 +5,18 @@
 use Interop\Amqp\AmqpContext;
 
 /**
- * @method AmqpContext getPsrContext()
+ * @method AmqpContext getQueueInteropContext()
  */
 class AmqpQueue extends Queue
 {
     /**
      * {@inheritdoc}
      *
-     * @param AmqpContext $psrContext
+     * @param AmqpContext $amqpContext
      */
-    public function __construct(AmqpContext $psrContext, $queueName, $timeToRun)
+    public function __construct(AmqpContext $amqpContext, $queueName, $timeToRun)
     {
-        parent::__construct($psrContext, $queueName, $timeToRun);
+        parent::__construct($amqpContext, $queueName, $timeToRun);
     }
 
     /**
@@ -54,9 +54,9 @@ public function pop($queue = null)
      */
     protected function declareQueue($queue = null)
     {
-        $psrQueue = $this->getQueue($queue);
-        $psrQueue->addFlag(\Interop\Amqp\AmqpQueue::FLAG_DURABLE);
+        $interopQueue = $this->getQueue($queue);
+        $interopQueue->addFlag(\Interop\Amqp\AmqpQueue::FLAG_DURABLE);
 
-        $this->getPsrContext()->declareQueue($psrQueue);
+        $this->getQueueInteropContext()->declareQueue($queue);
     }
 }

src/AmqpQueue.php

@@ -0,0 +1,19 @@
+<?php
+namespace Enqueue\LaravelQueue\Command;
+
+use Enqueue\Container\Container;
+use Enqueue\SimpleClient\SimpleClient;
+
+class ConsumeCommand extends \Enqueue\Symfony\Client\ConsumeCommand
+{
+    public function __construct(SimpleClient $client)
+    {
+        $container = new Container([
+            'queue_consumer' => $client->getQueueConsumer(),
+            'driver' => $client->getDriver(),
+            'processor' => $client->getDelegateProcessor()
+        ]);
+
+        parent::__construct($container, 'queue_consumer', 'driver', 'processor');
+    }
+}

src/Command/ConsumeCommand.php

@@ -0,0 +1,17 @@
+<?php
+namespace Enqueue\LaravelQueue\Command;
+
+use Enqueue\Container\Container;
+use Enqueue\SimpleClient\SimpleClient;
+
+class ProduceCommand extends \Enqueue\Symfony\Client\ProduceCommand
+{
+    public function __construct(SimpleClient $client)
+    {
+        $container = new Container([
+            'producer' => $client->getProducer(),
+        ]);
+
+        parent::__construct($container, 'producer');
+    }
+}

src/Command/ConsumeMessagesCommand.php

@@ -0,0 +1,17 @@
+<?php
+namespace Enqueue\LaravelQueue\Command;
+
+use Enqueue\Container\Container;
+use Enqueue\SimpleClient\SimpleClient;
+
+class RoutesCommand extends \Enqueue\Symfony\Client\RoutesCommand
+{
+    public function __construct(SimpleClient $client)
+    {
+        $container = new Container([
+            'driver' => $client->getDriver(),
+        ]);
+
+        parent::__construct($container, 'driver');
+    }
+}

src/Command/ProduceCommand.php

@@ -2,12 +2,17 @@
 namespace Enqueue\LaravelQueue\Command;
 
 
+use Enqueue\Container\Container;
 use Enqueue\SimpleClient\SimpleClient;
 
 class SetupBrokerCommand extends \Enqueue\Symfony\Client\SetupBrokerCommand
 {
     public function __construct(SimpleClient $client)
     {
-        parent::__construct($client->getDriver());
+        $container = new Container([
+            'driver' => $client->getDriver(),
+        ]);
+
+        parent::__construct($container, 'driver');
     }
 }