From 031c2a295e66d589a3dd6b6f2f6399cf7899c810 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Thu, 22 Apr 2021 16:46:23 +0100
Subject: [PATCH] Issue #3209459 by longwave, catch, andypost: Switch to
friends of behat MinkBrowserKitDriver for PHP 8 and Symfony 5 compatibility
---
composer.json | 2 +-
composer.lock | 125 +++++++++---------
.../Metapackage/DevDependencies/composer.json | 2 +-
.../PinnedDevDependencies/composer.json | 2 +-
composer/Plugin/VendorHardening/Config.php | 2 +-
core/lib/Drupal/Core/Composer/Composer.php | 2 +-
6 files changed, 68 insertions(+), 67 deletions(-)
diff --git a/composer.json b/composer.json
index 12508828a1f8..f7b48f4b6a64 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
},
"require-dev": {
"behat/mink": "^1.8",
- "behat/mink-browserkit-driver": "^1.3",
+ "friends-of-behat/mink-browserkit-driver": "^1.3",
"behat/mink-goutte-driver": "^1.2",
"behat/mink-selenium2-driver": "^1.4",
"composer/composer": "^2.0.2",
diff --git a/composer.lock b/composer.lock
index ce3e29c28f45..6fb81f0d7405 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": "54a8c91f9d19473abf71ea242e3138d9",
+ "content-hash": "5e658e150305bd8c42a49e766211d9c0",
"packages": [
{
"name": "asm89/stack-cors",
@@ -4559,67 +4559,6 @@
},
"time": "2020-03-11T15:45:53+00:00"
},
- {
- "name": "behat/mink-browserkit-driver",
- "version": "v1.3.4",
- "source": {
- "type": "git",
- "url": "https://github.com/minkphp/MinkBrowserKitDriver.git",
- "reference": "e3b90840022ebcd544c7b394a3c9597ae242cbee"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/minkphp/MinkBrowserKitDriver/zipball/e3b90840022ebcd544c7b394a3c9597ae242cbee",
- "reference": "e3b90840022ebcd544c7b394a3c9597ae242cbee",
- "shasum": ""
- },
- "require": {
- "behat/mink": "^1.7.1@dev",
- "php": ">=5.3.6",
- "symfony/browser-kit": "~2.3|~3.0|~4.0",
- "symfony/dom-crawler": "~2.3|~3.0|~4.0"
- },
- "require-dev": {
- "mink/driver-testsuite": "dev-master",
- "symfony/debug": "^2.7|^3.0|^4.0",
- "symfony/http-kernel": "~2.3|~3.0|~4.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": {
- "issues": "https://github.com/minkphp/MinkBrowserKitDriver/issues",
- "source": "https://github.com/minkphp/MinkBrowserKitDriver/tree/v1.3.4"
- },
- "time": "2020-03-11T09:49:45+00:00"
- },
{
"name": "behat/mink-goutte-driver",
"version": "v1.2.1",
@@ -5306,6 +5245,68 @@
},
"time": "2020-11-01T09:30:18+00:00"
},
+ {
+ "name": "friends-of-behat/mink-browserkit-driver",
+ "version": "v1.5.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/FriendsOfBehat/MinkBrowserKitDriver.git",
+ "reference": "8110b99ed1ac2b50ad287280bfc20e08f58b6cc6"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/FriendsOfBehat/MinkBrowserKitDriver/zipball/8110b99ed1ac2b50ad287280bfc20e08f58b6cc6",
+ "reference": "8110b99ed1ac2b50ad287280bfc20e08f58b6cc6",
+ "shasum": ""
+ },
+ "require": {
+ "behat/mink": "^1.7",
+ "php": "^7.2|^8.0",
+ "symfony/browser-kit": "^4.4|^5.0",
+ "symfony/dom-crawler": "^4.4|^5.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"
+ },
+ "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.5.0"
+ },
+ "time": "2021-02-04T14:39:46+00:00"
+ },
{
"name": "instaclick/php-webdriver",
"version": "1.4.7",
diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json
index 4a621182d52e..4c70c9576743 100644
--- a/composer/Metapackage/DevDependencies/composer.json
+++ b/composer/Metapackage/DevDependencies/composer.json
@@ -8,12 +8,12 @@
},
"require": {
"behat/mink": "^1.8",
- "behat/mink-browserkit-driver": "^1.3",
"behat/mink-goutte-driver": "^1.2",
"behat/mink-selenium2-driver": "^1.4",
"composer/composer": "^2.0.2",
"drupal/coder": "^8.3.7",
"easyrdf/easyrdf": "^0.9 || ^1.0",
+ "friends-of-behat/mink-browserkit-driver": "^1.3",
"justinrainbow/json-schema": "^5.2",
"mikey179/vfsstream": "^1.6.8",
"phpspec/prophecy": "^1.7",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index f9e15de7b698..35726dbc9003 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -9,7 +9,6 @@
"require": {
"drupal/core": "9.2.x-dev",
"behat/mink": "v1.8.1",
- "behat/mink-browserkit-driver": "v1.3.4",
"behat/mink-goutte-driver": "v1.2.1",
"behat/mink-selenium2-driver": "v1.4.0",
"composer/ca-bundle": "1.2.9",
@@ -20,6 +19,7 @@
"drupal/coder": "8.3.12",
"easyrdf/easyrdf": "1.1.1",
"fabpot/goutte": "v3.3.1",
+ "friends-of-behat/mink-browserkit-driver": "v1.5.0",
"instaclick/php-webdriver": "1.4.7",
"justinrainbow/json-schema": "5.2.10",
"mikey179/vfsstream": "v1.6.8",
diff --git a/composer/Plugin/VendorHardening/Config.php b/composer/Plugin/VendorHardening/Config.php
index 21dd1a1917ee..9cb9ed4dad80 100644
--- a/composer/Plugin/VendorHardening/Config.php
+++ b/composer/Plugin/VendorHardening/Config.php
@@ -21,7 +21,6 @@ class Config {
*/
protected static $defaultConfig = [
'behat/mink' => ['tests', 'driver-testsuite'],
- 'behat/mink-browserkit-driver' => ['tests'],
'behat/mink-goutte-driver' => ['tests'],
'behat/mink-selenium2-driver' => ['tests'],
'composer/composer' => ['bin'],
@@ -33,6 +32,7 @@ class Config {
'easyrdf/easyrdf' => ['scripts'],
'egulias/email-validator' => ['documentation', 'tests'],
'fabpot/goutte' => ['Goutte/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 2f60ab9d0fc7..4431ff30e3f5 100644
--- a/core/lib/Drupal/Core/Composer/Composer.php
+++ b/core/lib/Drupal/Core/Composer/Composer.php
@@ -17,7 +17,6 @@ class Composer {
protected static $packageToCleanup = [
'behat/mink' => ['tests', 'driver-testsuite'],
- 'behat/mink-browserkit-driver' => ['tests'],
'behat/mink-goutte-driver' => ['tests'],
'behat/mink-selenium2-driver' => ['tests'],
'composer/composer' => ['bin'],
@@ -26,6 +25,7 @@ class Composer {
'easyrdf/easyrdf' => ['scripts'],
'egulias/email-validator' => ['documentation', 'tests'],
'fabpot/goutte' => ['Goutte/Tests'],
+ 'friends-of-behat/mink-browserkit-driver' => ['tests'],
'guzzlehttp/promises' => ['tests'],
'guzzlehttp/psr7' => ['tests'],
'instaclick/php-webdriver' => ['doc', 'test'],
--
GitLab