From ae2a85d403edce0da713703c560a0adc6dfe1189 Mon Sep 17 00:00:00 2001 From: Sascha Grossenbacher Date: Mon, 17 Feb 2020 21:12:57 +0100 Subject: [PATCH 1/3] Allow Symfony 4 as dependency --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 101da69d..0420adc0 100644 --- a/composer.json +++ b/composer.json @@ -28,9 +28,9 @@ "behat/mink-goutte-driver": "~1.0", "behat/mink-selenium2-driver": "~1.1", "drupal/drupal-driver": "^2.1.0", - "symfony/browser-kit": "^3.4", - "symfony/dependency-injection": "~3.0", - "symfony/translation": "^3.4" + "symfony/browser-kit": "^3.4|~4.4", + "symfony/dependency-injection": "~3.0|~4.4", + "symfony/translation": "^3.4|~4.4" }, "require-dev": { "phpspec/phpspec": "~2.0 || ~4.0", From f3a2ff109666b70702ff1b0a26a0b505746cbf09 Mon Sep 17 00:00:00 2001 From: Sascha Grossenbacher Date: Sat, 22 Feb 2020 11:58:59 +0100 Subject: [PATCH 2/3] Force symfony3 versions as workaround on Drupal 8 travis testing --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index c2a91adb..460771ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,12 @@ install: # @see https://github.com/jhedstrom/drupalextension/issues/458 - test ${DRUPAL_VERSION} -ne 8 || COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require drush/drush:~10.0 symfony/dependency-injection:3.4.4 - composer install + # For Drupal 8, change composer.json to require symfony 3.x as conflicting + # versions between the separate drupal and drupalextension vendor folders + # can create conflicts. + # @todo Change test process to require drupalextension from the local folder + # to let composer handle compatibility and simulate a more common process. + - test ${DRUPAL_VERSION} -eq 8 && COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require "symfony/browser-kit:~3.4" "symfony/dependency-injection:~3.0" "symfony/translation:^3.4" # Install drush globally. - (test ${DRUPAL_VERSION} -ne 8 && composer global require drush/drush:~8.0 drupal/drupal-driver) || composer global require drush/drush:~10.0 # Install the Behat Drush Endpoint for Drupal 7 tests. From 52ae552e8127c9343bb969a6ae0bb60435dff437 Mon Sep 17 00:00:00 2001 From: Sascha Grossenbacher Date: Sat, 22 Feb 2020 12:09:30 +0100 Subject: [PATCH 3/3] Invert check so it does not fail on D7 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 460771ac..b9f84042 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ install: # can create conflicts. # @todo Change test process to require drupalextension from the local folder # to let composer handle compatibility and simulate a more common process. - - test ${DRUPAL_VERSION} -eq 8 && COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require "symfony/browser-kit:~3.4" "symfony/dependency-injection:~3.0" "symfony/translation:^3.4" + - test ${DRUPAL_VERSION} -ne 8 || COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require "symfony/browser-kit:~3.4" "symfony/dependency-injection:~3.0" "symfony/translation:^3.4" # Install drush globally. - (test ${DRUPAL_VERSION} -ne 8 && composer global require drush/drush:~8.0 drupal/drupal-driver) || composer global require drush/drush:~10.0 # Install the Behat Drush Endpoint for Drupal 7 tests.