From a68da8d0d1273e9175718842526d4da2e7784fc9 Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Wed, 20 Feb 2019 17:06:48 +0100 Subject: [PATCH 1/4] Enable php 7.3 tests and fuctional for 7.2 --- .travis.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.travis.yml b/.travis.yml index f358a00cf..8ad758675 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,9 @@ matrix: - php: 7.2 sudo: false env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true + - php: 7.3 + sudo: false + env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true - php: 7.1 services: docker sudo: required @@ -28,6 +31,22 @@ matrix: sudo: required services: docker env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + - php: 7.2 + services: docker + sudo: required + env: SYMFONY_VERSION=3.4.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + - php: 7.2 + sudo: required + services: docker + env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + - php: 7.3 + services: docker + sudo: required + env: SYMFONY_VERSION=3.4.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + - php: 7.3 + sudo: required + services: docker + env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true - php: 7.1 sudo: required services: docker From 2b6bf70644898c8d07ab66e6301691c649db90b5 Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Thu, 21 Feb 2019 11:16:27 +0100 Subject: [PATCH 2/4] Update dependencies --- composer.json | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 639b274b6..37019a4d4 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,6 @@ { "name": "enqueue/enqueue-dev", "type": "project", - "minimum-stability": "beta", "homepage": "https://enqueue.forma-pro.com/", "require": { "php": "^7.1.3", @@ -19,7 +18,7 @@ "ramsey/uuid": "^2|^3.5", "psr/log": "^1", "psr/container": "^1", - "symfony/event-dispatcher": "4.0.*", + "symfony/event-dispatcher": "^4.0", "makasim/temp-file": "^0.2", "google/cloud-pubsub": "^0.6.1|^1.0", "doctrine/orm": "~2.4", @@ -40,20 +39,20 @@ "phpunit/phpunit": "^5.5", "phpstan/phpstan": "^0.10", "queue-interop/queue-spec": "^0.6", - "symfony/browser-kit": "4.0.*", - "symfony/config": "4.0.*", - "symfony/process": "4.0.*", - "symfony/console": "4.0.*", - "symfony/dependency-injection": "4.0.*", - "symfony/event-dispatcher": "4.0.*", - "symfony/expression-language": "4.0.*", - "symfony/http-kernel": "4.0.*", - "symfony/filesystem": "4.0.*", - "symfony/framework-bundle": "4.0.*", + "symfony/browser-kit": "^4.0", + "symfony/config": "^4.0", + "symfony/process": "^4.0", + "symfony/console": "^4.0", + "symfony/dependency-injection": "^4.0", + "symfony/event-dispatcher": "^4.0", + "symfony/expression-language": "^4.0", + "symfony/http-kernel": "^4.0", + "symfony/filesystem": "^4.0", + "symfony/framework-bundle": "^4.0", "empi89/php-amqp-stubs": "*@dev", "doctrine/doctrine-bundle": "~1.2", "kwn/php-rdkafka-stubs": "^1.0.2", - "friendsofphp/php-cs-fixer": "^2" + "friendsofphp/php-cs-fixer": "^2.14" }, "autoload": { "psr-4": { From eec15d9398fd8e42b425b50fc30c4a20e5fcdfc2 Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Thu, 21 Feb 2019 13:33:43 +0100 Subject: [PATCH 3/4] Fix travis --- .travis.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ad758675..c01ccd3ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,52 +7,52 @@ matrix: include: - php: 7.1 sudo: false - env: SYMFONY_VERSION=3.4.* PHPSTAN=true + env: SYMFONY_VERSION=^3.4 PHPSTAN=true - php: 7.1 sudo: false - env: SYMFONY_VERSION=3.4.* PHP_CS_FIXER=true + env: SYMFONY_VERSION=^3.4 PHP_CS_FIXER=true - php: 7.1 sudo: false - env: SYMFONY_VERSION=3.4.* UNIT_TESTS=true + env: SYMFONY_VERSION=^3.4 UNIT_TESTS=true - php: 7.1 sudo: false - env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true + env: SYMFONY_VERSION=^4.0 UNIT_TESTS=true - php: 7.2 sudo: false - env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true + env: SYMFONY_VERSION=^4.0 UNIT_TESTS=true - php: 7.3 sudo: false - env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true + env: SYMFONY_VERSION=^4.0 UNIT_TESTS=true - php: 7.1 services: docker sudo: required - env: SYMFONY_VERSION=3.4.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + env: SYMFONY_VERSION=^3.4 FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true - php: 7.1 sudo: required services: docker - env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + env: SYMFONY_VERSION=^4.0 FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true - php: 7.2 services: docker sudo: required - env: SYMFONY_VERSION=3.4.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + env: SYMFONY_VERSION=^3.4 FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true - php: 7.2 sudo: required services: docker - env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + env: SYMFONY_VERSION=^4.0 FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true - php: 7.3 services: docker sudo: required - env: SYMFONY_VERSION=3.4.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + env: SYMFONY_VERSION=^3.4 FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true - php: 7.3 sudo: required services: docker - env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true + env: SYMFONY_VERSION=^4.0 FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true - php: 7.1 sudo: required services: docker - env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true + env: SYMFONY_VERSION=^3.4 RDKAFKA_TESTS=true PREPARE_CONTAINER=true allow_failures: - - env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true + - env: SYMFONY_VERSION=^3.4 RDKAFKA_TESTS=true PREPARE_CONTAINER=true cache: directories: From 338de99becce46a4f61649b2949f867e5dcc4e46 Mon Sep 17 00:00:00 2001 From: Witold Wasiczko Date: Sat, 4 May 2019 23:03:22 +0200 Subject: [PATCH 4/4] Fix symfony tests --- .../DependencyInjection/BuildProcessorRegistryPassTest.php | 2 +- .../DependencyInjection/BuildProcessorRegistryPassTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildProcessorRegistryPassTest.php b/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildProcessorRegistryPassTest.php index c0142f0e3..394c98026 100644 --- a/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildProcessorRegistryPassTest.php +++ b/pkg/enqueue/Tests/Symfony/Client/DependencyInjection/BuildProcessorRegistryPassTest.php @@ -139,7 +139,7 @@ private function assertLocatorServices(ContainerBuilder $container, $locatorId, $this->assertRegExp('/service_locator\..*?\.enqueue\./', $locatorId); $match = []; - if (false == preg_match('/(service_locator\..*?)\.enqueue\./', $locatorId, $match)) { + if (false == preg_match('/(\.?service_locator\..*?)\.enqueue\./', $locatorId, $match)) { $this->fail('preg_match should not failed'); } diff --git a/pkg/enqueue/Tests/Symfony/DependencyInjection/BuildProcessorRegistryPassTest.php b/pkg/enqueue/Tests/Symfony/DependencyInjection/BuildProcessorRegistryPassTest.php index d122e044c..9574b16ec 100644 --- a/pkg/enqueue/Tests/Symfony/DependencyInjection/BuildProcessorRegistryPassTest.php +++ b/pkg/enqueue/Tests/Symfony/DependencyInjection/BuildProcessorRegistryPassTest.php @@ -202,7 +202,7 @@ private function assertLocatorServices(ContainerBuilder $container, $locatorId, $this->assertRegExp('/service_locator\..*?\.enqueue\./', $locatorId); $match = []; - if (false == preg_match('/(service_locator\..*?)\.enqueue\./', $locatorId, $match)) { + if (false == preg_match('/(\.?service_locator\..*?)\.enqueue\./', $locatorId, $match)) { $this->fail('preg_match should not failed'); }