change vendor

Author: vyuldashev

README.md

@@ -1,16 +1,16 @@
 RabbitMQ Queue driver for Laravel
 ======================
-[![Latest Stable Version](https://poser.pugx.org/fintech-fab/laravel-queue-rabbitmq/v/stable)](https://packagist.org/packages/fintech-fab/laravel-queue-rabbitmq) [![Total Downloads](https://poser.pugx.org/fintech-fab/laravel-queue-rabbitmq/downloads)](https://packagist.org/packages/fintech-fab/laravel-queue-rabbitmq) [![Latest Unstable Version](https://poser.pugx.org/fintech-fab/laravel-queue-rabbitmq/v/unstable)](https://packagist.org/packages/fintech-fab/laravel-queue-rabbitmq) [![License](https://poser.pugx.org/fintech-fab/laravel-queue-rabbitmq/license)](https://packagist.org/packages/fintech-fab/laravel-queue-rabbitmq)
+[![Latest Stable Version](https://poser.pugx.org/vladimir-yuldashev/laravel-queue-rabbitmq/v/stable)](https://packagist.org/packages/vladimir-yuldashev/laravel-queue-rabbitmq) [![Total Downloads](https://poser.pugx.org/vladimir-yuldashev/laravel-queue-rabbitmq/downloads)](https://packagist.org/packages/vladimir-yuldashev/laravel-queue-rabbitmq) [![Latest Unstable Version](https://poser.pugx.org/vladimir-yuldashev/laravel-queue-rabbitmq/v/unstable)](https://packagist.org/packages/vladimir-yuldashev/laravel-queue-rabbitmq) [![License](https://poser.pugx.org/vladimir-yuldashev/laravel-queue-rabbitmq/license)](https://packagist.org/packages/vladimir-yuldashev/laravel-queue-rabbitmq)
 
 ####Installation
 
 Require this package in your composer.json and run composer update (IMPORTANT! DO NOT USE "dev-master"):
 
-	"fintech-fab/laravel-queue-rabbitmq": "5.1"
+	"vladimir-yuldashev/laravel-queue-rabbitmq": "5.1"
 
 After composer update is finished you need to add ServiceProvider to your `providers` array in `app.php`:
 
-	FintechFab\LaravelQueueRabbitMQ\LaravelQueueRabbitMQServiceProvider::class,
+	VladimirYuldashev\LaravelQueueRabbitMQ\LaravelQueueRabbitMQServiceProvider::class,
 
 Add these lines to your `app/config/queue.php` file to `connections` array:
 

composer.json

@@ -1,13 +1,9 @@
 {
-  "name": "fintech-fab/laravel-queue-rabbitmq",
+  "name": "vladimir-yuldashev/laravel-queue-rabbitmq",
   "version": "5.1",
   "description": "RabbitMQ driver for Laravel Queue",
-  "license": "Apache-2.0",
+  "license": "MIT",
   "authors": [
-    {
-      "name": "FINTECH_FAB",
-      "email": "dev@fintech-fab.ru"
-    },
     {
       "name": "Vladimir Yuldashev",
       "email": "misterio92@gmail.com"
@@ -21,7 +17,7 @@
   },
   "autoload": {
     "psr-0": {
-      "FintechFab\\LaravelQueueRabbitMQ": "src/"
+      "VladimirYuldashev\\LaravelQueueRabbitMQ": "src/"
     }
   },
   "minimum-stability": "dev"

src/FintechFab/LaravelQueueRabbitMQ/Queue/Jobs/RabbitMQJob.php

@@ -1,7 +1,9 @@
-<?php namespace FintechFab\LaravelQueueRabbitMQ;
+<?php
+
+namespace VladimirYuldashev\LaravelQueueRabbitMQ;
 
-use FintechFab\LaravelQueueRabbitMQ\Queue\Connectors\RabbitMQConnector;
 use Illuminate\Support\ServiceProvider;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors\RabbitMQConnector;
 
 class LaravelQueueRabbitMQServiceProvider extends ServiceProvider
 {

src/FintechFab/LaravelQueueRabbitMQ/LaravelQueueRabbitMQServiceProvider.php renamed to src/VladimirYuldashev/LaravelQueueRabbitMQ/LaravelQueueRabbitMQServiceProvider.php

@@ -1,8 +1,10 @@
-<?php namespace FintechFab\LaravelQueueRabbitMQ\Queue\Connectors;
+<?php
+
+namespace VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors;
 
-use FintechFab\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 use Illuminate\Queue\Connectors\ConnectorInterface;
 use PhpAmqpLib\Connection\AMQPConnection;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 class RabbitMQConnector implements ConnectorInterface
 {

src/FintechFab/LaravelQueueRabbitMQ/Queue/Connectors/RabbitMQConnector.php renamed to src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/Connectors/RabbitMQConnector.php

@@ -0,0 +1,127 @@
+<?php
+
+namespace VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs;
+
+use Illuminate\Container\Container;
+use Illuminate\Contracts\Queue\Job as JobContract;
+use Illuminate\Queue\Jobs\Job;
+use PhpAmqpLib\Channel\AMQPChannel;
+use PhpAmqpLib\Message\AMQPMessage;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
+
+class RabbitMQJob extends Job implements JobContract
+{
+
+    protected $connection;
+    protected $channel;
+    protected $queue;
+    protected $message;
+
+    public function __construct(
+        Container $container,
+        RabbitMQQueue $connection,
+        AMQPChannel $channel,
+        $queue,
+        AMQPMessage $message
+    ) {
+        $this->container = $container;
+        $this->connection = $connection;
+        $this->channel = $channel;
+        $this->queue = $queue;
+        $this->message = $message;
+    }
+
+    /**
+     * Fire the job.
+     *
+     * @return void
+     */
+    public function fire()
+    {
+        $this->resolveAndFire(json_decode($this->message->body, true));
+    }
+
+    /**
+     * Get the raw body string for the job.
+     *
+     * @return string
+     */
+    public function getRawBody()
+    {
+        return $this->message->body;
+    }
+
+    /**
+     * Delete the job from the queue.
+     *
+     * @return void
+     */
+    public function delete()
+    {
+        parent::delete();
+
+        $this->channel->basic_ack($this->message->delivery_info['delivery_tag']);
+    }
+
+    /**
+     * Get queue name
+     *
+     * @return string
+     */
+    public function getQueue()
+    {
+        return $this->queue;
+    }
+
+    /**
+     * Release the job back into the queue.
+     *
+     * @param  int $delay
+     *
+     * @return void
+     */
+    public function release($delay = 0)
+    {
+        $this->delete();
+
+        $body = $this->message->body;
+        $body = json_decode($body, true);
+
+        $attempts = $this->attempts();
+
+        // write attempts to body
+        $body['data']['attempts'] = $attempts + 1;
+
+        $job = $body['job'];
+        $data = $body['data'];
+
+        if ($delay > 0) {
+            $this->connection->later($delay, $job, $data, $this->getQueue());
+        } else {
+            $this->connection->push($job, $data, $this->getQueue());
+        }
+    }
+
+    /**
+     * Get the number of times the job has been attempted.
+     *
+     * @return int
+     */
+    public function attempts()
+    {
+        $body = json_decode($this->message->body, true);
+
+        return isset($body['data']['attempts']) ? (int)$body['data']['attempts'] : 0;
+    }
+
+    /**
+     * Get the job identifier.
+     *
+     * @return string
+     */
+    public function getJobId()
+    {
+        return $this->message->get('correlation_id');
+    }
+
+}

src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/Jobs/RabbitMQJob.php

@@ -1,13 +1,15 @@
-<?php namespace FintechFab\LaravelQueueRabbitMQ\Queue;
+<?php
+
+namespace VladimirYuldashev\LaravelQueueRabbitMQ\Queue;
 
 use DateTime;
-use FintechFab\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
 use Illuminate\Contracts\Queue\Queue as QueueContract;
 use Illuminate\Queue\Queue;
 use PhpAmqpLib\Channel\AMQPChannel;
 use PhpAmqpLib\Connection\AMQPConnection;
 use PhpAmqpLib\Message\AMQPMessage;
 use PhpAmqpLib\Wire\AMQPTable;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
 
 class RabbitMQQueue extends Queue implements QueueContract
 {

src/FintechFab/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php renamed to src/VladimirYuldashev/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php

@@ -3,7 +3,7 @@
 return [
 
 	'providers' => append_config([
-		'FintechFab\LaravelQueueRabbitMQ\LaravelQueueRabbitMQServiceProvider',
+			VladimirYuldashev\LaravelQueueRabbitMQ\LaravelQueueRabbitMQServiceProvider::class,
 	]),
 
 ];