[job-queue] Do not use deprecated classes

makasim · makasim · commit c5b2e11096dc · 2018-09-28T14:30:36.000+03:00
diff --git a/pkg/job-queue/CalculateRootJobStatusProcessor.php b/pkg/job-queue/CalculateRootJobStatusProcessor.php
@@ -7,12 +7,12 @@
 use Enqueue\Consumption\Result;
 use Enqueue\JobQueue\Doctrine\JobStorage;
 use Enqueue\Util\JSON;
-use Interop\Queue\PsrContext;
-use Interop\Queue\PsrMessage;
-use Interop\Queue\PsrProcessor;
+use Interop\Queue\Context;
+use Interop\Queue\Message;
+use Interop\Queue\Processor;
 use Psr\Log\LoggerInterface;
 
-class CalculateRootJobStatusProcessor implements PsrProcessor, CommandSubscriberInterface
+class CalculateRootJobStatusProcessor implements Processor, CommandSubscriberInterface
 {
     /**
      * @var JobStorage
@@ -46,7 +46,7 @@ public function __construct(
         $this->logger = $logger;
     }
 
-    public function process(PsrMessage $message, PsrContext $context)
+    public function process(Message $message, Context $context)
     {
         $data = JSON::decode($message->getBody());
 
diff --git a/pkg/job-queue/DependentJobProcessor.php b/pkg/job-queue/DependentJobProcessor.php
@@ -2,18 +2,18 @@
 
 namespace Enqueue\JobQueue;
 
-use Enqueue\Client\Message;
+use Enqueue\Client\Message as ClientMessage;
 use Enqueue\Client\ProducerInterface;
 use Enqueue\Client\TopicSubscriberInterface;
 use Enqueue\Consumption\Result;
 use Enqueue\JobQueue\Doctrine\JobStorage;
 use Enqueue\Util\JSON;
-use Interop\Queue\PsrContext;
-use Interop\Queue\PsrMessage;
-use Interop\Queue\PsrProcessor;
+use Interop\Queue\Context;
+use Interop\Queue\Message;
+use Interop\Queue\Processor;
 use Psr\Log\LoggerInterface;
 
-class DependentJobProcessor implements PsrProcessor, TopicSubscriberInterface
+class DependentJobProcessor implements Processor, TopicSubscriberInterface
 {
     /**
      * @var JobStorage
@@ -45,7 +45,7 @@ public function __construct(JobStorage $jobStorage, ProducerInterface $producer,
     /**
      * {@inheritdoc}
      */
-    public function process(PsrMessage $message, PsrContext $context)
+    public function process(Message $message, Context $context)
     {
         $data = JSON::decode($message->getBody());
 
@@ -98,7 +98,7 @@ public function process(PsrMessage $message, PsrContext $context)
         }
 
         foreach ($dependentJobs as $dependentJob) {
-            $message = new Message();
+            $message = new ClientMessage();
             $message->setBody($dependentJob['message']);
 
             if (isset($dependentJob['priority'])) {
diff --git a/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php b/pkg/job-queue/Tests/CalculateRootJobStatusProcessorTest.php
@@ -11,7 +11,7 @@
 use Enqueue\JobQueue\Job;
 use Enqueue\JobQueue\Topics;
 use Enqueue\Null\NullMessage;
-use Interop\Queue\PsrContext;
+use Interop\Queue\Context;
 use Psr\Log\LoggerInterface;
 
 class CalculateRootJobStatusProcessorTest extends \PHPUnit\Framework\TestCase
@@ -184,11 +184,11 @@ private function createProducerMock()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext
+     * @return \PHPUnit_Framework_MockObject_MockObject|Context
      */
     private function createContextMock()
     {
-        return $this->createMock(PsrContext::class);
+        return $this->createMock(Context::class);
     }
 
     /**
diff --git a/pkg/job-queue/Tests/DependentJobProcessorTest.php b/pkg/job-queue/Tests/DependentJobProcessorTest.php
@@ -10,7 +10,7 @@
 use Enqueue\JobQueue\Job;
 use Enqueue\JobQueue\Topics;
 use Enqueue\Null\NullMessage;
-use Interop\Queue\PsrContext;
+use Interop\Queue\Context;
 use Psr\Log\LoggerInterface;
 
 class DependentJobProcessorTest extends \PHPUnit\Framework\TestCase
@@ -317,11 +317,11 @@ public function testShouldPublishDependentMessageWithPriority()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext
+     * @return \PHPUnit_Framework_MockObject_MockObject|Context
      */
     private function createContextMock()
     {
-        return $this->createMock(PsrContext::class);
+        return $this->createMock(Context::class);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`use Enqueue\JobQueue\Job;`
`12`	`12`	`use Enqueue\JobQueue\Topics;`
`13`	`13`	`use Enqueue\Null\NullMessage;`
`14`		`-use Interop\Queue\PsrContext;`
	`14`	`+use Interop\Queue\Context;`
`15`	`15`	`use Psr\Log\LoggerInterface;`
`16`	`16`
`17`	`17`	`class CalculateRootJobStatusProcessorTest extends \PHPUnit\Framework\TestCase`
`@@ -184,11 +184,11 @@ private function createProducerMock()`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`/**`
`187`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|PsrContext`
	`187`	`+ * @return \PHPUnit_Framework_MockObject_MockObject\|Context`
`188`	`188`	`*/`
`189`	`189`	`private function createContextMock()`
`190`	`190`	`{`
`191`		`- return $this->createMock(PsrContext::class);`
	`191`	`+ return $this->createMock(Context::class);`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use Enqueue\JobQueue\Job;`
`11`	`11`	`use Enqueue\JobQueue\Topics;`
`12`	`12`	`use Enqueue\Null\NullMessage;`
`13`		`-use Interop\Queue\PsrContext;`
	`13`	`+use Interop\Queue\Context;`
`14`	`14`	`use Psr\Log\LoggerInterface;`
`15`	`15`
`16`	`16`	`class DependentJobProcessorTest extends \PHPUnit\Framework\TestCase`
`@@ -317,11 +317,11 @@ public function testShouldPublishDependentMessageWithPriority()`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`/**`
`320`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|PsrContext`
	`320`	`+ * @return \PHPUnit_Framework_MockObject_MockObject\|Context`
`321`	`321`	`*/`
`322`	`322`	`private function createContextMock()`
`323`	`323`	`{`
`324`		`- return $this->createMock(PsrContext::class);`
	`324`	`+ return $this->createMock(Context::class);`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`/**`