Skip to content

Commit c7efa2d

Browse files
committed
Merge branch 'master' into amqp-ext-interop
2 parents 6c30be4 + bb6a182 commit c7efa2d

19 files changed

Lines changed: 86 additions & 82 deletions

File tree

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ install:
4040
- rm $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini;
4141
- echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
4242
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
43-
- composer install --ignore-platform-reqs # ext-amqp is not installed
43+
- composer install
4444
- if [ "$FUNCTIONAL_TESTS" = true ]; then docker --version; fi
4545
- if [ "$FUNCTIONAL_TESTS" = true ]; then docker-compose --version; fi
4646
- if [ "$FUNCTIONAL_TESTS" = true ]; then bin/dev -b; fi
4747

4848
script:
49-
- if [ "$PHPSTAN" = true ]; then php -d memory_limit=512M bin/phpstan analyse -l 1 -c phpstan.neon pkg/amqp-ext pkg/async-event-dispatcher pkg/dbal pkg/enqueue pkg/enqueue-bundle pkg/fs pkg/gearman pkg/job-queue pkg/null pkg/pheanstalk pkg/redis pkg/simple-client pkg/sqs pkg/stomp pkg/test pkg/rdkafka; fi
49+
- if [ "$PHPSTAN" = true ]; then composer require "phpstan/phpstan:0.7.0" ; php -d memory_limit=512M bin/phpstan analyse -l 1 -c phpstan.neon pkg/amqp-ext pkg/async-event-dispatcher pkg/dbal pkg/enqueue pkg/enqueue-bundle pkg/fs pkg/gearman pkg/job-queue pkg/null pkg/pheanstalk pkg/redis pkg/simple-client pkg/sqs pkg/stomp pkg/test pkg/rdkafka; fi
5050
- if [ "$PHP_CS_FIXER" = true ]; then IFS=$'\n'; COMMIT_SCA_FILES=($(git diff --name-only --diff-filter=ACMRTUXB "${TRAVIS_COMMIT_RANGE}")); unset IFS; fi
5151
- if [ "$PHP_CS_FIXER" = true ]; then ./bin/php-cs-fixer fix --config=.php_cs.dist -v --dry-run --stop-on-violation --using-cache=no --path-mode=intersection -- "${COMMIT_SCA_FILES[@]}"; fi
5252
- if [ "$UNIT_TESTS" = true ]; then bin/phpunit --exclude-group=functional; fi

‎composer.json‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
"symfony/event-dispatcher": "^2.8|^3",
3737
"symfony/console": "^2.8|^3",
3838
"friendsofphp/php-cs-fixer": "^2",
39-
"empi89/php-amqp-stubs": "*@dev",
40-
"phpstan/phpstan": "^0.7.0"
39+
"empi89/php-amqp-stubs": "*@dev"
4140
},
4241
"autoload": {
4342
"files": [
@@ -52,7 +51,12 @@
5251
}
5352
},
5453
"config": {
55-
"bin-dir": "bin"
54+
"bin-dir": "bin",
55+
"platform": {
56+
"ext-amqp": "1.7",
57+
"ext-gearman": "1.1",
58+
"ext-rdkafka": "3.3"
59+
}
5660
},
5761
"repositories": [
5862
{

‎pkg/amqp-ext/composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
},
2020
"require-dev": {
2121
"phpunit/phpunit": "~5.4.0",
22-
"enqueue/test": "^0.6@dev",
23-
"enqueue/enqueue": "^0.6@dev",
24-
"enqueue/null": "^0.6@dev",
22+
"enqueue/test": "^0.7@dev",
23+
"enqueue/enqueue": "^0.7@dev",
24+
"enqueue/null": "^0.7@dev",
2525
"queue-interop/queue-spec": "^0.5@dev",
2626
"empi89/php-amqp-stubs": "*@dev",
2727
"symfony/dependency-injection": "^2.8|^3",
@@ -39,7 +39,7 @@
3939
"minimum-stability": "dev",
4040
"extra": {
4141
"branch-alias": {
42-
"dev-master": "0.6.x-dev"
42+
"dev-master": "0.7.x-dev"
4343
}
4444
}
4545
}

‎pkg/amqp-lib/composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
},
2020
"require-dev": {
2121
"phpunit/phpunit": "~5.4.0",
22-
"enqueue/test": "^0.6@dev",
23-
"enqueue/enqueue": "^0.6@dev",
24-
"enqueue/null": "^0.6@dev",
22+
"enqueue/test": "^0.7@dev",
23+
"enqueue/enqueue": "^0.7@dev",
24+
"enqueue/null": "^0.7@dev",
2525
"queue-interop/queue-spec": "^0.5@dev",
2626
"symfony/dependency-injection": "^2.8|^3",
2727
"symfony/config": "^2.8|^3"
@@ -38,7 +38,7 @@
3838
"minimum-stability": "dev",
3939
"extra": {
4040
"branch-alias": {
41-
"dev-master": "0.6.x-dev"
41+
"dev-master": "0.7.x-dev"
4242
}
4343
}
4444
}

‎pkg/async-event-dispatcher/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/config": "^2.8|^3",
2222
"symfony/http-kernel": "^2.8|^3",
2323
"symfony/filesystem": "^2.8|^3",
24-
"enqueue/null": "^0.6@dev"
24+
"enqueue/null": "^0.7@dev"
2525
},
2626
"suggest": {
2727
"symfony/dependency-injection": "^2.8|^3 If you'd like to use async event dispatcher container extension."
@@ -35,7 +35,7 @@
3535
"minimum-stability": "dev",
3636
"extra": {
3737
"branch-alias": {
38-
"dev-master": "0.6.x-dev"
38+
"dev-master": "0.7.x-dev"
3939
}
4040
}
4141
}

‎pkg/dbal/composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
},
1919
"require-dev": {
2020
"phpunit/phpunit": "~5.4.0",
21-
"enqueue/test": "^0.6@dev",
22-
"enqueue/enqueue": "^0.6@dev",
23-
"enqueue/null": "^0.6@dev",
21+
"enqueue/test": "^0.7@dev",
22+
"enqueue/enqueue": "^0.7@dev",
23+
"enqueue/null": "^0.7@dev",
2424
"queue-interop/queue-spec": "^0.5@dev",
2525
"symfony/dependency-injection": "^2.8|^3",
2626
"symfony/config": "^2.8|^3"
@@ -37,7 +37,7 @@
3737
"minimum-stability": "dev",
3838
"extra": {
3939
"branch-alias": {
40-
"dev-master": "0.6.x-dev"
40+
"dev-master": "0.7.x-dev"
4141
}
4242
}
4343
}

‎pkg/enqueue-bundle/composer.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
"require": {
1414
"php": ">=5.6",
1515
"symfony/framework-bundle": "^2.8|^3",
16-
"enqueue/enqueue": "^0.6@dev",
17-
"enqueue/null": "^0.6@dev",
18-
"enqueue/async-event-dispatcher": "^0.6@dev"
16+
"enqueue/enqueue": "^0.7@dev",
17+
"enqueue/null": "^0.7@dev",
18+
"enqueue/async-event-dispatcher": "^0.7@dev"
1919
},
2020
"require-dev": {
2121
"phpunit/phpunit": "~5.5",
22-
"enqueue/stomp": "^0.6@dev",
23-
"enqueue/amqp-ext": "^0.6@dev",
24-
"enqueue/job-queue": "^0.6@dev",
25-
"enqueue/fs": "^0.6@dev",
26-
"enqueue/redis": "^0.6@dev",
27-
"enqueue/dbal": "^0.6@dev",
28-
"enqueue/sqs": "^0.6@dev",
29-
"enqueue/test": "^0.6@dev",
22+
"enqueue/stomp": "^0.7@dev",
23+
"enqueue/amqp-ext": "^0.7@dev",
24+
"enqueue/job-queue": "^0.7@dev",
25+
"enqueue/fs": "^0.7@dev",
26+
"enqueue/redis": "^0.7@dev",
27+
"enqueue/dbal": "^0.7@dev",
28+
"enqueue/sqs": "^0.7@dev",
29+
"enqueue/test": "^0.7@dev",
3030
"doctrine/doctrine-bundle": "~1.2",
3131
"symfony/monolog-bundle": "^2.8|^3",
3232
"symfony/browser-kit": "^2.8|^3",
@@ -40,7 +40,7 @@
4040
},
4141
"extra": {
4242
"branch-alias": {
43-
"dev-master": "0.6.x-dev"
43+
"dev-master": "0.7.x-dev"
4444
}
4545
}
4646
}

‎pkg/enqueue/composer.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"require": {
1414
"php": ">=5.6",
1515
"queue-interop/queue-interop": "^0.5@dev",
16-
"enqueue/null": "^0.6@dev",
16+
"enqueue/null": "^0.7@dev",
1717
"ramsey/uuid": "^2|^3.5"
1818
},
1919
"require-dev": {
@@ -23,14 +23,14 @@
2323
"symfony/config": "^2.8|^3",
2424
"symfony/event-dispatcher": "^2.8|^3",
2525
"symfony/http-kernel": "^2.8|^3",
26-
"enqueue/amqp-ext": "^0.6@dev",
27-
"enqueue/pheanstalk": "^0.6@dev",
28-
"enqueue/gearman": "^0.6@dev",
29-
"enqueue/rdkafka": "^0.6@dev",
30-
"enqueue/dbal": "^0.6@dev",
31-
"enqueue/fs": "^0.6@dev",
32-
"enqueue/test": "^0.6@dev",
33-
"enqueue/simple-client": "^0.6@dev",
26+
"enqueue/amqp-ext": "^0.7@dev",
27+
"enqueue/pheanstalk": "^0.7@dev",
28+
"enqueue/gearman": "^0.7@dev",
29+
"enqueue/rdkafka": "^0.7@dev",
30+
"enqueue/dbal": "^0.7@dev",
31+
"enqueue/fs": "^0.7@dev",
32+
"enqueue/test": "^0.7@dev",
33+
"enqueue/simple-client": "^0.7@dev",
3434
"empi89/php-amqp-stubs": "*@dev"
3535
},
3636
"suggest": {
@@ -54,7 +54,7 @@
5454
"minimum-stability": "dev",
5555
"extra": {
5656
"branch-alias": {
57-
"dev-master": "0.6.x-dev"
57+
"dev-master": "0.7.x-dev"
5858
}
5959
}
6060
}

‎pkg/fs/composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
},
2020
"require-dev": {
2121
"phpunit/phpunit": "~5.5",
22-
"enqueue/enqueue": "^0.6@dev",
23-
"enqueue/null": "^0.6@dev",
24-
"enqueue/test": "^0.6@dev",
22+
"enqueue/enqueue": "^0.7@dev",
23+
"enqueue/null": "^0.7@dev",
24+
"enqueue/test": "^0.7@dev",
2525
"queue-interop/queue-spec": "^0.5@dev",
2626
"symfony/dependency-injection": "^2.8|^3",
2727
"symfony/config": "^2.8|^3"
@@ -35,7 +35,7 @@
3535
"minimum-stability": "dev",
3636
"extra": {
3737
"branch-alias": {
38-
"dev-master": "0.6.x-dev"
38+
"dev-master": "0.7.x-dev"
3939
}
4040
}
4141
}

‎pkg/gearman/composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
},
1818
"require-dev": {
1919
"phpunit/phpunit": "~5.4.0",
20-
"enqueue/test": "^0.6@dev",
21-
"enqueue/enqueue": "^0.6@dev",
22-
"enqueue/null": "^0.6@dev",
20+
"enqueue/test": "^0.7@dev",
21+
"enqueue/enqueue": "^0.7@dev",
22+
"enqueue/null": "^0.7@dev",
2323
"queue-interop/queue-spec": "^0.5@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.6.x-dev"
39+
"dev-master": "0.7.x-dev"
4040
}
4141
}
4242
}

0 commit comments

Comments
 (0)