Merge pull request #542 from jhedstrom/541-dont-test-php-5.6

Drupal 8 now requires PHP 7 or greater.
jhedstrom · Jul 18, 2019 · 5702213 · 5702213
2 parents d117c1a + 6ff3897
commit 5702213
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,8 @@ matrix:
       env: DRUPAL_VERSION=8
     - php: 5.6
       env: DRUPAL_VERSION=6
+    - php: 5.6
+      env: DRUPAL_VERSION=8
     - php: 7.0
       env: DRUPAL_VERSION=6
     - php: 7.1
@@ -75,7 +77,7 @@ before_script:
   - drush cc drush
   # @todo Re-enable behat drush endpoint testing.
   # @see https://github.com/jhedstrom/drupalextension/issues/458
-  - test ${DRUPAL_VERSION} -eq 6 || test ${DRUPAL_VERSION} -eq 8 || (test ${DRUPAL_VERSION} -eq 7 && drush help behat)
+  # - test ${DRUPAL_VERSION} -eq 6 || test ${DRUPAL_VERSION} -eq 8 || (test ${DRUPAL_VERSION} -eq 7 && drush help behat)
   # Only revert features on Drupal 7.
   - test \! ${DRUPAL_VERSION} -eq 7 || drush --yes fr behat_test
   # Disable the page cache on Drupal 8.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     scenarios with incorrect configuration.
 ### Added
   * [#527](https://github.com/jhedstrom/drupalextension/pull/527) Provide a step to check that a button is not in a region.
+### Fixed
+  * [#542](https://github.com/jhedstrom/drupalextension/pull/542) Fix issue with certain symfony 4 components being pulled in.
 ## [4.0.0 beta2] 2018-12-19
 ### Added
   * [#514](https://github.com/jhedstrom/drupalextension/pull/514) Add a note about the need to remove the entries in behat.yml to use BEHAT_PARAMS.

diff --git a/composer.json b/composer.json
@@ -28,8 +28,10 @@
     "behat/mink-goutte-driver": "~1.0",
     "behat/mink-selenium2-driver": "~1.1",
     "drupal/drupal-driver": "^2.0.0",
+    "symfony/browser-kit": "^3.4",
     "symfony/dependency-injection": "~3.0",
-    "symfony/event-dispatcher": "~3.0"
+    "symfony/event-dispatcher": "~3.0",
+    "symfony/translation": "^3.4"
   },
   "require-dev": {
     "phpspec/phpspec": "~2.0 || ~4.0",

diff --git a/features/drush.feature b/features/drush.feature
@@ -18,9 +18,11 @@ Feature: Drush-specific steps
     And I run drush "en" "toolbar -y"
     Then drush output should contain "toolbar is already enabled."
 
-  Scenario: Create and view a node with fields using the Drush driver
-    Given I am viewing an "Article":
-    | title | My article with fields! |
-    | body  | A placeholder           |
-    Then I should see the heading "My article with fields!"
-    And I should see the text "A placeholder"
+# @todo Re-enable behat drush endpoint testing.
+# @see https://github.com/jhedstrom/drupalextension/issues/458
+#  Scenario: Create and view a node with fields using the Drush driver
+#    Given I am viewing an "Article":
+#    | title | My article with fields! |
+#    | body  | A placeholder           |
+#    Then I should see the heading "My article with fields!"
+#    And I should see the text "A placeholder"