Skip to content

Commit cbe52c5

Browse files
authored
Merge pull request #569 from Berdir/patch-2
Allow Symfony 4 as dependency
2 parents ced988c + 52ae552 commit cbe52c5

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ install:
2828
# @see https://github.com/jhedstrom/drupalextension/issues/458
2929
- test ${DRUPAL_VERSION} -ne 8 || COMPOSER_MEMORY_LIMIT=-1 travis_retry composer require drush/drush:~10.0 symfony/dependency-injection:3.4.4
3030
- composer install
31+
# For Drupal 8, change composer.json to require symfony 3.x as conflicting
32+
# versions between the separate drupal and drupalextension vendor folders
33+
# can create conflicts.
34+
# @todo Change test process to require drupalextension from the local folder
35+
# to let composer handle compatibility and simulate a more common process.
36+
- 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"
3137
# Install drush globally.
3238
- (test ${DRUPAL_VERSION} -ne 8 && composer global require drush/drush:~8.0 drupal/drupal-driver) || composer global require drush/drush:~10.0
3339
# Install the Behat Drush Endpoint for Drupal 7 tests.

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
"behat/mink-goutte-driver": "~1.0",
2929
"behat/mink-selenium2-driver": "~1.1",
3030
"drupal/drupal-driver": "^2.1.0",
31-
"symfony/browser-kit": "^3.4",
32-
"symfony/dependency-injection": "~3.0",
33-
"symfony/translation": "^3.4"
31+
"symfony/browser-kit": "^3.4|~4.4",
32+
"symfony/dependency-injection": "~3.0|~4.4",
33+
"symfony/translation": "^3.4|~4.4"
3434
},
3535
"require-dev": {
3636
"phpspec/phpspec": "~2.0 || ~4.0",

0 commit comments

Comments
 (0)