Merge pull request #48 from php-enqueue/remove-deprecated-stuff

Remove deprecated stuff

pkg/amqp-ext/composer.json

@@ -13,13 +13,13 @@
     "require": {
         "php": ">=5.6",
         "ext-amqp": "^1.6",
-        "enqueue/psr-queue": "^0.2",
+        "enqueue/psr-queue": "^0.3",
         "psr/log": "^1"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.4.0",
-        "enqueue/test": "^0.2",
-        "enqueue/enqueue": "^0.2",
+        "enqueue/test": "^0.3",
+        "enqueue/enqueue": "^0.3",
         "empi89/php-amqp-stubs": "*@dev",
         "symfony/dependency-injection": "^2.8|^3",
         "symfony/config": "^2.8|^3"
@@ -36,7 +36,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.2.x-dev"
+            "dev-master": "0.3.x-dev"
         }
     }
 }

pkg/enqueue-bundle/Resources/config/client.yml

@@ -3,16 +3,6 @@ services:
         class: 'Enqueue\Client\Config'
         public: false
 
-    #deprecated
-    enqueue.client.message_producer:
-        deprecated: 'The "%service_id%" service is deprecated. Use "enqueue.client.producer" instead'
-        class: 'Enqueue\Client\MessageProducer'
-        arguments: ['@enqueue.client.driver']
-
-    #deprecated
-    enqueue.message_producer:
-        alias: 'enqueue.client.producer'
-
     enqueue.client.producer:
         class: 'Enqueue\Client\Producer'
         arguments: ['@enqueue.client.driver']
@@ -84,7 +74,7 @@ services:
         class: 'Enqueue\Symfony\Client\ProduceMessageCommand'
         public: true
         arguments:
-            - '@enqueue.client.message_producer'
+            - '@enqueue.client.producer'
         tags:
             - { name: 'console.command' }
 
@@ -113,7 +103,7 @@ services:
     enqueue.profiler.message_queue_collector:
         class: 'Enqueue\Bundle\Profiler\MessageQueueCollector'
         public: false
-        arguments: ['@enqueue.message_producer']
+        arguments: ['@enqueue.client.producer']
         tags:
             -
               name: 'data_collector'

pkg/enqueue-bundle/Tests/Functional/Client/ProducerTest.php

@@ -20,7 +20,7 @@ public function testCouldBeGetFromContainerAsService()
     public function testCouldBeGetFromContainerAsShortenAlias()
     {
         $messageProducer = $this->container->get('enqueue.client.producer');
-        $aliasMessageProducer = $this->container->get('enqueue.message_producer');
+        $aliasMessageProducer = $this->container->get('enqueue.producer');
 
         $this->assertSame($messageProducer, $aliasMessageProducer);
     }

pkg/enqueue-bundle/composer.json

@@ -13,15 +13,15 @@
     "require": {
         "php": ">=5.6",
         "symfony/framework-bundle": "^2.8|^3",
-        "enqueue/enqueue": "^0.2"
+        "enqueue/enqueue": "^0.3"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.5",
         "enqueue/stomp": "^0.2@dev",
         "enqueue/amqp-ext": "^0.2@dev",
-        "enqueue/job-queue": "^0.2@dev",
-        "enqueue/fs": "^0.2",
-        "enqueue/test": "^0.2@dev",
+        "enqueue/job-queue": "^0.3@dev",
+        "enqueue/fs": "^0.3",
+        "enqueue/test": "^0.3@dev",
         "doctrine/doctrine-bundle": "~1.2",
         "symfony/monolog-bundle": "^2.8|^3",
         "symfony/browser-kit": "^2.8|^3",
@@ -39,7 +39,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.2.x-dev"
+            "dev-master": "0.3.x-dev"
         }
     }
 }

pkg/enqueue/Client/Producer.php

@@ -5,7 +5,7 @@
 use Enqueue\Util\JSON;
 use Enqueue\Util\UUID;
 
-class Producer implements MessageProducerInterface
+class Producer implements ProducerInterface
 {
     /**
      * @var DriverInterface

pkg/enqueue/Client/TraceableProducer.php

@@ -2,14 +2,14 @@
 
 namespace Enqueue\Client;
 
-class TraceableProducer implements MessageProducerInterface
+class TraceableProducer implements ProducerInterface
 {
     /**
      * @var array
      */
     protected $traces = [];
     /**
-     * @var MessageProducerInterface
+     * @var ProducerInterface
      */
     private $producer;
 

pkg/enqueue/Tests/Client/ProducerTest.php

@@ -15,7 +15,7 @@ class ProducerTest extends \PHPUnit_Framework_TestCase
 {
     use ClassExtensionTrait;
 
-    public function testShouldImplementMessageProducerInterface()
+    public function testShouldImplementProducerInterface()
     {
         self::assertClassImplements(ProducerInterface::class, Producer::class);
     }

pkg/enqueue/Tests/Transport/Null/NullProducerTest.php

@@ -12,7 +12,7 @@ class NullProducerTest extends \PHPUnit_Framework_TestCase
 {
     use ClassExtensionTrait;
 
-    public function testShouldImplementMessageProducerInterface()
+    public function testShouldImplementProducerInterface()
     {
         $this->assertClassImplements(PsrProducer::class, NullProducer::class);
     }

pkg/enqueue/composer.json

@@ -12,15 +12,15 @@
     ],
     "require": {
         "php": ">=5.6",
-        "enqueue/psr-queue": "^0.2",
+        "enqueue/psr-queue": "^0.3",
         "ramsey/uuid": "^2|^3.5"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.5",
         "symfony/console": "^2.8|^3",
         "symfony/dependency-injection": "^2.8|^3",
         "symfony/config": "^2.8|^3",
-        "enqueue/test": "^0.2"
+        "enqueue/test": "^0.3"
     },
     "suggest": {
         "symfony/console": "^2.8|^3 If you want to use li commands",
@@ -36,7 +36,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.2.x-dev"
+            "dev-master": "0.3.x-dev"
         }
     }
 }

pkg/fs/composer.json

@@ -12,15 +12,15 @@
     ],
     "require": {
         "php": ">=5.6",
-        "enqueue/psr-queue": "^0.2",
+        "enqueue/psr-queue": "^0.3",
         "symfony/filesystem": "^2.8|^3",
         "makasim/temp-file": "^0.2",
         "psr/log": "^1"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.5",
-        "enqueue/enqueue": "^0.2",
-        "enqueue/test": "^0.2",
+        "enqueue/enqueue": "^0.3",
+        "enqueue/test": "^0.3",
         "symfony/dependency-injection": "^2.8|^3",
         "symfony/config": "^2.8|^3"
     },
@@ -33,7 +33,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.2.x-dev"
+            "dev-master": "0.3.x-dev"
         }
     }
 }

pkg/job-queue/Tests/DependentJobProcessorTest.php

@@ -3,7 +3,7 @@
 namespace Enqueue\JobQueue\Tests;
 
 use Enqueue\Client\Message;
-use Enqueue\Client\MessageProducerInterface;
+use Enqueue\Client\ProducerInterface;
 use Enqueue\Consumption\Result;
 use Enqueue\JobQueue\DependentJobProcessor;
 use Enqueue\JobQueue\Job;
@@ -27,7 +27,7 @@ public function testShouldLogCriticalAndRejectMessageIfJobIdIsNotSet()
     {
         $jobStorage = $this->createJobStorageMock();
 
-        $producer = $this->createMessageProducerMock();
+        $producer = $this->createProducerMock();
 
         $logger = $this->createLoggerMock();
         $logger
@@ -55,7 +55,7 @@ public function testShouldLogCriticalAndRejectMessageIfJobEntityWasNotFound()
             ->with(12345)
         ;
 
-        $producer = $this->createMessageProducerMock();
+        $producer = $this->createProducerMock();
 
         $logger = $this->createLoggerMock();
         $logger
@@ -87,7 +87,7 @@ public function testShouldLogCriticalAndRejectMessageIfJobIsNotRoot()
             ->will($this->returnValue($job))
         ;
 
-        $producer = $this->createMessageProducerMock();
+        $producer = $this->createProducerMock();
 
         $logger = $this->createLoggerMock();
         $logger
@@ -118,7 +118,7 @@ public function testShouldDoNothingIfDependentJobsAreMissing()
             ->will($this->returnValue($job))
         ;
 
-        $producer = $this->createMessageProducerMock();
+        $producer = $this->createProducerMock();
         $producer
             ->expects($this->never())
             ->method('send')
@@ -154,7 +154,7 @@ public function testShouldLogCriticalAndRejectMessageIfDependentJobTopicIsMissin
             ->will($this->returnValue($job))
         ;
 
-        $producer = $this->createMessageProducerMock();
+        $producer = $this->createProducerMock();
         $producer
             ->expects($this->never())
             ->method('send')
@@ -197,7 +197,7 @@ public function testShouldLogCriticalAndRejectMessageIfDependentJobMessageIsMiss
             ->will($this->returnValue($job))
         ;
 
-        $producer = $this->createMessageProducerMock();
+        $producer = $this->createProducerMock();
         $producer
             ->expects($this->never())
             ->method('send')
@@ -243,7 +243,7 @@ public function testShouldPublishDependentMessage()
         ;
 
         $expectedMessage = null;
-        $producer = $this->createMessageProducerMock();
+        $producer = $this->createProducerMock();
         $producer
             ->expects($this->once())
             ->method('send')
@@ -291,7 +291,7 @@ public function testShouldPublishDependentMessageWithPriority()
         ;
 
         $expectedMessage = null;
-        $producer = $this->createMessageProducerMock();
+        $producer = $this->createProducerMock();
         $producer
             ->expects($this->once())
             ->method('send')
@@ -333,11 +333,11 @@ private function createJobStorageMock()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|MessageProducerInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|ProducerInterface
      */
-    private function createMessageProducerMock()
+    private function createProducerMock()
     {
-        return $this->createMock(MessageProducerInterface::class);
+        return $this->createMock(ProducerInterface::class);
     }
 
     /**

pkg/job-queue/composer.json

@@ -13,12 +13,12 @@
     "require": {
         "php": ">=5.6",
         "symfony/framework-bundle": "^2.8|^3",
-        "enqueue/enqueue": "^0.2",
+        "enqueue/enqueue": "^0.3",
         "doctrine/orm": "~2.4"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.5",
-        "enqueue/test": "^0.2",
+        "enqueue/test": "^0.3",
         "doctrine/doctrine-bundle": "~1.2",
         "symfony/browser-kit": "^2.8|^3",
         "symfony/expression-language": "^2.8|^3"
@@ -32,7 +32,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.2.x-dev"
+            "dev-master": "0.3.x-dev"
         }
     }
 }