From dc8b92e0b2a4773dc64ae14a141a81cd1fbfa8f9 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Tue, 4 Jun 2019 00:29:31 +0200 Subject: [PATCH] MDL-65817 behat: switch to forked repo towards php73 compatibility It seems that https://github.com/instaclick/php-webdriver/pull/91 is being ignored (in fact the repository itself doesn't show much activity). So we have decided to fork it and apply any fix able to keep our (non-marionette) runs working. Hopefully, soon, the new W3C drivers will be supported by our behat->mink stack... and we'll be able to move to it (from current JSonwire drivers). So all this will be hostory. --- composer.json | 9 ++++- composer.lock | 101 +++++++++++++++++++++++++++++--------------------- 2 files changed, 67 insertions(+), 43 deletions(-) diff --git a/composer.json b/composer.json index 6dc963d3ddc..5dba48b03f0 100644 --- a/composer.json +++ b/composer.json @@ -4,10 +4,17 @@ "description": "Moodle - the world's open source learning platform", "type": "project", "homepage": "https://moodle.org", + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/moodlehq/php-webdriver.git" + } + ], "require-dev": { "phpunit/phpunit": "7.5.*", "phpunit/dbunit": "4.0.*", "moodlehq/behat-extension": "3.37.0", - "mikey179/vfsstream": "^1.6" + "mikey179/vfsstream": "^1.6", + "instaclick/php-webdriver": "dev-local as 1.x-dev" } } diff --git a/composer.lock b/composer.lock index 948ff212bcd..4da555e5225 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": "3517a4473544055cd8523bb076cad8f6", + "content-hash": "6a672c1cc2c9d005b5eab7c22af1ac49", "packages": [], "packages-dev": [ { @@ -808,16 +808,16 @@ }, { "name": "instaclick/php-webdriver", - "version": "1.4.5", + "version": "dev-local", "source": { "type": "git", - "url": "https://github.com/instaclick/php-webdriver.git", - "reference": "6fa959452e774dcaed543faad3a9d1a37d803327" + "url": "https://github.com/moodlehq/php-webdriver.git", + "reference": "e311e55bf2c4746db9df72707f3cf1a731ad98aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/6fa959452e774dcaed543faad3a9d1a37d803327", - "reference": "6fa959452e774dcaed543faad3a9d1a37d803327", + "url": "https://api.github.com/repos/moodlehq/php-webdriver/zipball/e311e55bf2c4746db9df72707f3cf1a731ad98aa", + "reference": "e311e55bf2c4746db9df72707f3cf1a731ad98aa", "shasum": "" }, "require": { @@ -839,7 +839,6 @@ "WebDriver": "lib/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "Apache-2.0" ], @@ -863,7 +862,10 @@ "webdriver", "webtest" ], - "time": "2017-06-30T04:02:48+00:00" + "support": { + "source": "https://github.com/moodlehq/php-webdriver/tree/local" + }, + "time": "2019-06-03T22:55:37+00:00" }, { "name": "mikey179/vfsStream", @@ -1633,16 +1635,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.5.9", + "version": "7.5.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160" + "reference": "9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/134669cf0eeac3f79bc7f0c793efbc158bffc160", - "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c", + "reference": "9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c", "shasum": "" }, "require": { @@ -1713,7 +1715,7 @@ "testing", "xunit" ], - "time": "2019-04-19T15:50:46+00:00" + "time": "2019-05-28T11:59:40+00:00" }, { "name": "psr/container", @@ -2469,16 +2471,16 @@ }, { "name": "symfony/browser-kit", - "version": "v4.2.8", + "version": "v4.3.0", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "c09c18cca96d7067152f78956faf55346c338283" + "reference": "3fa7d8cbd2e5006038a09b8ef93f3859a89b627e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c09c18cca96d7067152f78956faf55346c338283", - "reference": "c09c18cca96d7067152f78956faf55346c338283", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/3fa7d8cbd2e5006038a09b8ef93f3859a89b627e", + "reference": "3fa7d8cbd2e5006038a09b8ef93f3859a89b627e", "shasum": "" }, "require": { @@ -2487,6 +2489,8 @@ }, "require-dev": { "symfony/css-selector": "~3.4|~4.0", + "symfony/http-client": "^4.3", + "symfony/mime": "^4.3", "symfony/process": "~3.4|~4.0" }, "suggest": { @@ -2495,7 +2499,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -2522,11 +2526,11 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2019-04-07T09:56:43+00:00" + "time": "2019-04-15T20:15:25+00:00" }, { "name": "symfony/class-loader", - "version": "v3.4.27", + "version": "v3.4.28", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", @@ -2582,7 +2586,7 @@ }, { "name": "symfony/config", - "version": "v3.4.27", + "version": "v3.4.28", "source": { "type": "git", "url": "https://github.com/symfony/config.git", @@ -2714,7 +2718,7 @@ }, { "name": "symfony/css-selector", - "version": "v3.4.27", + "version": "v3.4.28", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -2767,16 +2771,16 @@ }, { "name": "symfony/debug", - "version": "v3.4.27", + "version": "v3.4.28", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "681afbb26488903c5ac15e63734f1d8ac430c9b9" + "reference": "671fc55bd14800668b1d0a3708c3714940e30a8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/681afbb26488903c5ac15e63734f1d8ac430c9b9", - "reference": "681afbb26488903c5ac15e63734f1d8ac430c9b9", + "url": "https://api.github.com/repos/symfony/debug/zipball/671fc55bd14800668b1d0a3708c3714940e30a8c", + "reference": "671fc55bd14800668b1d0a3708c3714940e30a8c", "shasum": "" }, "require": { @@ -2819,7 +2823,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-04-11T09:48:14+00:00" + "time": "2019-05-18T13:32:47+00:00" }, { "name": "symfony/dependency-injection", @@ -2893,16 +2897,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.2.8", + "version": "v4.3.0", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb" + "reference": "28edb1d371640654fbfb9df53d70fa03fdf69fb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/53c97769814c80a84a8403efcf3ae7ae966d53bb", - "reference": "53c97769814c80a84a8403efcf3ae7ae966d53bb", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/28edb1d371640654fbfb9df53d70fa03fdf69fb6", + "reference": "28edb1d371640654fbfb9df53d70fa03fdf69fb6", "shasum": "" }, "require": { @@ -2910,7 +2914,11 @@ "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "masterminds/html5": "<2.6" + }, "require-dev": { + "masterminds/html5": "^2.6", "symfony/css-selector": "~3.4|~4.0" }, "suggest": { @@ -2919,7 +2927,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -2946,11 +2954,11 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2019-02-23T15:17:42+00:00" + "time": "2019-04-26T05:53:56+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.27", + "version": "v3.4.28", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -3013,16 +3021,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.2.8", + "version": "v4.3.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601" + "reference": "988ab7d70c267c34efa85772ca20de3fad11c74b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/e16b9e471703b2c60b95f14d31c1239f68f11601", - "reference": "e16b9e471703b2c60b95f14d31c1239f68f11601", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/988ab7d70c267c34efa85772ca20de3fad11c74b", + "reference": "988ab7d70c267c34efa85772ca20de3fad11c74b", "shasum": "" }, "require": { @@ -3032,7 +3040,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -3059,7 +3067,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-02-07T11:40:08+00:00" + "time": "2019-05-24T12:50:04+00:00" }, { "name": "symfony/polyfill-ctype", @@ -3439,9 +3447,18 @@ "time": "2018-12-25T11:19:39+00:00" } ], - "aliases": [], + "aliases": [ + { + "alias": "1.x-dev", + "alias_normalized": "1.9999999.9999999.9999999-dev", + "version": "dev-local", + "package": "instaclick/php-webdriver" + } + ], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "instaclick/php-webdriver": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": [],