Skip to content

Commit ff883bb

Browse files
makasimmakasim
committed
Remove deprecated classes.
1 parent f1d1721 commit ff883bb

20 files changed

Lines changed: 21 additions & 175 deletions

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@ services:
33
class: 'Enqueue\Client\Config'
44
public: false
55

6-
#deprecated
7-
enqueue.client.message_producer:
8-
deprecated: 'The "%service_id%" service is deprecated. Use "enqueue.client.producer" instead'
9-
class: 'Enqueue\Client\MessageProducer'
10-
arguments: ['@enqueue.client.driver']
11-
12-
#deprecated
13-
enqueue.message_producer:
14-
alias: 'enqueue.client.producer'
15-
166
enqueue.client.producer:
177
class: 'Enqueue\Client\Producer'
188
arguments: ['@enqueue.client.driver']
@@ -84,7 +74,7 @@ services:
8474
class: 'Enqueue\Symfony\Client\ProduceMessageCommand'
8575
public: true
8676
arguments:
87-
- '@enqueue.client.message_producer'
77+
- '@enqueue.client.producer'
8878
tags:
8979
- { name: 'console.command' }
9080

@@ -113,7 +103,7 @@ services:
113103
enqueue.profiler.message_queue_collector:
114104
class: 'Enqueue\Bundle\Profiler\MessageQueueCollector'
115105
public: false
116-
arguments: ['@enqueue.message_producer']
106+
arguments: ['@enqueue.client.producer']
117107
tags:
118108
-
119109
name: 'data_collector'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function testCouldBeGetFromContainerAsService()
2020
public function testCouldBeGetFromContainerAsShortenAlias()
2121
{
2222
$messageProducer = $this->container->get('enqueue.client.producer');
23-
$aliasMessageProducer = $this->container->get('enqueue.message_producer');
23+
$aliasMessageProducer = $this->container->get('enqueue.producer');
2424

2525
$this->assertSame($messageProducer, $aliasMessageProducer);
2626
}

‎pkg/enqueue/Client/MessageProducer.php‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎pkg/enqueue/Client/MessageProducerInterface.php‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎pkg/enqueue/Client/Producer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Enqueue\Util\JSON;
66
use Enqueue\Util\UUID;
77

8-
class Producer implements MessageProducerInterface
8+
class Producer implements ProducerInterface
99
{
1010
/**
1111
* @var DriverInterface

‎pkg/enqueue/Client/TraceableMessageProducer.php‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎pkg/enqueue/Client/TraceableProducer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
namespace Enqueue\Client;
44

5-
class TraceableProducer implements MessageProducerInterface
5+
class TraceableProducer implements ProducerInterface
66
{
77
/**
88
* @var array
99
*/
1010
protected $traces = [];
1111
/**
12-
* @var MessageProducerInterface
12+
* @var ProducerInterface
1313
*/
1414
private $producer;
1515

‎pkg/enqueue/Tests/Client/ProducerTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ProducerTest extends \PHPUnit_Framework_TestCase
1515
{
1616
use ClassExtensionTrait;
1717

18-
public function testShouldImplementMessageProducerInterface()
18+
public function testShouldImplementProducerInterface()
1919
{
2020
self::assertClassImplements(ProducerInterface::class, Producer::class);
2121
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class NullProducerTest extends \PHPUnit_Framework_TestCase
1212
{
1313
use ClassExtensionTrait;
1414

15-
public function testShouldImplementMessageProducerInterface()
15+
public function testShouldImplementProducerInterface()
1616
{
1717
$this->assertClassImplements(PsrProducer::class, NullProducer::class);
1818
}

‎pkg/job-queue/Tests/DependentJobProcessorTest.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Enqueue\JobQueue\Tests;
44

55
use Enqueue\Client\Message;
6-
use Enqueue\Client\MessageProducerInterface;
6+
use Enqueue\Client\ProducerInterface;
77
use Enqueue\Consumption\Result;
88
use Enqueue\JobQueue\DependentJobProcessor;
99
use Enqueue\JobQueue\Job;
@@ -27,7 +27,7 @@ public function testShouldLogCriticalAndRejectMessageIfJobIdIsNotSet()
2727
{
2828
$jobStorage = $this->createJobStorageMock();
2929

30-
$producer = $this->createMessageProducerMock();
30+
$producer = $this->createProducerMock();
3131

3232
$logger = $this->createLoggerMock();
3333
$logger
@@ -55,7 +55,7 @@ public function testShouldLogCriticalAndRejectMessageIfJobEntityWasNotFound()
5555
->with(12345)
5656
;
5757

58-
$producer = $this->createMessageProducerMock();
58+
$producer = $this->createProducerMock();
5959

6060
$logger = $this->createLoggerMock();
6161
$logger
@@ -87,7 +87,7 @@ public function testShouldLogCriticalAndRejectMessageIfJobIsNotRoot()
8787
->will($this->returnValue($job))
8888
;
8989

90-
$producer = $this->createMessageProducerMock();
90+
$producer = $this->createProducerMock();
9191

9292
$logger = $this->createLoggerMock();
9393
$logger
@@ -118,7 +118,7 @@ public function testShouldDoNothingIfDependentJobsAreMissing()
118118
->will($this->returnValue($job))
119119
;
120120

121-
$producer = $this->createMessageProducerMock();
121+
$producer = $this->createProducerMock();
122122
$producer
123123
->expects($this->never())
124124
->method('send')
@@ -154,7 +154,7 @@ public function testShouldLogCriticalAndRejectMessageIfDependentJobTopicIsMissin
154154
->will($this->returnValue($job))
155155
;
156156

157-
$producer = $this->createMessageProducerMock();
157+
$producer = $this->createProducerMock();
158158
$producer
159159
->expects($this->never())
160160
->method('send')
@@ -197,7 +197,7 @@ public function testShouldLogCriticalAndRejectMessageIfDependentJobMessageIsMiss
197197
->will($this->returnValue($job))
198198
;
199199

200-
$producer = $this->createMessageProducerMock();
200+
$producer = $this->createProducerMock();
201201
$producer
202202
->expects($this->never())
203203
->method('send')
@@ -243,7 +243,7 @@ public function testShouldPublishDependentMessage()
243243
;
244244

245245
$expectedMessage = null;
246-
$producer = $this->createMessageProducerMock();
246+
$producer = $this->createProducerMock();
247247
$producer
248248
->expects($this->once())
249249
->method('send')
@@ -291,7 +291,7 @@ public function testShouldPublishDependentMessageWithPriority()
291291
;
292292

293293
$expectedMessage = null;
294-
$producer = $this->createMessageProducerMock();
294+
$producer = $this->createProducerMock();
295295
$producer
296296
->expects($this->once())
297297
->method('send')
@@ -333,11 +333,11 @@ private function createJobStorageMock()
333333
}
334334

335335
/**
336-
* @return \PHPUnit_Framework_MockObject_MockObject|MessageProducerInterface
336+
* @return \PHPUnit_Framework_MockObject_MockObject|ProducerInterface
337337
*/
338-
private function createMessageProducerMock()
338+
private function createProducerMock()
339339
{
340-
return $this->createMock(MessageProducerInterface::class);
340+
return $this->createMock(ProducerInterface::class);
341341
}
342342

343343
/**

0 commit comments

Comments
 (0)