Skip to content

Commit 8ca4124

Browse files
makasimmakasim
committed
Merge branch '0.9'
2 parents 02fca65 + 7ab383f commit 8ca4124

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+808
-657
lines changed

‎.travis.yml

+19-21
Original file line numberDiff line numberDiff line change
@@ -8,50 +8,48 @@ language: php
88
matrix:
99
include:
1010
- php: 7.1
11-
env: SYMFONY_VERSION=3.0.* PHPSTAN=true
11+
env: SYMFONY_VERSION=3.4.* PHPSTAN=true
1212
- php: 7.1
13-
env: SYMFONY_VERSION=3.0.* PHP_CS_FIXER=true
14-
- php: 7.0
15-
env: SYMFONY_VERSION=2.8.* UNIT_TESTS=true
16-
- php: 7.0
17-
env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true
18-
- php: 7.1
19-
env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
13+
env: SYMFONY_VERSION=3.4.* PHP_CS_FIXER=true
2014
- php: 7.1
2115
env: SYMFONY_VERSION=3.4.* UNIT_TESTS=true
22-
- php: 7.2
23-
services: docker
24-
env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
25-
- php: 7.1
26-
services: docker
27-
env: SYMFONY_VERSION=3.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
2816
- php: 7.1
29-
services: docker
30-
env: SYMFONY_VERSION=3.2.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
17+
env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
18+
- php: 7.2
19+
env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
3120
- php: 7.1
3221
services: docker
33-
env: SYMFONY_VERSION=3.3.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
22+
env: SYMFONY_VERSION=3.4.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
3423
- php: 7.1
3524
services: docker
3625
env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
3726
- php: 7.1
3827
services: docker
39-
env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
28+
env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
4029
allow_failures:
41-
- env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
30+
- env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
4231

4332
cache:
4433
directories:
4534
- $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'
4642
4743
before_install:
4844
- 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
4946

5047
install:
5148
- rm $HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini;
5249
- echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
5350
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
5451
- composer install
52+
- ./bin/symlink-pkgs-to-vendor.sh
5553
- if [ "$PREPARE_CONTAINER" = true ]; then docker --version; fi
5654
- if [ "$PREPARE_CONTAINER" = true ]; then docker-compose --version; fi
5755
- if [ "$PREPARE_CONTAINER" = true ]; then bin/dev -b; fi
@@ -61,8 +59,8 @@ script:
6159
- if [ "$PHP_CS_FIXER" = true ]; then IFS=$'\n'; COMMIT_SCA_FILES=($(git diff --name-only --diff-filter=ACMRTUXB "${TRAVIS_COMMIT_RANGE}")); unset IFS; fi
6260
- 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
6361
- if [ "$UNIT_TESTS" = true ]; then bin/phpunit --exclude-group=functional; fi
64-
- if [ "$FUNCTIONAL_TESTS" = true ]; then bin/run-fun-test.sh --exclude-group=rdkafka; fi
65-
- if [ "RDKAFKA_TESTS" = true ]; then bin/run-fun-test.sh --group=rdkafka; fi
62+
- if [ "$FUNCTIONAL_TESTS" = true ]; then bin/test.sh --exclude-group=rdkafka; fi
63+
- if [ "RDKAFKA_TESTS" = true ]; then bin/test.sh --group=rdkafka; fi
6664

6765
notifications:
6866
webhooks:

‎bin/dev

-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ while getopts "bustefcdp" OPTION; do
2020
f)
2121
./bin/php-cs-fixer fix
2222
;;
23-
t)
24-
./bin/run-fun-test.sh "$2"
25-
;;
2623
c)
2724
docker-compose run -e CHANGELOG_GITHUB_TOKEN=${CHANGELOG_GITHUB_TOKEN:-""} --workdir="/mqdev" --rm generate-changelog github_changelog_generator --future-release "$2" --simple-list
2825
;;

‎bin/run-fun-test.sh

-6
This file was deleted.

‎bin/symlink-pkgs-to-vendor.sh

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
3+
set -x
4+
set -e
5+
6+
rm -rf vendor/enqueue/*
7+
ln -s ../../pkg/amqp-bunny vendor/enqueue
8+
ln -s ../../pkg/amqp-ext vendor/enqueue
9+
ln -s ../../pkg/amqp-lib vendor/enqueue
10+
ln -s ../../pkg/amqp-tools vendor/enqueue
11+
ln -s ../../pkg/async-event-dispatcher vendor/enqueue
12+
ln -s ../../pkg/dbal vendor/enqueue
13+
ln -s ../../pkg/enqueue vendor/enqueue
14+
ln -s ../../pkg/enqueue-bundle vendor/enqueue
15+
ln -s ../../pkg/fs vendor/enqueue
16+
ln -s ../../pkg/gearman vendor/enqueue
17+
ln -s ../../pkg/gps vendor/enqueue
18+
ln -s ../../pkg/job-queue vendor/enqueue
19+
ln -s ../../pkg/null vendor/enqueue
20+
ln -s ../../pkg/pheanstalk vendor/enqueue
21+
ln -s ../../pkg/rdkafka vendor/enqueue
22+
ln -s ../../pkg/redis vendor/enqueue
23+
ln -s ../../pkg/simple-client vendor/enqueue
24+
ln -s ../../pkg/sqs vendor/enqueue
25+
ln -s ../../pkg/stomp vendor/enqueue
26+
ln -s ../../pkg/test vendor/enqueue

‎bin/test.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
set -x
4+
set -e
5+
6+
docker-compose run --workdir="/mqdev" --rm dev ./docker/bin/test.sh "$@"

‎composer.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@
55
"homepage": "https://enqueue.forma-pro.com/",
66
"require": {
77
"php": ">=5.6",
8-
"enqueue/enqueue": "*@dev",
9-
"enqueue/stomp": "*@dev",
10-
"enqueue/amqp-ext": "*@dev",
11-
"enqueue/amqp-lib": "*@dev",
12-
"enqueue/amqp-bunny": "*@dev",
13-
"enqueue/amqp-tools": "*@dev",
8+
"enqueue/enqueue": "0.9.x-dev",
9+
"enqueue/stomp": "0.9.x-dev",
10+
"enqueue/amqp-ext": "0.9.x-dev",
11+
"enqueue/amqp-lib": "0.9.x-dev",
12+
"enqueue/amqp-bunny": "0.9.x-dev",
13+
"enqueue/amqp-tools": "0.9.x-dev",
1414
"php-amqplib/php-amqplib": "^2.7@dev",
15-
"enqueue/redis": "*@dev",
16-
"enqueue/fs": "*@dev",
17-
"enqueue/null": "*@dev",
18-
"enqueue/dbal": "*@dev",
19-
"enqueue/mongodb": "*@dev",
20-
"enqueue/sqs": "*@dev",
21-
"enqueue/pheanstalk": "*@dev",
22-
"enqueue/gearman": "*@dev",
23-
"enqueue/rdkafka": "*@dev",
15+
"enqueue/redis": "0.9.x-dev",
16+
"enqueue/fs": "0.9.x-dev",
17+
"enqueue/null": "0.9.x-dev",
18+
"enqueue/dbal": "0.9.x-dev",
19+
"enqueue/mongodb": "0.9.x-dev",
20+
"enqueue/sqs": "0.9.x-dev",
21+
"enqueue/pheanstalk": "0.9.x-dev",
22+
"enqueue/gearman": "0.9.x-dev",
23+
"enqueue/rdkafka": "0.9.x-dev",
2424
"kwn/php-rdkafka-stubs": "^1.0.2",
25-
"enqueue/gps": "*@dev",
26-
"enqueue/enqueue-bundle": "*@dev",
27-
"enqueue/job-queue": "*@dev",
28-
"enqueue/simple-client": "*@dev",
29-
"enqueue/test": "*@dev",
30-
"enqueue/async-event-dispatcher": "*@dev",
31-
"queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1",
25+
"enqueue/gps": "0.9.x-dev",
26+
"enqueue/enqueue-bundle": "0.9.x-dev",
27+
"enqueue/job-queue": "0.9.x-dev",
28+
"enqueue/simple-client": "0.9.x-dev",
29+
"enqueue/test": "0.9.x-dev",
30+
"enqueue/async-event-dispatcher": "0.9.x-dev",
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-compose.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,10 @@ services:
7777
- "6379:6379"
7878

7979
mysql:
80-
image: mariadb:10
81-
volumes:
82-
- mysql-data:/var/lib/mysql
80+
image: mysql:5.7
8381
environment:
8482
MYSQL_ROOT_PASSWORD: rootpass
83+
MYSQL_DATABASE: mqdev
8584

8685
generate-changelog:
8786
image: enqueue/generate-changelog:latest
@@ -120,6 +119,3 @@ services:
120119
HOSTNAME_EXTERNAL: 'localstack'
121120
SERVICES: 'sqs'
122121

123-
volumes:
124-
mysql-data:
125-
driver: local

‎docker/bin/refresh-mysql-database.php

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
use Enqueue\Dbal\DbalConnectionFactory;
4+
5+
require_once getcwd().'/vendor/autoload.php';
6+
7+
$dsn = getenv('DOCTRINE_DSN');
8+
$database = trim(parse_url($dsn, PHP_URL_PATH), '/');
9+
10+
$dbalContext = (new DbalConnectionFactory($dsn))->createContext();
11+
12+
$dbalContext->getDbalConnection()->getSchemaManager()->dropAndCreateDatabase($database);
13+
$dbalContext->getDbalConnection()->exec('USE '.$database);
14+
$dbalContext->createDataBaseTable();
15+
16+
echo 'MySQL Database is updated'.PHP_EOL;

‎bin/test renamed to ‎docker/bin/test.sh

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ waitForService kafka 9092 50
3939
waitForService mongo 27017 50
4040
waitForService localstack 4576 50
4141

42+
php docker/bin/refresh-mysql-database.php
4243
php pkg/job-queue/Tests/Functional/app/console doctrine:database:create --if-not-exists
4344
php pkg/job-queue/Tests/Functional/app/console doctrine:schema:update --force
4445

‎docs/bundle/config_reference.md

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ enqueue:
2121
connection_timeout: 1
2222
buffer_size: 1000
2323
lazy: true
24+
25+
# Should be true if you want to use secure connections. False by default
2426
ssl_on: false
2527
rabbitmq_stomp:
2628
host: localhost

‎docs/contribution.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ Once you did it you can work on a feature or bug fix.
1818
To run tests
1919

2020
```
21-
./bin/dev -t
21+
./bin/test.sh
2222
```
2323

2424
or for a package only:
2525

2626

2727
```
28-
./bin/dev -t pkg/enqueue
28+
./bin/test.sh pkg/enqueue
2929
```
3030

3131
## Commit

‎phpunit.xml.dist

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

+9-10
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,19 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": ">=5.6",
10-
11-
"queue-interop/amqp-interop": "^0.7.4@dev",
9+
"php": "^7.1.3",
10+
"queue-interop/amqp-interop": "^0.7.4",
1211
"bunny/bunny": "^0.2.4|^0.3|^0.4",
13-
"enqueue/amqp-tools": "^0.8.35@dev"
12+
"enqueue/amqp-tools": "0.9.x-dev"
1413
},
1514
"require-dev": {
1615
"phpunit/phpunit": "~5.4.0",
17-
"enqueue/test": "^0.8@dev",
18-
"enqueue/enqueue": "^0.8@dev",
19-
"enqueue/null": "^0.8@dev",
16+
"enqueue/test": "0.9.x-dev",
17+
"enqueue/enqueue": "0.9.x-dev",
18+
"enqueue/null": "0.9.x-dev",
2019
"queue-interop/queue-spec": "^0.5.3@dev",
21-
"symfony/dependency-injection": "^2.8|^3|^4",
22-
"symfony/config": "^2.8|^3|^4"
20+
"symfony/dependency-injection": "^3.4|^4",
21+
"symfony/config": "^3.4|^4"
2322
},
2423
"support": {
2524
"email": "[email protected]",
@@ -40,7 +39,7 @@
4039
"minimum-stability": "dev",
4140
"extra": {
4241
"branch-alias": {
43-
"dev-master": "0.8.x-dev"
42+
"dev-master": "0.9.x-dev"
4443
}
4544
}
4645
}

‎pkg/amqp-ext/composer.json

+9-10
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,20 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": ">=5.6",
9+
"php": "^7.1.3",
1010
"ext-amqp": "^1.9.3",
11-
12-
"queue-interop/amqp-interop": "^0.7.4@dev",
13-
"enqueue/amqp-tools": "^0.8.35@dev"
11+
"queue-interop/amqp-interop": "^0.7.4",
12+
"enqueue/amqp-tools": "0.9.x-dev"
1413
},
1514
"require-dev": {
1615
"phpunit/phpunit": "~5.4.0",
17-
"enqueue/test": "^0.8@dev",
18-
"enqueue/enqueue": "^0.8@dev",
19-
"enqueue/null": "^0.8@dev",
16+
"enqueue/test": "0.9.x-dev",
17+
"enqueue/enqueue": "0.9.x-dev",
18+
"enqueue/null": "0.9.x-dev",
2019
"queue-interop/queue-spec": "^0.5.3@dev",
2120
"empi89/php-amqp-stubs": "*@dev",
22-
"symfony/dependency-injection": "^2.8|^3|^4",
23-
"symfony/config": "^2.8|^3|^4"
21+
"symfony/dependency-injection": "^3.4|^4",
22+
"symfony/config": "^3.4|^4"
2423
},
2524
"support": {
2625
"email": "[email protected]",
@@ -41,7 +40,7 @@
4140
"minimum-stability": "dev",
4241
"extra": {
4342
"branch-alias": {
44-
"dev-master": "0.8.x-dev"
43+
"dev-master": "0.9.x-dev"
4544
}
4645
}
4746
}

‎pkg/amqp-lib/composer.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
"homepage": "https://enqueue.forma-pro.com/",
77
"license": "MIT",
88
"require": {
9-
"php": ">=5.6",
9+
"php": "^7.1.3",
1010
"php-amqplib/php-amqplib": "^2.7",
11-
"queue-interop/amqp-interop": "^0.7.4@dev",
12-
"enqueue/amqp-tools": "^0.8.35@dev"
11+
"queue-interop/amqp-interop": "^0.7.4",
12+
"enqueue/amqp-tools": "0.9.x-dev"
1313
},
1414
"require-dev": {
1515
"phpunit/phpunit": "~5.4.0",
16-
"enqueue/test": "^0.8@dev",
17-
"enqueue/enqueue": "^0.8@dev",
18-
"enqueue/null": "^0.8@dev",
16+
"enqueue/test": "0.9.x-dev",
17+
"enqueue/enqueue": "0.9.x-dev",
18+
"enqueue/null": "0.9.x-dev",
1919
"queue-interop/queue-spec": "^0.5.3@dev",
20-
"symfony/dependency-injection": "^2.8|^3|^4",
21-
"symfony/config": "^2.8|^3|^4"
20+
"symfony/dependency-injection": "^3.4|^4",
21+
"symfony/config": "^3.4|^4"
2222
},
2323
"support": {
2424
"email": "[email protected]",
@@ -39,7 +39,7 @@
3939
"minimum-stability": "dev",
4040
"extra": {
4141
"branch-alias": {
42-
"dev-master": "0.8.x-dev"
42+
"dev-master": "0.9.x-dev"
4343
}
4444
}
4545
}

0 commit comments

Comments
 (0)