Skip to content

Commit a47e9bb

Browse files
makasimmakasim
committed
Merge branch 'master' into move-services-to-client-factory
2 parents 6ec7109 + cb56bd6 commit a47e9bb

26 files changed

+75
-23
lines changed

‎CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Change Log
22

3+
## [0.8.38](https://github.com/php-enqueue/enqueue-dev/tree/0.8.38) (2018-10-16)
4+
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.8.37...0.8.38)
5+
6+
- Support rabbitmq-cli-consumer [\#546](https://github.com/php-enqueue/enqueue-dev/issues/546)
7+
- Add ability to choose transport\context to be used in consume command [\#312](https://github.com/php-enqueue/enqueue-dev/issues/312)
8+
9+
- \[Symfony\] sendCommand / sendEvent for delayed message have different behaviour [\#523](https://github.com/php-enqueue/enqueue-dev/issues/523)
10+
- \[bundle\] The bundle does not work correctly with env parameters set as tag attr. [\#28](https://github.com/php-enqueue/enqueue-dev/issues/28)
11+
12+
- Stomp heartbeat [\#549](https://github.com/php-enqueue/enqueue-dev/issues/549)
13+
- \[Elastica\]Slow processing [\#537](https://github.com/php-enqueue/enqueue-dev/issues/537)
14+
- \[consumption\] Some improvements [\#323](https://github.com/php-enqueue/enqueue-dev/issues/323)
15+
16+
- Fixing kafka default configuration [\#562](https://github.com/php-enqueue/enqueue-dev/pull/562) ([adumas37](https://github.com/adumas37))
17+
- enableSubscriptionConsumer setter [\#541](https://github.com/php-enqueue/enqueue-dev/pull/541) ([ArnaudTarroux](https://github.com/ArnaudTarroux))
18+
319
## [0.8.37](https://github.com/php-enqueue/enqueue-dev/tree/0.8.37) (2018-09-13)
420
[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.8.36...0.8.37)
521

‎docs/client/supported_brokers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Here's the list of transports supported by Enqueue Client:
1313
| Redis | [enqueue/gps](../transport/redis.md) | redis: |
1414
| Amazon SQS | [enqueue/sqs](../transport/sqs.md) | sqs: |
1515
| STOMP, RabbitMQ | [enqueue/stomp](../transport/stomp.md) | stomp: |
16-
| Kafka | [enqueue/stomp](../transport/kafka.md) | kafka: |
16+
| Kafka | [enqueue/rdkafka](../transport/kafka.md) | kafka: |
1717
| Null | [enqueue/null](../transport/null.md) | null: |
1818

1919
Here's the list of protocols and Client features supported by them

‎pkg/dbal/Tests/DbalConnectionFactoryTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
use Enqueue\Dbal\DbalContext;
77
use Enqueue\Test\ClassExtensionTrait;
88
use Interop\Queue\ConnectionFactory;
9+
use PHPUnit\Framework\TestCase;
910

10-
class DbalConnectionFactoryTest extends \PHPUnit_Framework_TestCase
11+
class DbalConnectionFactoryTest extends TestCase
1112
{
1213
use ClassExtensionTrait;
1314

‎pkg/dbal/Tests/DbalConsumerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
use Interop\Queue\Consumer;
1212
use Interop\Queue\Exception\InvalidMessageException;
1313
use Interop\Queue\Message;
14+
use PHPUnit\Framework\TestCase;
1415

15-
class DbalConsumerTest extends \PHPUnit_Framework_TestCase
16+
class DbalConsumerTest extends TestCase
1617
{
1718
use ClassExtensionTrait;
1819

‎pkg/dbal/Tests/DbalContextTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
use Interop\Queue\Destination;
1414
use Interop\Queue\Exception\InvalidDestinationException;
1515
use Interop\Queue\Exception\TemporaryQueueNotSupportedException;
16+
use PHPUnit\Framework\TestCase;
1617

17-
class DbalContextTest extends \PHPUnit_Framework_TestCase
18+
class DbalContextTest extends TestCase
1819
{
1920
use ClassExtensionTrait;
2021

‎pkg/dbal/Tests/DbalDestinationTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
use Interop\Queue\Destination;
88
use Interop\Queue\Queue;
99
use Interop\Queue\Topic;
10+
use PHPUnit\Framework\TestCase;
1011

11-
class DbalDestinationTest extends \PHPUnit_Framework_TestCase
12+
class DbalDestinationTest extends TestCase
1213
{
1314
use ClassExtensionTrait;
1415

‎pkg/dbal/Tests/DbalMessageTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
use Enqueue\Dbal\DbalMessage;
66
use Enqueue\Test\ClassExtensionTrait;
7+
use PHPUnit\Framework\TestCase;
78

8-
class DbalMessageTest extends \PHPUnit_Framework_TestCase
9+
class DbalMessageTest extends TestCase
910
{
1011
use ClassExtensionTrait;
1112

‎pkg/dbal/Tests/DbalProducerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
use Interop\Queue\Destination;
1010
use Interop\Queue\Exception\InvalidDestinationException;
1111
use Interop\Queue\Producer;
12+
use PHPUnit\Framework\TestCase;
1213

13-
class DbalProducerTest extends \PHPUnit_Framework_TestCase
14+
class DbalProducerTest extends TestCase
1415
{
1516
use ClassExtensionTrait;
1617

‎pkg/dbal/Tests/ManagerRegistryConnectionFactoryTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
use Enqueue\Dbal\ManagerRegistryConnectionFactory;
99
use Enqueue\Test\ClassExtensionTrait;
1010
use Interop\Queue\ConnectionFactory;
11+
use PHPUnit\Framework\TestCase;
1112

12-
class ManagerRegistryConnectionFactoryTest extends \PHPUnit_Framework_TestCase
13+
class ManagerRegistryConnectionFactoryTest extends TestCase
1314
{
1415
use ClassExtensionTrait;
1516

‎pkg/enqueue/Consumption/QueueConsumer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,8 @@ public function consume(ExtensionInterface $runtimeExtension = null): void
274274

275275
++$cycle;
276276
}
277+
278+
$this->enableSubscriptionConsumer = $enableSubscriptionConsumer;
277279
}
278280

279281
/**

‎pkg/enqueue/Tests/Client/Driver/DbalDriverTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
use Interop\Queue\Producer as InteropProducer;
1717
use Interop\Queue\Queue as InteropQueue;
1818
use Interop\Queue\Topic as InteropTopic;
19+
use PHPUnit\Framework\TestCase;
1920

20-
class DbalDriverTest extends \PHPUnit_Framework_TestCase
21+
class DbalDriverTest extends TestCase
2122
{
2223
use ClassExtensionTrait;
2324
use GenericDriverTestsTrait;

‎pkg/enqueue/Tests/Client/Driver/MongodbDriverTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
use Interop\Queue\Producer as InteropProducer;
1717
use Interop\Queue\Queue as InteropQueue;
1818
use Interop\Queue\Topic as InteropTopic;
19+
use PHPUnit\Framework\TestCase;
1920

20-
class MongodbDriverTest extends \PHPUnit_Framework_TestCase
21+
class MongodbDriverTest extends TestCase
2122
{
2223
use ClassExtensionTrait;
2324
use GenericDriverTestsTrait;

‎pkg/enqueue/Tests/Consumption/FallbackSubscriptionConsumerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
use Interop\Queue\Message as InteropMessage;
88
use Interop\Queue\Queue as InteropQueue;
99
use Interop\Queue\SubscriptionConsumer;
10+
use PHPUnit\Framework\TestCase;
1011

11-
class FallbackSubscriptionConsumerTest extends \PHPUnit_Framework_TestCase
12+
class FallbackSubscriptionConsumerTest extends TestCase
1213
{
1314
public function testShouldImplementSubscriptionConsumerInterface()
1415
{

‎pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function testThrowErrorIfServiceDoesNotImplementProcessorReturnType()
6969
$registry = new ContainerProcessorRegistry($containerMock);
7070

7171
$this->expectException(\TypeError::class);
72-
$this->expectExceptionMessage('Return value of Enqueue\Symfony\ContainerProcessorRegistry::get() must implement interface Interop\Queue\PsrProcessor, instance of stdClass returned');
72+
$this->expectExceptionMessage('Return value of Enqueue\Symfony\ContainerProcessorRegistry::get() must implement interface Interop\Queue\Processor, instance of stdClass returned');
7373
$registry->get('processor-name');
7474
}
7575

‎pkg/enqueue/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
"enqueue/test": "0.9.x-dev",
3737
"enqueue/simple-client": "0.9.x-dev",
3838
"enqueue/mongodb": "0.9.x-dev",
39-
"empi89/php-amqp-stubs": "*@dev"
39+
"empi89/php-amqp-stubs": "*@dev",
40+
"enqueue/dsn": "0.9.x-dev"
4041
},
4142
"suggest": {
4243
"symfony/console": "^2.8|^3|^4 If you want to use li commands",

‎pkg/mongodb/Tests/MongodbConnectionFactoryTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
use Enqueue\Mongodb\MongodbContext;
77
use Enqueue\Test\ClassExtensionTrait;
88
use Interop\Queue\ConnectionFactory;
9+
use PHPUnit\Framework\TestCase;
910

1011
/**
1112
* @group mongodb
1213
*/
13-
class MongodbConnectionFactoryTest extends \PHPUnit_Framework_TestCase
14+
class MongodbConnectionFactoryTest extends TestCase
1415
{
1516
use ClassExtensionTrait;
1617

‎pkg/mongodb/Tests/MongodbConsumerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
use Interop\Queue\Consumer;
1212
use Interop\Queue\Exception\InvalidMessageException;
1313
use Interop\Queue\Message;
14+
use PHPUnit\Framework\TestCase;
1415

1516
/**
1617
* @group mongodb
1718
*/
18-
class MongodbConsumerTest extends \PHPUnit_Framework_TestCase
19+
class MongodbConsumerTest extends TestCase
1920
{
2021
use ClassExtensionTrait;
2122

‎pkg/mongodb/Tests/MongodbContextTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
use Interop\Queue\Exception\InvalidDestinationException;
1414
use Interop\Queue\Exception\TemporaryQueueNotSupportedException;
1515
use MongoDB\Client;
16+
use PHPUnit\Framework\TestCase;
1617

1718
/**
1819
* @group mongodb
1920
*/
20-
class MongodbContextTest extends \PHPUnit_Framework_TestCase
21+
class MongodbContextTest extends TestCase
2122
{
2223
use ClassExtensionTrait;
2324

‎pkg/mongodb/Tests/MongodbDestinationTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
use Interop\Queue\Destination;
88
use Interop\Queue\Queue;
99
use Interop\Queue\Topic;
10+
use PHPUnit\Framework\TestCase;
1011

1112
/**
1213
* @group mongodb
1314
*/
14-
class MongodbDestinationTest extends \PHPUnit_Framework_TestCase
15+
class MongodbDestinationTest extends TestCase
1516
{
1617
use ClassExtensionTrait;
1718

‎pkg/mongodb/Tests/MongodbMessageTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44

55
use Enqueue\Mongodb\MongodbMessage;
66
use Enqueue\Test\ClassExtensionTrait;
7+
use PHPUnit\Framework\TestCase;
78

89
/**
910
* @group mongodb
1011
*/
11-
class MongodbMessageTest extends \PHPUnit_Framework_TestCase
12+
class MongodbMessageTest extends TestCase
1213
{
1314
use ClassExtensionTrait;
1415

‎pkg/mongodb/Tests/MongodbProducerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
use Interop\Queue\Destination;
1010
use Interop\Queue\Exception\InvalidDestinationException;
1111
use Interop\Queue\Producer;
12+
use PHPUnit\Framework\TestCase;
1213

1314
/**
1415
* @group mongodb
1516
*/
16-
class MongodbProducerTest extends \PHPUnit_Framework_TestCase
17+
class MongodbProducerTest extends TestCase
1718
{
1819
use ClassExtensionTrait;
1920

‎pkg/rdkafka/RdKafkaConnectionFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function __construct($config = 'kafka:')
4747
throw new \LogicException('The config must be either an array of options, a DSN string or null');
4848
}
4949

50-
$this->config = array_replace($this->defaultConfig(), $config);
50+
$this->config = array_replace_recursive($this->defaultConfig(), $config);
5151
}
5252

5353
/**

‎pkg/rdkafka/Tests/RdKafkaConnectionFactoryTest.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,19 @@ public static function provideConfigs()
107107
],
108108
],
109109
];
110+
111+
yield [
112+
[
113+
'global' => [
114+
'group.id' => 'group-id',
115+
],
116+
],
117+
[
118+
'global' => [
119+
'metadata.broker.list' => 'localhost:9092',
120+
'group.id' => 'group-id',
121+
],
122+
],
123+
];
110124
}
111125
}

‎pkg/sqs/Tests/SqsConsumerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
use Interop\Queue\Consumer;
1414
use Interop\Queue\Exception\InvalidMessageException;
1515
use Interop\Queue\Message;
16+
use PHPUnit\Framework\TestCase;
1617

17-
class SqsConsumerTest extends \PHPUnit_Framework_TestCase
18+
class SqsConsumerTest extends TestCase
1819
{
1920
use ClassExtensionTrait;
2021

‎pkg/sqs/Tests/SqsDestinationTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
use Enqueue\Test\ClassExtensionTrait;
77
use Interop\Queue\Queue;
88
use Interop\Queue\Topic;
9+
use PHPUnit\Framework\TestCase;
910

10-
class SqsDestinationTest extends \PHPUnit_Framework_TestCase
11+
class SqsDestinationTest extends TestCase
1112
{
1213
use ClassExtensionTrait;
1314

‎pkg/sqs/Tests/SqsProducerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
use Interop\Queue\Exception\InvalidDestinationException;
1414
use Interop\Queue\Exception\InvalidMessageException;
1515
use Interop\Queue\Producer;
16+
use PHPUnit\Framework\TestCase;
1617

17-
class SqsProducerTest extends \PHPUnit_Framework_TestCase
18+
class SqsProducerTest extends TestCase
1819
{
1920
use ClassExtensionTrait;
2021

0 commit comments

Comments
 (0)