diff --git a/composer.json b/composer.json
index b8b6674f6dad9ab2827259aedce6e5508658d648..346e7e6395b14b8fba1fbbafbd0ddd3b5eaa4117 100644
--- a/composer.json
+++ b/composer.json
@@ -15,8 +15,8 @@
"drupal/core-vendor-hardening": "self.version"
},
"require-dev": {
- "friends-of-behat/mink": "^1.10",
- "friends-of-behat/mink-browserkit-driver": "^1.4",
+ "behat/mink": "^1.10",
+ "behat/mink-browserkit-driver": "^2.1",
"behat/mink-selenium2-driver": "^1.4",
"composer/composer": "^2.3.0",
"drupal/coder": "^8.3.10",
diff --git a/composer.lock b/composer.lock
index 8113a28f3152cc392f3686e8893de3f886c699a9..f1c2f18c5f531755c966aef1cbc5e87727c56985 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "ca251fd21fb1d36ad581fc5795cc2b7e",
+ "content-hash": "215b5c8dbf6567798ebf1a188a444709",
"packages": [
{
"name": "asm89/stack-cors",
@@ -4185,6 +4185,135 @@
}
],
"packages-dev": [
+ {
+ "name": "behat/mink",
+ "version": "v1.10.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/minkphp/Mink.git",
+ "reference": "19e58905632e7cfdc5b2bafb9b950a3521af32c5"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/minkphp/Mink/zipball/19e58905632e7cfdc5b2bafb9b950a3521af32c5",
+ "reference": "19e58905632e7cfdc5b2bafb9b950a3521af32c5",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.2",
+ "symfony/css-selector": "^4.4 || ^5.0 || ^6.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^8.5.22 || ^9.5.11",
+ "symfony/error-handler": "^4.4 || ^5.0 || ^6.0",
+ "symfony/phpunit-bridge": "^5.4 || ^6.0"
+ },
+ "suggest": {
+ "behat/mink-browserkit-driver": "fast headless driver for any app without JS emulation",
+ "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
+ "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)",
+ "dmore/chrome-mink-driver": "fast and JS-enabled driver for any app (requires chromium or google chrome)"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Behat\\Mink\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Konstantin Kudryashov",
+ "email": "ever.zet@gmail.com",
+ "homepage": "http://everzet.com"
+ }
+ ],
+ "description": "Browser controller/emulator abstraction for PHP",
+ "homepage": "https://mink.behat.org/",
+ "keywords": [
+ "browser",
+ "testing",
+ "web"
+ ],
+ "support": {
+ "issues": "https://github.com/minkphp/Mink/issues",
+ "source": "https://github.com/minkphp/Mink/tree/v1.10.0"
+ },
+ "time": "2022-03-28T14:22:43+00:00"
+ },
+ {
+ "name": "behat/mink-browserkit-driver",
+ "version": "v2.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/minkphp/MinkBrowserKitDriver.git",
+ "reference": "d2768e6c17b293d86d8fcff54cbb9e6ad938fee1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/d2768e6c17b293d86d8fcff54cbb9e6ad938fee1",
+ "reference": "d2768e6c17b293d86d8fcff54cbb9e6ad938fee1",
+ "shasum": ""
+ },
+ "require": {
+ "behat/mink": "^1.9.0@dev",
+ "php": ">=7.2",
+ "symfony/browser-kit": "^4.4 || ^5.0 || ^6.0",
+ "symfony/dom-crawler": "^4.4 || ^5.0 || ^6.0"
+ },
+ "require-dev": {
+ "mink/driver-testsuite": "dev-master",
+ "phpunit/phpunit": "^8.5 || ^9.5",
+ "symfony/error-handler": "^4.4 || ^5.0 || ^6.0",
+ "symfony/http-client": "^4.4 || ^5.0 || ^6.0",
+ "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0",
+ "symfony/mime": "^4.4 || ^5.0 || ^6.0",
+ "yoast/phpunit-polyfills": "^1.0"
+ },
+ "type": "mink-driver",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Behat\\Mink\\Driver\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Konstantin Kudryashov",
+ "email": "ever.zet@gmail.com",
+ "homepage": "http://everzet.com"
+ }
+ ],
+ "description": "Symfony2 BrowserKit driver for Mink framework",
+ "homepage": "https://mink.behat.org/",
+ "keywords": [
+ "Mink",
+ "Symfony2",
+ "browser",
+ "testing"
+ ],
+ "support": {
+ "issues": "https://github.com/minkphp/MinkBrowserKitDriver/issues",
+ "source": "https://github.com/minkphp/MinkBrowserKitDriver/tree/v2.1.0"
+ },
+ "time": "2022-03-28T14:33:51+00:00"
+ },
{
"name": "behat/mink-selenium2-driver",
"version": "v1.5.0",
@@ -4904,133 +5033,6 @@
},
"time": "2020-12-02T08:47:31+00:00"
},
- {
- "name": "friends-of-behat/mink",
- "version": "v1.10.0",
- "source": {
- "type": "git",
- "url": "https://github.com/FriendsOfBehat/Mink.git",
- "reference": "301371a4e229cb7d4e0e401d6afb90cff4214ef5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/FriendsOfBehat/Mink/zipball/301371a4e229cb7d4e0e401d6afb90cff4214ef5",
- "reference": "301371a4e229cb7d4e0e401d6afb90cff4214ef5",
- "shasum": ""
- },
- "require": {
- "php": "^7.4|^8.0",
- "symfony/css-selector": "^4.4|^5.0|^6.0"
- },
- "replace": {
- "behat/mink": "self.version"
- },
- "require-dev": {
- "symfony/phpunit-bridge": "^5.2|^6.0"
- },
- "suggest": {
- "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
- "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
- "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
- "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)",
- "dmore/chrome-mink-driver": "fast and JS-enabled driver for any app (requires chromium or google chrome)"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.8.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Behat\\Mink\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Konstantin Kudryashov",
- "email": "ever.zet@gmail.com",
- "homepage": "http://everzet.com"
- }
- ],
- "description": "Browser controller/emulator abstraction for PHP",
- "homepage": "http://mink.behat.org/",
- "keywords": [
- "browser",
- "testing",
- "web"
- ],
- "support": {
- "source": "https://github.com/FriendsOfBehat/Mink/tree/v1.10.0"
- },
- "time": "2021-12-13T11:05:18+00:00"
- },
- {
- "name": "friends-of-behat/mink-browserkit-driver",
- "version": "v1.6.1",
- "source": {
- "type": "git",
- "url": "https://github.com/FriendsOfBehat/MinkBrowserKitDriver.git",
- "reference": "b3c29f18fe20487846e4c2733b066ec5e47f4f76"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/FriendsOfBehat/MinkBrowserKitDriver/zipball/b3c29f18fe20487846e4c2733b066ec5e47f4f76",
- "reference": "b3c29f18fe20487846e4c2733b066ec5e47f4f76",
- "shasum": ""
- },
- "require": {
- "behat/mink": "^1.7",
- "php": "^7.4|^8.0",
- "symfony/browser-kit": "^4.4|^5.0|^6.0",
- "symfony/dom-crawler": "^4.4|^5.0|^6.0"
- },
- "replace": {
- "behat/mink-browserkit-driver": "self.version"
- },
- "require-dev": {
- "friends-of-behat/mink-driver-testsuite": "dev-master",
- "symfony/http-kernel": "^4.4|^5.0|^6.0"
- },
- "type": "mink-driver",
- "extra": {
- "branch-alias": {
- "dev-master": "1.3.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Behat\\Mink\\Driver\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Konstantin Kudryashov",
- "email": "ever.zet@gmail.com",
- "homepage": "http://everzet.com"
- }
- ],
- "description": "Symfony2 BrowserKit driver for Mink framework",
- "homepage": "http://mink.behat.org/",
- "keywords": [
- "Mink",
- "Symfony2",
- "browser",
- "testing"
- ],
- "support": {
- "source": "https://github.com/FriendsOfBehat/MinkBrowserKitDriver/tree/v1.6.1"
- },
- "time": "2021-12-13T10:41:57+00:00"
- },
{
"name": "instaclick/php-webdriver",
"version": "1.4.10",
diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json
index 8a59d4f8b4a4b7eaf8c40ba7157116d75ba268e0..4867578a396d987da4a16f4467f2dd8010f66129 100644
--- a/composer/Metapackage/DevDependencies/composer.json
+++ b/composer/Metapackage/DevDependencies/composer.json
@@ -7,12 +7,12 @@
"webflo/drupal-core-require-dev": "*"
},
"require": {
+ "behat/mink": "^1.10",
+ "behat/mink-browserkit-driver": "^2.1",
"behat/mink-selenium2-driver": "^1.4",
"composer/composer": "^2.3.0",
"drupal/coder": "^8.3.10",
"easyrdf/easyrdf": "^1.0",
- "friends-of-behat/mink": "^1.10",
- "friends-of-behat/mink-browserkit-driver": "^1.4",
"instaclick/php-webdriver": "^1.4.1",
"justinrainbow/json-schema": "^5.2",
"mglaman/phpstan-drupal": "^1.1.9",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index aca4d33de72063cb6a6c5c4c5019103b340121b0..85d9abe5c6aa5ec61352811dac8cd03df170efe0 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -8,6 +8,8 @@
},
"require": {
"drupal/core": "10.0.x-dev",
+ "behat/mink": "v1.10.0",
+ "behat/mink-browserkit-driver": "v2.1.0",
"behat/mink-selenium2-driver": "v1.5.0",
"composer/ca-bundle": "1.3.1",
"composer/composer": "2.3.0",
@@ -18,8 +20,6 @@
"doctrine/instantiator": "1.4.0",
"drupal/coder": "8.3.13",
"easyrdf/easyrdf": "1.1.1",
- "friends-of-behat/mink": "v1.10.0",
- "friends-of-behat/mink-browserkit-driver": "v1.6.1",
"instaclick/php-webdriver": "1.4.10",
"justinrainbow/json-schema": "5.2.11",
"mglaman/phpstan-drupal": "1.1.9",
diff --git a/composer/Plugin/VendorHardening/Config.php b/composer/Plugin/VendorHardening/Config.php
index c1c80e9e8d17ab53863c06c64a9d58d2d37ac147..50877c9ee736e07dac4def8fcdd6c2083ffb3840 100644
--- a/composer/Plugin/VendorHardening/Config.php
+++ b/composer/Plugin/VendorHardening/Config.php
@@ -20,6 +20,8 @@ class Config {
* @var array
*/
protected static $defaultConfig = [
+ 'behat/mink' => ['tests'],
+ 'behat/mink-browserkit-driver' => ['tests'],
'behat/mink-selenium2-driver' => ['tests'],
'composer/composer' => ['bin'],
'drupal/coder' => [
@@ -29,8 +31,6 @@ class Config {
'doctrine/instantiator' => ['tests'],
'easyrdf/easyrdf' => ['scripts'],
'egulias/email-validator' => ['documentation', 'tests'],
- 'friends-of-behat/mink' => ['tests'],
- 'friends-of-behat/mink-browserkit-driver' => ['tests'],
'guzzlehttp/promises' => ['tests'],
'guzzlehttp/psr7' => ['tests'],
'instaclick/php-webdriver' => ['doc', 'test'],
diff --git a/core/lib/Drupal/Core/Composer/Composer.php b/core/lib/Drupal/Core/Composer/Composer.php
index 6830bb8fa28905586c4e5f49364c8dbf9c8400c2..cdae3a90f789f8c469b082b7cf48efb304a483db 100644
--- a/core/lib/Drupal/Core/Composer/Composer.php
+++ b/core/lib/Drupal/Core/Composer/Composer.php
@@ -17,14 +17,14 @@
class Composer {
protected static $packageToCleanup = [
+ 'behat/mink' => ['tests'],
+ 'behat/mink-browserkit-driver' => ['tests'],
'behat/mink-selenium2-driver' => ['tests'],
'composer/composer' => ['bin'],
'drupal/coder' => ['coder_sniffer/Drupal/Test', 'coder_sniffer/DrupalPractice/Test'],
'doctrine/instantiator' => ['tests'],
'easyrdf/easyrdf' => ['scripts'],
'egulias/email-validator' => ['documentation', 'tests'],
- 'friends-of-behat/mink' => ['tests'],
- 'friends-of-behat/mink-browserkit-driver' => ['tests'],
'guzzlehttp/promises' => ['tests'],
'guzzlehttp/psr7' => ['tests'],
'instaclick/php-webdriver' => ['doc', 'test'],