Merge branch 'main' into align-drupal-core

Author: jhedstrom

CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+## [5.1.0]
+### Added
+ * [#677](https://github.com/jhedstrom/drupalextension/pull/677) - Drupal 11 support
 ## [5.0.0]
 ### Added
  * [#655](https://github.com/jhedstrom/drupalextension/pull/655) Configure Guzzle request options
@@ -148,7 +151,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   * [#437](https://github.com/jhedstrom/drupalextension/pull/437): Radio button selector fix.
   * [#439](https://github.com/jhedstrom/drupalextension/pull/439): Symfony 3 compatibility follow-up fix.
 
-[Unreleased]: https://github.com/jhedstrom/drupalextension/compare/v5.0.0...HEAD
+[Unreleased]: https://github.com/jhedstrom/drupalextension/compare/v5.1.0...HEAD
+[5.1.0]: https://github.com/jhedstrom/drupalextension/compare/v5.0.0...v5.1.0
 [5.0.0]: https://github.com/jhedstrom/drupalextension/compare/v5.0.0rc1...v5.0.0
 [5.0.0 alpha1]: https://github.com/jhedstrom/drupalextension/compare/v4.2.0...v5.0.0alpha1
 [4.2.0]: https://github.com/jhedstrom/drupalextension/compare/v4.1.0...v4.2.0

README.md

@@ -30,7 +30,7 @@ the [Full documentation](https://behat-drupal-extension.readthedocs.org)
 
 1. Install using [Composer](https://getcomposer.org/):
 
-    ``` bash
+    ```bash
     mkdir projectdir
     cd projectdir
     curl -sS https://getcomposer.org/installer | php
@@ -41,7 +41,7 @@ the [Full documentation](https://behat-drupal-extension.readthedocs.org)
     minimal configuration. Many more options are covered in the
     [Full documentation](https://behat-drupal-extension.readthedocs.org)
 
-    ``` yaml
+    ```yaml
     default:
       suites:
         default:
@@ -60,7 +60,7 @@ the [Full documentation](https://behat-drupal-extension.readthedocs.org)
           base_url: http://example.org/  # Replace with your site's URL
         Drupal\DrupalExtension:
           blackbox: ~
-  ```
+     ```
 
 1. In the projectdir, run
 

composer.json

@@ -27,7 +27,7 @@
     "drupal/drupal-driver": "^2.2.1 || dev-master",
     "friends-of-behat/mink-extension": "^2.7.1",
     "lullabot/mink-selenium2-driver": "^1.7",
-    "symfony/http-client": "~4.4 || ^5 || ^6",
+    "symfony/http-client": "~4.4 || ^5 || ^6" || ^7,
     "webflo/drupal-finder": "^1.2"
   },
   "require-dev": {

features/backend_login.feature

@@ -8,8 +8,14 @@ Feature: Backend login/logout
     Given I am logged in as a user with the "authenticated user" role
     Then I should be logged in on the backend
 
-  Scenario: Logout on the backend
+  Scenario: Logout on the backend via fast logout
     Given I am logged in as a user with the "authenticated user" role
     And I am logged in on the backend
     When I log out
     Then I should be logged out on the backend
+
+  Scenario: Logout on the backend via url
+    Given I am logged in as a user with the "authenticated user" role
+    And I am logged in on the backend
+    When I log out via the logout url
+    Then I should be logged out on the backend

features/bootstrap/FeatureContext.php

@@ -229,6 +229,20 @@ public function assertBackendLoggedOut()
         if (!\Drupal::currentUser()->isAnonymous()) {
             throw new \LogicException('User is still logged in on the backend.');
         }
+        // Visit login page and ensure login form is present.
+        $this->getSession()->visit($this->locatePath($this->getDrupalText('login_url')));
+        $element = $this->getSession()->getPage();
+        $element->fillField($this->getDrupalText('username_field'), 'foo');
+    }
+
+    /**
+     * Logs out via the logout url rather than fast logout.
+     *
+     * @Then I log out via the logout url
+     */
+    public function logoutViaUrl()
+    {
+      $this->logout(false);
     }
 
   /**

src/Drupal/DrupalExtension/Context/RawDrupalContext.php

@@ -422,7 +422,7 @@ public function parseEntityFields($entity_type, \stdClass $entity)
             if ($this->getDriver()->isField($entity_type, $field_name)) {
                 // Split up multiple values in multi-value fields.
                 $values = [];
-                foreach (str_getcsv($field_value) as $key => $value) {
+                foreach (str_getcsv($field_value, escape: "\\") as $key => $value) {
                     $value = trim((string) $value);
                     $columns = $value;
                     // Split up field columns if the ' - ' separator is present.

src/Drupal/DrupalExtension/Manager/DrupalAuthenticationManager.php

@@ -61,6 +61,14 @@ protected function getLoginSubmitElement(DocumentElement $element)
         return $element->findButton($this->getDrupalText('log_in'));
     }
 
+    /**
+     * Helper to get the submit element for the logout confirmation form.
+     */
+    protected function getLogoutConfirmSubmitElement(DocumentElement $element)
+    {
+        return $element->findButton($this->getDrupalText('log_out'));
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -102,7 +110,13 @@ public function logIn(\stdClass $user)
      */
     public function logout()
     {
-        $this->getSession()->visit($this->locatePath($this->getDrupalText('logout_url')));
+        $session = $this->getSession();
+        $session->visit($this->locatePath($this->getDrupalText('logout_url')));
+        // Check to see if the user is on the logout confirm page (10.3+).
+        if ($session->getCurrentUrl() === $this->locatePath($this->getDrupalText('logout_confirm_url'))) {
+            $submit = $this->getLogoutConfirmSubmitElement($session->getPage());
+            $submit->click();
+        }
         $this->userManager->setCurrentUser(false);
 
         // Log the user out on the backend if possible.

src/Drupal/DrupalExtension/ServiceContainer/DrupalExtension.php

@@ -39,7 +39,7 @@ class DrupalExtension implements ExtensionInterface
    *
    * @param null|ServiceProcessor $processor
    */
-    public function __construct(ServiceProcessor $processor = null)
+    public function __construct(?ServiceProcessor $processor = null)
     {
         $this->processor = $processor ? : new ServiceProcessor();
     }
@@ -131,11 +131,13 @@ public function configure(ArrayNodeDefinition $builder)
               'Text strings, such as Log out or the Username field can be altered via behat.yml if they vary from the default values.' . PHP_EOL
               . '  login_url: "/user"' . PHP_EOL
               . '  logout_url: "/user/logout"' . PHP_EOL
+              . '  logout_confirm_url: "/user/logout/confirm"' . PHP_EOL
               . '  log_out: "Sign out"' . PHP_EOL
               . '  log_in: "Sign in"' . PHP_EOL
               . '  password_field: "Enter your password"' . PHP_EOL
               . '  username_field: "Nickname"'
           )->
+          ignoreExtraKeys(false)->
           addDefaultsIfNotSet()->
           children()->
             scalarNode('login_url')->
@@ -144,6 +146,9 @@ public function configure(ArrayNodeDefinition $builder)
             scalarNode('logout_url')->
               defaultValue('/user/logout')->
             end()->
+            scalarNode('logout_confirm_url')->
+              defaultValue('/user/logout/confirm')->
+            end()->
             scalarNode('log_in')->
               defaultValue('Log in')->
             end()->
@@ -159,6 +164,7 @@ public function configure(ArrayNodeDefinition $builder)
           end()->
         end()->
         arrayNode('selectors')->
+          ignoreExtraKeys(false)->
           addDefaultsIfNotSet()->
           children()->
             scalarNode('message_selector')->end()->