Skip to content

Commit da099f9

Browse files
committed
Merge branch '0.9' into amqp-subscription-consumers
2 parents b81cdf3 + 7ab383f commit da099f9

24 files changed

Lines changed: 48 additions & 43 deletions

File tree

‎.travis.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,17 @@ matrix:
3232
cache:
3333
directories:
3434
- $HOME/.composer/cache
35+
- $HOME/docker
36+
37+
38+
before_cache:
39+
- >
40+
mkdir -p $HOME/docker && docker images -a --filter='dangling=false' --format '{{.Repository}}:{{.Tag}} {{.ID}}'
41+
| xargs -n 2 -t sh -c 'test -e $HOME/docker/$1.tar.gz || docker save $0 | gzip -2 > $HOME/docker/$1.tar.gz'
3542
3643
before_install:
3744
- echo "extension = mongodb.so" >> $HOME/.phpenv/versions/$(phpenv version-name)/etc/php.ini
45+
- if [[ -d $HOME/docker ]]; then ls $HOME/docker/*.tar.gz | xargs -I {file} sh -c "zcat {file} | docker load"; fi
3846

3947
install:
4048
- rm $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini;

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"enqueue/simple-client": "0.9.x-dev",
2929
"enqueue/test": "0.9.x-dev",
3030
"enqueue/async-event-dispatcher": "0.9.x-dev",
31-
"queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1",
31+
"queue-interop/queue-interop": "^0.6@dev|0.7.x-dev|^1.0.0-alpha1",
3232
"queue-interop/amqp-interop": "^0.7@dev",
3333
"queue-interop/queue-spec": "^0.5.4@dev",
3434

‎docker/bin/test.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ waitForService mongo 27017 50
4040
waitForService localstack 4576 50
4141

4242
php docker/bin/refresh-mysql-database.php
43+
php pkg/job-queue/Tests/Functional/app/console doctrine:database:create --if-not-exists
44+
php pkg/job-queue/Tests/Functional/app/console doctrine:schema:update --force
4345

4446
#php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference enqueue
4547
bin/phpunit "$@"

‎phpunit.xml.dist‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@
9898
</testsuite>
9999
</testsuites>
100100

101+
<php>
102+
<env name="SHELL_VERBOSITY" value="-1"/>
103+
</php>
104+
101105
<filter>
102106
<whitelist>
103107
<directory suffix=".php">.</directory>

‎pkg/amqp-bunny/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"license": "MIT",
88
"require": {
99
"php": "^7.1.3",
10-
"queue-interop/amqp-interop": "^0.7.4|^0.8@dev",
10+
"queue-interop/amqp-interop": "^0.7.4",
1111
"bunny/bunny": "^0.2.4|^0.3|^0.4",
1212
"enqueue/amqp-tools": "0.9.x-dev"
1313
},

‎pkg/amqp-ext/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"require": {
99
"php": "^7.1.3",
1010
"ext-amqp": "^1.9.3",
11-
"queue-interop/amqp-interop": "^0.7.4|^0.8@dev",
11+
"queue-interop/amqp-interop": "^0.7.4",
1212
"enqueue/amqp-tools": "0.9.x-dev"
1313
},
1414
"require-dev": {

‎pkg/amqp-lib/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"require": {
99
"php": "^7.1.3",
1010
"php-amqplib/php-amqplib": "^2.7",
11-
"queue-interop/amqp-interop": "^0.7.4|^0.8@dev",
11+
"queue-interop/amqp-interop": "^0.7.4",
1212
"enqueue/amqp-tools": "0.9.x-dev"
1313
},
1414
"require-dev": {

‎pkg/amqp-tools/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"license": "MIT",
88
"require": {
99
"php": "^7.1.3",
10-
"queue-interop/amqp-interop": "^0.8@dev"
10+
"queue-interop/amqp-interop": "^0.7.4"
1111
},
1212
"require-dev": {
1313
"phpunit/phpunit": "~5.4.0",

‎pkg/dbal/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"license": "MIT",
88
"require": {
99
"php": "^7.1.3",
10-
"queue-interop/queue-interop": "0.7.x-dev",
10+
"queue-interop/queue-interop": "^0.6.2",
1111
"doctrine/dbal": "~2.5",
1212
"ramsey/uuid": "^3"
1313
},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public function setUp()
2525

2626
public function tearDown()
2727
{
28-
parent::tearDown();
29-
3028
static::$container->get(Producer::class)->clearTraces();
29+
30+
parent::tearDown();
3131
}
3232

3333
public function testCouldBeGetFromContainerAsService()

0 commit comments

Comments
 (0)