Skip to content

Commit 804b732

Browse files
makasimmakasim
authored
Merge pull request #48 from php-enqueue/remove-deprecated-stuff
Remove deprecated stuff
2 parents bd8e820 + ff883bb commit 804b732

28 files changed

+47
-201
lines changed

‎pkg/amqp-ext/composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
"require": {
1414
"php": ">=5.6",
1515
"ext-amqp": "^1.6",
16-
"enqueue/psr-queue": "^0.2",
16+
"enqueue/psr-queue": "^0.3",
1717
"psr/log": "^1"
1818
},
1919
"require-dev": {
2020
"phpunit/phpunit": "~5.4.0",
21-
"enqueue/test": "^0.2",
22-
"enqueue/enqueue": "^0.2",
21+
"enqueue/test": "^0.3",
22+
"enqueue/enqueue": "^0.3",
2323
"empi89/php-amqp-stubs": "*@dev",
2424
"symfony/dependency-injection": "^2.8|^3",
2525
"symfony/config": "^2.8|^3"
@@ -36,7 +36,7 @@
3636
"minimum-stability": "dev",
3737
"extra": {
3838
"branch-alias": {
39-
"dev-master": "0.2.x-dev"
39+
"dev-master": "0.3.x-dev"
4040
}
4141
}
4242
}

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

+2-12
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

+1-1
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-bundle/composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"require": {
1414
"php": ">=5.6",
1515
"symfony/framework-bundle": "^2.8|^3",
16-
"enqueue/enqueue": "^0.2"
16+
"enqueue/enqueue": "^0.3"
1717
},
1818
"require-dev": {
1919
"phpunit/phpunit": "~5.5",
2020
"enqueue/stomp": "^0.2@dev",
2121
"enqueue/amqp-ext": "^0.2@dev",
22-
"enqueue/job-queue": "^0.2@dev",
23-
"enqueue/fs": "^0.2",
24-
"enqueue/test": "^0.2@dev",
22+
"enqueue/job-queue": "^0.3@dev",
23+
"enqueue/fs": "^0.3",
24+
"enqueue/test": "^0.3@dev",
2525
"doctrine/doctrine-bundle": "~1.2",
2626
"symfony/monolog-bundle": "^2.8|^3",
2727
"symfony/browser-kit": "^2.8|^3",
@@ -39,7 +39,7 @@
3939
},
4040
"extra": {
4141
"branch-alias": {
42-
"dev-master": "0.2.x-dev"
42+
"dev-master": "0.3.x-dev"
4343
}
4444
}
4545
}

‎pkg/enqueue/Client/MessageProducer.php

-12
This file was deleted.

‎pkg/enqueue/Client/MessageProducerInterface.php

-12
This file was deleted.

‎pkg/enqueue/Client/Producer.php

+1-1
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

-12
This file was deleted.

‎pkg/enqueue/Client/TraceableProducer.php

+2-2
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

+1-1
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

+1-1
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/enqueue/composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
],
1313
"require": {
1414
"php": ">=5.6",
15-
"enqueue/psr-queue": "^0.2",
15+
"enqueue/psr-queue": "^0.3",
1616
"ramsey/uuid": "^2|^3.5"
1717
},
1818
"require-dev": {
1919
"phpunit/phpunit": "~5.5",
2020
"symfony/console": "^2.8|^3",
2121
"symfony/dependency-injection": "^2.8|^3",
2222
"symfony/config": "^2.8|^3",
23-
"enqueue/test": "^0.2"
23+
"enqueue/test": "^0.3"
2424
},
2525
"suggest": {
2626
"symfony/console": "^2.8|^3 If you want to use li commands",
@@ -36,7 +36,7 @@
3636
"minimum-stability": "dev",
3737
"extra": {
3838
"branch-alias": {
39-
"dev-master": "0.2.x-dev"
39+
"dev-master": "0.3.x-dev"
4040
}
4141
}
4242
}

‎pkg/fs/composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
],
1313
"require": {
1414
"php": ">=5.6",
15-
"enqueue/psr-queue": "^0.2",
15+
"enqueue/psr-queue": "^0.3",
1616
"symfony/filesystem": "^2.8|^3",
1717
"makasim/temp-file": "^0.2",
1818
"psr/log": "^1"
1919
},
2020
"require-dev": {
2121
"phpunit/phpunit": "~5.5",
22-
"enqueue/enqueue": "^0.2",
23-
"enqueue/test": "^0.2",
22+
"enqueue/enqueue": "^0.3",
23+
"enqueue/test": "^0.3",
2424
"symfony/dependency-injection": "^2.8|^3",
2525
"symfony/config": "^2.8|^3"
2626
},
@@ -33,7 +33,7 @@
3333
"minimum-stability": "dev",
3434
"extra": {
3535
"branch-alias": {
36-
"dev-master": "0.2.x-dev"
36+
"dev-master": "0.3.x-dev"
3737
}
3838
}
3939
}

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

+12-12
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
/**

‎pkg/job-queue/composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
"require": {
1414
"php": ">=5.6",
1515
"symfony/framework-bundle": "^2.8|^3",
16-
"enqueue/enqueue": "^0.2",
16+
"enqueue/enqueue": "^0.3",
1717
"doctrine/orm": "~2.4"
1818
},
1919
"require-dev": {
2020
"phpunit/phpunit": "~5.5",
21-
"enqueue/test": "^0.2",
21+
"enqueue/test": "^0.3",
2222
"doctrine/doctrine-bundle": "~1.2",
2323
"symfony/browser-kit": "^2.8|^3",
2424
"symfony/expression-language": "^2.8|^3"
@@ -32,7 +32,7 @@
3232
"minimum-stability": "dev",
3333
"extra": {
3434
"branch-alias": {
35-
"dev-master": "0.2.x-dev"
35+
"dev-master": "0.3.x-dev"
3636
}
3737
}
3838
}

‎pkg/psr-queue/ConnectionFactory.php

-12
This file was deleted.

‎pkg/psr-queue/Consumer.php

-12
This file was deleted.

‎pkg/psr-queue/Context.php

-12
This file was deleted.

0 commit comments

Comments
 (0)