Skip to content

Commit

Permalink
Merge pull request #688 from php-enqueue/allow-08-queue-interop
Browse files Browse the repository at this point in the history 
Allow 0.8.x Queue Interop (without deprecated Psr prefixed interfaces)
  • Loading branch information
@makasim
makasim authored Dec 13, 2018
2 parents 254228a + f808bcb commit a61ebfe
Show file tree
Hide file tree
Showing 24 changed files with 24 additions and 23 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"ext-rdkafka": "^3.0.3",

"queue-interop/amqp-interop": "^0.8",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"bunny/bunny": "^0.2.4|^0.3|^0.4",
"php-amqplib/php-amqplib": "^2.7",
"doctrine/dbal": "^2.6",
Expand Down
2 changes: 1 addition & 1 deletion pkg/amqp-bunny/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"require": {
"php": "^7.1.3",
"queue-interop/amqp-interop": "^0.8",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"bunny/bunny": "^0.2.4|^0.3|^0.4",
"enqueue/amqp-tools": "^0.9"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/amqp-ext/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"php": "^7.1.3",
"ext-amqp": "^1.9.3",
"queue-interop/amqp-interop": "^0.8",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"enqueue/amqp-tools": "^0.9"
},
"require-dev": {
Expand Down
1 change: 1 addition & 0 deletions pkg/amqp-lib/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"php": "^7.1.3",
"php-amqplib/php-amqplib": "^2.8",
"queue-interop/amqp-interop": "^0.8",
"queue-interop/queue-interop": "^0.7|^0.8",
"enqueue/amqp-tools": "^0.9"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/amqp-tools/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"require": {
"php": "^7.1.3",
"queue-interop/amqp-interop": "^0.8",
"queue-interop/queue-interop": "^0.7"
"queue-interop/queue-interop": "^0.7|^0.8"
},
"require-dev": {
"phpunit/phpunit": "~5.4.0",
Expand Down
2 changes: 1 addition & 1 deletion pkg/async-command/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"require": {
"php": ">=7.1",
"enqueue/enqueue": "^0.9",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"symfony/console": "^3.4|^4",
"symfony/process": "^3.4|^4"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/async-event-dispatcher/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"require": {
"php": "^7.1.3",
"enqueue/enqueue": "^0.9",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"symfony/event-dispatcher": "^3.4|^4"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/dbal/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"license": "MIT",
"require": {
"php": "^7.1.3",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"doctrine/dbal": "^2.6",
"ramsey/uuid": "^3"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/enqueue-bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"php": "^7.1.3",
"symfony/framework-bundle": "^3.4|^4",
"queue-interop/amqp-interop": "^0.8",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"enqueue/enqueue": "^0.9",
"enqueue/null": "^0.9"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/enqueue/Tests/Symfony/ContainerProcessorRegistryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function testThrowErrorIfServiceDoesNotImplementProcessorReturnType()
$registry = new ContainerProcessorRegistry($containerMock);

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

Expand Down
2 changes: 1 addition & 1 deletion pkg/enqueue/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"require": {
"php": "^7.1.3",
"queue-interop/amqp-interop": "^0.8",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"enqueue/null": "^0.9",
"enqueue/dsn": "^0.9",
"ramsey/uuid": "^2|^3.5",
Expand Down
2 changes: 1 addition & 1 deletion pkg/fs/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"license": "MIT",
"require": {
"php": "^7.1.3",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"enqueue/dsn": "^0.9",
"symfony/filesystem": "^3.4|^4",
"makasim/temp-file": "^0.2@stable"
Expand Down
2 changes: 1 addition & 1 deletion pkg/gearman/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"require": {
"php": "^7.1.3",
"ext-gearman": "^2.0",
"queue-interop/queue-interop": "^0.7"
"queue-interop/queue-interop": "^0.7|^0.8"
},
"require-dev": {
"phpunit/phpunit": "~5.4.0",
Expand Down
2 changes: 1 addition & 1 deletion pkg/gps/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"license": "MIT",
"require": {
"php": "^7.1.3",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"google/cloud-pubsub": "^1.0",
"enqueue/dsn": "^0.9"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/job-queue/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"php": "^7.1.3",
"enqueue/enqueue": "^0.9",
"enqueue/null": "0.9.x-dev",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"doctrine/orm": "~2.4"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/mongodb/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"license": "MIT",
"require": {
"php": "^7.1.3",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"mongodb/mongodb": "^1.2",
"ext-mongodb": "^1.3"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/null/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"license": "MIT",
"require": {
"php": "^7.1.3",
"queue-interop/queue-interop": "^0.7"
"queue-interop/queue-interop": "^0.7|^0.8"
},
"require-dev": {
"phpunit/phpunit": "~5.5",
Expand Down
2 changes: 1 addition & 1 deletion pkg/pheanstalk/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"require": {
"php": "^7.1.3",
"pda/pheanstalk": "^3",
"queue-interop/queue-interop": "^0.7"
"queue-interop/queue-interop": "^0.7|^0.8"
},
"require-dev": {
"phpunit/phpunit": "~5.4.0",
Expand Down
2 changes: 1 addition & 1 deletion pkg/rdkafka/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"require": {
"php": "^7.1.3",
"ext-rdkafka": "^3.0.3",
"queue-interop/queue-interop": "^0.7"
"queue-interop/queue-interop": "^0.7|^0.8"
},
"require-dev": {
"phpunit/phpunit": "~5.4.0",
Expand Down
2 changes: 1 addition & 1 deletion pkg/redis/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"license": "MIT",
"require": {
"php": "^7.1.3",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"enqueue/dsn": "^0.9",
"ramsey/uuid": "^3"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/simple-client/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"php": "^7.1.3",
"enqueue/enqueue": "^0.9",
"queue-interop/amqp-interop": "^0.8",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"symfony/config": "^3.4|^4"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion pkg/sqs/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"license": "MIT",
"require": {
"php": "^7.1.3",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"enqueue/dsn": "^0.9",
"aws/aws-sdk-php": "~3.26"
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/stomp/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"php": "^7.1.3",
"enqueue/dsn": "^0.9",
"stomp-php/stomp-php": "^4",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"php-http/guzzle6-adapter": "^1.1",
"php-http/client-common": "^1.7@dev",
"richardfullmer/rabbitmq-management-api": "^2.0"
Expand Down
2 changes: 1 addition & 1 deletion pkg/wamp/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"license": "MIT",
"require": {
"php": "^7.1.3",
"queue-interop/queue-interop": "^0.7",
"queue-interop/queue-interop": "^0.7|^0.8",
"enqueue/dsn": "^0.9",
"thruway/pawl-transport": "^0.5.0",
"voryx/thruway": "^0.5.3"
Expand Down

0 comments on commit a61ebfe

Please sign in to comment.