Skip to content

Commit b205991

Browse files
committed
Merge branch 'master' into 0.8
2 parents b70d426 + f5c39ad commit b205991

16 files changed

+58
-9
lines changed

.travis.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,21 @@ matrix:
2121
env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true
2222
- php: 7.1
2323
services: docker
24-
env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=true
24+
env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
2525
- php: 7.1
2626
services: docker
27-
env: SYMFONY_VERSION=3.0.* FUNCTIONAL_TESTS=true
27+
env: SYMFONY_VERSION=3.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
2828
- php: 7.1
2929
services: docker
30-
env: SYMFONY_VERSION=3.2.* FUNCTIONAL_TESTS=true
30+
env: SYMFONY_VERSION=3.2.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
3131
- php: 7.1
3232
services: docker
33-
env: SYMFONY_VERSION=3.3.* FUNCTIONAL_TESTS=true
33+
env: SYMFONY_VERSION=3.3.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
34+
- php: 7.1
35+
services: docker
36+
env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
37+
allow_failures:
38+
- env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
3439

3540
cache:
3641
directories:
@@ -41,16 +46,17 @@ install:
4146
- echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
4247
- composer require symfony/symfony:${SYMFONY_VERSION} --no-update
4348
- composer install
44-
- if [ "$FUNCTIONAL_TESTS" = true ]; then docker --version; fi
45-
- if [ "$FUNCTIONAL_TESTS" = true ]; then docker-compose --version; fi
46-
- if [ "$FUNCTIONAL_TESTS" = true ]; then bin/dev -b; fi
49+
- if [ "$PREPARE_CONTAINER" = true ]; then docker --version; fi
50+
- if [ "$PREPARE_CONTAINER" = true ]; then docker-compose --version; fi
51+
- if [ "$PREPARE_CONTAINER" = true ]; then bin/dev -b; fi
4752

4853
script:
4954
- if [ "$PHPSTAN" = true ]; then composer require "phpstan/phpstan:^0.8" ; php -d memory_limit=512M bin/phpstan analyse -l 1 -c phpstan.neon pkg/gps 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
5055
- if [ "$PHP_CS_FIXER" = true ]; then IFS=$'\n'; COMMIT_SCA_FILES=($(git diff --name-only --diff-filter=ACMRTUXB "${TRAVIS_COMMIT_RANGE}")); unset IFS; fi
5156
- 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
5257
- if [ "$UNIT_TESTS" = true ]; then bin/phpunit --exclude-group=functional; fi
53-
- if [ "$FUNCTIONAL_TESTS" = true ]; then bin/dev -t; fi
58+
- if [ "$FUNCTIONAL_TESTS" = true ]; then bin/run-fun-test.sh --exclude-group=rdkafka; fi
59+
- if [ "RDKAFKA_TESTS" = true ]; then bin/run-fun-test.sh --group=rdkafka; fi
5460

5561
notifications:
5662
webhooks:

bin/dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ while getopts "bustefcd" OPTION; do
2121
./bin/php-cs-fixer fix
2222
;;
2323
t)
24-
COMPOSE_PROJECT_NAME=mqdev docker-compose run --workdir="/mqdev" --rm dev ./bin/test "$2"
24+
./bin/run-fun-test.sh "$2"
2525
;;
2626
c)
2727
COMPOSE_PROJECT_NAME=mqdev docker-compose run -e CHANGELOG_GITHUB_TOKEN=${CHANGELOG_GITHUB_TOKEN:-""} --workdir="/mqdev" --rm generate-changelog github_changelog_generator --future-release "$2" --simple-list

bin/run-fun-test.sh

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

pkg/rdkafka/Tests/JsonSerializerTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
use Enqueue\Test\ClassExtensionTrait;
99
use PHPUnit\Framework\TestCase;
1010

11+
/**
12+
* @group rdkafka
13+
*/
1114
class JsonSerializerTest extends TestCase
1215
{
1316
use ClassExtensionTrait;

pkg/rdkafka/Tests/RdKafkaConnectionFactoryTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
use Enqueue\RdKafka\RdKafkaConnectionFactory;
66
use PHPUnit\Framework\TestCase;
77

8+
/**
9+
* @group rdkafka
10+
*/
811
class RdKafkaConnectionFactoryTest extends TestCase
912
{
1013
public function testThrowNeitherArrayStringNorNullGivenAsConfig()

pkg/rdkafka/Tests/RdKafkaConsumerTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
use RdKafka\KafkaConsumer;
1212
use RdKafka\Message;
1313

14+
/**
15+
* @group rdkafka
16+
*/
1417
class RdKafkaConsumerTest extends TestCase
1518
{
1619
public function testCouldBeConstructedWithRequiredArguments()

pkg/rdkafka/Tests/RdKafkaContextTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
use Interop\Queue\InvalidDestinationException;
1010
use PHPUnit\Framework\TestCase;
1111

12+
/**
13+
* @group rdkafka
14+
*/
1215
class RdKafkaContextTest extends TestCase
1316
{
1417
public function testThrowNotImplementedOnCreateTemporaryQueue()

pkg/rdkafka/Tests/RdKafkaMessageTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
use PHPUnit\Framework\TestCase;
77
use RdKafka\Message;
88

9+
/**
10+
* @group rdkafka
11+
*/
912
class RdKafkaMessageTest extends TestCase
1013
{
1114
public function testCouldSetGetPartition()

pkg/rdkafka/Tests/RdKafkaProducerTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
use RdKafka\ProducerTopic;
1616
use RdKafka\TopicConf;
1717

18+
/**
19+
* @group rdkafka
20+
*/
1821
class RdKafkaProducerTest extends TestCase
1922
{
2023
public function testCouldBeConstructedWithKafkaProducerAndSerializerAsArguments()

pkg/rdkafka/Tests/RdKafkaTopicTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
use PHPUnit\Framework\TestCase;
77
use RdKafka\TopicConf;
88

9+
/**
10+
* @group rdkafka
11+
*/
912
class RdKafkaTopicTest extends TestCase
1013
{
1114
public function testCouldSetGetPartition()

pkg/rdkafka/Tests/Spec/RdKafkaConnectionFactoryTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
use Enqueue\RdKafka\RdKafkaConnectionFactory;
66
use Interop\Queue\Spec\PsrConnectionFactorySpec;
77

8+
/**
9+
* @group rdkafka
10+
*/
811
class RdKafkaConnectionFactoryTest extends PsrConnectionFactorySpec
912
{
1013
protected function createConnectionFactory()

pkg/rdkafka/Tests/Spec/RdKafkaContextTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
use Enqueue\RdKafka\RdKafkaContext;
66
use Interop\Queue\Spec\PsrContextSpec;
77

8+
/**
9+
* @group rdkafka
10+
*/
811
class RdKafkaContextTest extends PsrContextSpec
912
{
1013
protected function createContext()

pkg/rdkafka/Tests/Spec/RdKafkaMessageTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
use Enqueue\RdKafka\RdKafkaMessage;
66
use Interop\Queue\Spec\PsrMessageSpec;
77

8+
/**
9+
* @group rdkafka
10+
*/
811
class RdKafkaMessageTest extends PsrMessageSpec
912
{
1013
/**

pkg/rdkafka/Tests/Spec/RdKafkaQueueTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
use Enqueue\RdKafka\RdKafkaTopic;
66
use Interop\Queue\Spec\PsrQueueSpec;
77

8+
/**
9+
* @group rdkafka
10+
*/
811
class RdKafkaQueueTest extends PsrQueueSpec
912
{
1013
protected function createQueue()

pkg/rdkafka/Tests/Spec/RdKafkaSendToAndReceiveFromTopicTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Interop\Queue\Spec\SendToAndReceiveFromTopicSpec;
88

99
/**
10+
* @group rdkafka
1011
* @group functional
1112
* @retry 5
1213
*/

pkg/rdkafka/Tests/Spec/RdKafkaTopicTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
use Enqueue\RdKafka\RdKafkaTopic;
66
use Interop\Queue\Spec\PsrTopicSpec;
77

8+
/**
9+
* @group rdkafka
10+
*/
811
class RdKafkaTopicTest extends PsrTopicSpec
912
{
1013
/**

0 commit comments

Comments
 (0)