--- 3264903-12.patch 2022-03-30 07:11:38.000000000 -0300 +++ 3264903-13.patch 2022-03-30 11:26:21.425966722 -0300 @@ -1,39 +1,41 @@ diff --git a/composer.json b/composer.json -index 1963cc6040..9e56ea40b2 100644 +index b8b6674f6d..6ab5b13cb1 100644 --- a/composer.json +++ b/composer.json -@@ -15,7 +15,6 @@ +@@ -15,8 +15,6 @@ "drupal/core-vendor-hardening": "self.version" }, "require-dev": { - "friends-of-behat/mink": "^1.10", - "friends-of-behat/mink-browserkit-driver": "^1.4", +- "friends-of-behat/mink-browserkit-driver": "^1.4", "behat/mink-selenium2-driver": "^1.4", - "composer/composer": "^2.2.4", -@@ -37,7 +36,8 @@ + "composer/composer": "^2.3.0", + "drupal/coder": "^8.3.10", +@@ -37,7 +35,9 @@ "symfony/lock": "^6.0", "symfony/browser-kit": "^6.0", "symfony/dom-crawler": "^6.0", - "easyrdf/easyrdf": "^1.0" + "easyrdf/easyrdf": "^1.0", -+ "behat/mink": "^1.10" ++ "behat/mink": "^1.10", ++ "behat/mink-browserkit-driver": "^2.1" }, "replace": { "symfony/polyfill-php72": "*", diff --git a/composer.lock b/composer.lock -index f8afecd22c..6932796ade 100644 +index 8113a28f31..48d3085c24 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": "372c247b5fd3863e5f2b21cfca703dae", -+ "content-hash": "1250c8a48a24937abc8a9b8f3f38581a", +- "content-hash": "ca251fd21fb1d36ad581fc5795cc2b7e", ++ "content-hash": "04e65666391a462ca23fb6bcd692cf8c", "packages": [ { "name": "asm89/stack-cors", -@@ -4189,6 +4189,70 @@ +@@ -4185,6 +4185,135 @@ } ], "packages-dev": [ @@ -101,10 +103,75 @@ + }, + "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", -@@ -4902,71 +4966,6 @@ +@@ -4904,133 +5033,6 @@ }, "time": "2020-12-02T08:47:31+00:00" }, @@ -173,48 +240,114 @@ - }, - "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": "friends-of-behat/mink-browserkit-driver", - "version": "v1.6.1", + "name": "instaclick/php-webdriver", + "version": "1.4.10", diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json -index cb823be4a1..873d02b854 100644 +index 8a59d4f8b4..4867578a39 100644 --- a/composer/Metapackage/DevDependencies/composer.json +++ b/composer/Metapackage/DevDependencies/composer.json -@@ -7,11 +7,11 @@ +@@ -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.2.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", +- "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 f01872320a..33f821520f 100644 +index aca4d33de7..85d9abe5c6 100644 --- a/composer/Metapackage/PinnedDevDependencies/composer.json +++ b/composer/Metapackage/PinnedDevDependencies/composer.json -@@ -8,6 +8,7 @@ +@@ -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.2.6", -@@ -18,7 +19,6 @@ + "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", +- "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 c1c80e9e8d..acf59b374c 100644 +index c1c80e9e8d..005db78274 100644 --- a/composer/Plugin/VendorHardening/Config.php +++ b/composer/Plugin/VendorHardening/Config.php @@ -20,6 +20,7 @@ class Config { @@ -225,23 +358,25 @@ 'behat/mink-selenium2-driver' => ['tests'], 'composer/composer' => ['bin'], 'drupal/coder' => [ -@@ -29,7 +30,6 @@ class Config { +@@ -29,8 +30,7 @@ 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'], +- 'friends-of-behat/mink-browserkit-driver' => ['tests'], ++ '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 6830bb8fa2..868345fb4a 100644 +index 6830bb8fa2..08d94a2cbf 100644 --- a/core/lib/Drupal/Core/Composer/Composer.php +++ b/core/lib/Drupal/Core/Composer/Composer.php -@@ -17,13 +17,13 @@ +@@ -17,14 +17,14 @@ class Composer { protected static $packageToCleanup = [ -+ 'behat/mink' => ['tests', 'driver-testsuite'], ++ 'behat/mink' => ['tests'], 'behat/mink-selenium2-driver' => ['tests'], 'composer/composer' => ['bin'], 'drupal/coder' => ['coder_sniffer/Drupal/Test', 'coder_sniffer/DrupalPractice/Test'], @@ -249,6 +384,8 @@ 'easyrdf/easyrdf' => ['scripts'], 'egulias/email-validator' => ['documentation', 'tests'], - 'friends-of-behat/mink' => ['tests'], - 'friends-of-behat/mink-browserkit-driver' => ['tests'], +- 'friends-of-behat/mink-browserkit-driver' => ['tests'], ++ 'behat/mink-browserkit-driver' => ['tests'], 'guzzlehttp/promises' => ['tests'], 'guzzlehttp/psr7' => ['tests'], + 'instaclick/php-webdriver' => ['doc', 'test'],