Merge branch 'master' into 0.8

Author: makasim

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [0.7.19](https://github.com/php-enqueue/enqueue-dev/tree/0.7.19) (2017-10-13)
+[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.7.18...0.7.19)
+
+- Amqp basic consume fixes [\#223](https://github.com/php-enqueue/enqueue-dev/pull/223) ([makasim](https://github.com/makasim))
+- Adds to small extension points to JobProcessor [\#222](https://github.com/php-enqueue/enqueue-dev/pull/222) ([iainmckay](https://github.com/iainmckay))
+- \[BC break\]\[amqp\] Use same qos options across all all AMQP transports [\#221](https://github.com/php-enqueue/enqueue-dev/pull/221) ([makasim](https://github.com/makasim))
+- \[BC break\] Amqp add basic consume support [\#217](https://github.com/php-enqueue/enqueue-dev/pull/217) ([makasim](https://github.com/makasim))
+
+- Amqp basic consume fixes [\#223](https://github.com/php-enqueue/enqueue-dev/pull/223) ([makasim](https://github.com/makasim))
+
+- Fix typo [\#227](https://github.com/php-enqueue/enqueue-dev/pull/227) ([f3ath](https://github.com/f3ath))
+
 ## [0.7.18](https://github.com/php-enqueue/enqueue-dev/tree/0.7.18) (2017-10-10)
 [Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.7.17...0.7.18)
 

README.md

@@ -8,7 +8,7 @@ This is where all development happens. The repository provides a friendly enviro
 Features:
 
 * [Feature rich](docs/quick_tour.md).
-* Implements [JMS](https://docs.oracle.com/javaee/7/api/javax/jms/package-summary.html) like transports based on a[queue-interop](https://github.com/queue-interop/queue-interop) interfaces.
+* Implements [JMS](https://docs.oracle.com/javaee/7/api/javax/jms/package-summary.html) like transports based on [queue-interop](https://github.com/queue-interop/queue-interop) interfaces.
 * Supported  transports 
     * Amqp based on [the ext](docs/transport/amqp.md), [bunny](docs/transport/amqp_bunny.md), [the lib](docs/transport/amqp_lib.md) 
     * [Beanstalk](docs/transport/pheanstalk.md)

pkg/job-queue/JobProcessor.php

@@ -63,7 +63,7 @@ public function findOrCreateRootJob($ownerId, $jobName, $unique = false)
         $job->setUnique((bool) $unique);
 
         try {
-            $this->jobStorage->saveJob($job);
+            $this->saveJob($job);
 
             return $job;
         } catch (DuplicateJobException $e) {
@@ -97,11 +97,9 @@ public function findOrCreateChildJob($jobName, Job $rootJob)
         $job->setCreatedAt(new \DateTime());
         $job->setRootJob($rootJob);
 
-        $this->jobStorage->saveJob($job);
+        $this->saveJob($job);
 
-        $this->producer->sendEvent(Topics::CALCULATE_ROOT_JOB_STATUS, [
-            'jobId' => $job->getId(),
-        ]);
+        $this->sendCalculateRootJobStatusEvent($job);
 
         return $job;
     }
@@ -128,11 +126,9 @@ public function startChildJob(Job $job)
         $job->setStatus(Job::STATUS_RUNNING);
         $job->setStartedAt(new \DateTime());
 
-        $this->jobStorage->saveJob($job);
+        $this->saveJob($job);
 
-        $this->producer->sendEvent(Topics::CALCULATE_ROOT_JOB_STATUS, [
-            'jobId' => $job->getId(),
-        ]);
+        $this->sendCalculateRootJobStatusEvent($job);
     }
 
     /**
@@ -157,11 +153,9 @@ public function successChildJob(Job $job)
         $job->setStatus(Job::STATUS_SUCCESS);
         $job->setStoppedAt(new \DateTime());
 
-        $this->jobStorage->saveJob($job);
+        $this->saveJob($job);
 
-        $this->producer->sendEvent(Topics::CALCULATE_ROOT_JOB_STATUS, [
-            'jobId' => $job->getId(),
-        ]);
+        $this->sendCalculateRootJobStatusEvent($job);
     }
 
     /**
@@ -186,11 +180,9 @@ public function failChildJob(Job $job)
         $job->setStatus(Job::STATUS_FAILED);
         $job->setStoppedAt(new \DateTime());
 
-        $this->jobStorage->saveJob($job);
+        $this->saveJob($job);
 
-        $this->producer->sendEvent(Topics::CALCULATE_ROOT_JOB_STATUS, [
-            'jobId' => $job->getId(),
-        ]);
+        $this->sendCalculateRootJobStatusEvent($job);
     }
 
     /**
@@ -219,11 +211,9 @@ public function cancelChildJob(Job $job)
             $job->setStartedAt($stoppedAt);
         }
 
-        $this->jobStorage->saveJob($job);
+        $this->saveJob($job);
 
-        $this->producer->sendEvent(Topics::CALCULATE_ROOT_JOB_STATUS, [
-            'jobId' => $job->getId(),
-        ]);
+        $this->sendCalculateRootJobStatusEvent($job);
     }
 
     /**
@@ -252,4 +242,26 @@ public function interruptRootJob(Job $job, $force = false)
             }
         });
     }
+
+    /**
+     * @link https://github.com/php-enqueue/enqueue-dev/pull/222#issuecomment-336102749 See for rationale
+     *
+     * @param Job $job
+     */
+    protected function saveJob(Job $job)
+    {
+        $this->jobStorage->saveJob($job);
+    }
+
+    /**
+     * @link https://github.com/php-enqueue/enqueue-dev/pull/222#issuecomment-336102749 See for rationale
+     *
+     * @param Job $job
+     */
+    protected function sendCalculateRootJobStatusEvent(Job $job)
+    {
+        $this->producer->sendEvent(Topics::CALCULATE_ROOT_JOB_STATUS, [
+            'jobId' => $job->getId(),
+        ]);
+    }
 }