L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-70879_39' of https://github.com/stronk7/moodle into MOODLE_39_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2021-02-22 07:51:56 +08:00
parent 713b28c2a5 ecdd8bf487
commit f1f578cd7a
2 changed files with 54 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+1 -1
View File
@@ -7,7 +7,7 @@
"require-dev": {
"phpunit/phpunit": "7.5.*",
"phpunit/dbunit": "4.0.*",
"moodlehq/behat-extension": "3.39.5",
"moodlehq/behat-extension": "3.39.6",
"mikey179/vfsstream": "^1.6"
},
"minimum-stability": "dev",
composer.lock
Generated
+53 -88
View File
@@ -4,41 +4,41 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "1d67d30f3756cc27dbffa0f7dda6ac26",
"content-hash": "070e218dbbf80cd59e62634fabf955c9",
"packages": [],
"packages-dev": [
{
"name": "behat/behat",
"version": "v3.6.1",
"version": "v3.8.1",
"source": {
"type": "git",
"url": "https://github.com/Behat/Behat.git",
"reference": "9bfe195b4745c32e068af03fa4df9558b4916d30"
"reference": "fbb065457d523d9856d4b50775b4151a7598b510"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Behat/Behat/zipball/9bfe195b4745c32e068af03fa4df9558b4916d30",
"reference": "9bfe195b4745c32e068af03fa4df9558b4916d30",
"url": "https://api.github.com/repos/Behat/Behat/zipball/fbb065457d523d9856d4b50775b4151a7598b510",
"reference": "fbb065457d523d9856d4b50775b4151a7598b510",
"shasum": ""
},
"require": {
"behat/gherkin": "^4.6.0",
"behat/transliterator": "^1.2",
"container-interop/container-interop": "^1.2",
"ext-mbstring": "*",
"php": ">=5.3.3",
"php": "^7.2 || ^8.0",
"psr/container": "^1.0",
"symfony/config": "^2.7.51 || ^3.0 || ^4.0 || ^5.0",
"symfony/console": "^2.7.51 || ^2.8.33 || ^3.3.15 || ^3.4.3 || ^4.0.3 || ^5.0",
"symfony/dependency-injection": "^2.7.51 || ^3.0 || ^4.0 || ^5.0",
"symfony/event-dispatcher": "^2.7.51 || ^3.0 || ^4.0 || ^5.0",
"symfony/translation": "^2.7.51 || ^3.0 || ^4.0 || ^5.0",
"symfony/yaml": "^2.7.51 || ^3.0 || ^4.0 || ^5.0"
"symfony/config": "^4.4 || ^5.0",
"symfony/console": "^4.4 || ^5.0",
"symfony/dependency-injection": "^4.4 || ^5.0",
"symfony/event-dispatcher": "^4.4 || ^5.0",
"symfony/translation": "^4.4 || ^5.0",
"symfony/yaml": "^4.4 || ^5.0"
},
"require-dev": {
"container-interop/container-interop": "^1.2",
"herrera-io/box": "~1.6.1",
"phpunit/phpunit": "^4.8.36 || ^6.3",
"symfony/process": "~2.5 || ^3.0 || ^4.0 || ^5.0"
"phpunit/phpunit": "^8.5 || ^9.0",
"symfony/process": "^4.4 || ^5.0"
},
"suggest": {
"ext-dom": "Needed to output test results in JUnit format."
@@ -49,7 +49,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.6.x-dev"
"dev-master": "3.8.x-dev"
}
},
"autoload": {
@@ -69,7 +69,7 @@
"homepage": "http://everzet.com"
}
],
"description": "Scenario-oriented BDD framework for PHP 5.3",
"description": "Scenario-oriented BDD framework for PHP",
"homepage": "http://behat.org/",
"keywords": [
"Agile",
@@ -87,31 +87,32 @@
],
"support": {
"issues": "https://github.com/Behat/Behat/issues",
"source": "https://github.com/Behat/Behat/tree/v3.6.1"
"source": "https://github.com/Behat/Behat/tree/v3.8.1"
},
"time": "2020-02-06T09:54:48+00:00"
"time": "2020-11-07T15:55:18+00:00"
},
{
"name": "behat/gherkin",
"version": "v4.7.1",
"version": "v4.8.0",
"source": {
"type": "git",
"url": "https://github.com/Behat/Gherkin.git",
"reference": "987bcdc3d29ba433e6bd4b1db4ae59737ba3dacd"
"reference": "2391482cd003dfdc36b679b27e9f5326bd656acd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Behat/Gherkin/zipball/987bcdc3d29ba433e6bd4b1db4ae59737ba3dacd",
"reference": "987bcdc3d29ba433e6bd4b1db4ae59737ba3dacd",
"url": "https://api.github.com/repos/Behat/Gherkin/zipball/2391482cd003dfdc36b679b27e9f5326bd656acd",
"reference": "2391482cd003dfdc36b679b27e9f5326bd656acd",
"shasum": ""
},
"require": {
"php": ">=5.6"
"php": "~7.2|~8.0"
},
"require-dev": {
"phpunit/phpunit": "~5.7|~6|~7",
"symfony/phpunit-bridge": "~2.7|~3|~4",
"symfony/yaml": "~2.3|~3|~4"
"cucumber/cucumber": "dev-gherkin-16.0.0",
"phpunit/phpunit": "~8|~9",
"symfony/phpunit-bridge": "~3|~4|~5",
"symfony/yaml": "~3|~4|~5"
},
"suggest": {
"symfony/yaml": "If you want to parse features, represented in YAML files"
@@ -150,9 +151,9 @@
],
"support": {
"issues": "https://github.com/Behat/Gherkin/issues",
"source": "https://github.com/Behat/Gherkin/tree/v4.7.1"
"source": "https://github.com/Behat/Gherkin/tree/v4.8.0"
},
"time": "2021-01-26T16:24:32+00:00"
"time": "2021-02-04T12:44:21+00:00"
},
{
"name": "behat/mink",
@@ -451,42 +452,6 @@
},
"time": "2020-01-14T16:39:13+00:00"
},
{
"name": "container-interop/container-interop",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/container-interop/container-interop.git",
"reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
"reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
"shasum": ""
},
"require": {
"psr/container": "^1.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Interop\\Container\\": "src/Interop/Container/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
"homepage": "https://github.com/container-interop/container-interop",
"support": {
"issues": "https://github.com/container-interop/container-interop/issues",
"source": "https://github.com/container-interop/container-interop/tree/master"
},
"abandoned": "psr/container",
"time": "2017-02-14T19:40:03+00:00"
},
{
"name": "doctrine/instantiator",
"version": "1.4.0",
@@ -869,20 +834,20 @@
},
{
"name": "moodlehq/behat-extension",
"version": "v3.39.5",
"version": "v3.39.6",
"source": {
"type": "git",
"url": "https://github.com/moodlehq/moodle-behat-extension.git",
"reference": "d235b5254013b2f536938316f1156e4de8fc0bc2"
"reference": "f1a76db33decdc1b367c58b250a1ab214b08388f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/moodlehq/moodle-behat-extension/zipball/d235b5254013b2f536938316f1156e4de8fc0bc2",
"reference": "d235b5254013b2f536938316f1156e4de8fc0bc2",
"url": "https://api.github.com/repos/moodlehq/moodle-behat-extension/zipball/f1a76db33decdc1b367c58b250a1ab214b08388f",
"reference": "f1a76db33decdc1b367c58b250a1ab214b08388f",
"shasum": ""
},
"require": {
"behat/behat": "3.6.*",
"behat/behat": "3.8.*",
"behat/mink": "~1.8",
"behat/mink-extension": "~2.3",
"behat/mink-goutte-driver": "~1.2",
@@ -921,9 +886,9 @@
"moodle"
],
"support": {
"source": "https://github.com/moodlehq/moodle-behat-extension/tree/v3.39.5"
"source": "https://github.com/moodlehq/moodle-behat-extension/tree/v3.39.6"
},
"time": "2021-01-18T00:55:39+00:00"
"time": "2021-02-15T09:07:03+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -2902,16 +2867,16 @@
},
{
"name": "symfony/console",
"version": "v5.2.2",
"version": "v5.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "d62ec79478b55036f65e2602e282822b8eaaff0a"
"reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/d62ec79478b55036f65e2602e282822b8eaaff0a",
"reference": "d62ec79478b55036f65e2602e282822b8eaaff0a",
"url": "https://api.github.com/repos/symfony/console/zipball/89d4b176d12a2946a1ae4e34906a025b7b6b135a",
"reference": "89d4b176d12a2946a1ae4e34906a025b7b6b135a",
"shasum": ""
},
"require": {
@@ -2979,7 +2944,7 @@
"terminal"
],
"support": {
"source": "https://github.com/symfony/console/tree/v5.2.2"
"source": "https://github.com/symfony/console/tree/v5.2.3"
},
"funding": [
{
@@ -2995,11 +2960,11 @@
"type": "tidelift"
}
],
"time": "2021-01-27T10:15:41+00:00"
"time": "2021-01-28T22:06:19+00:00"
},
{
"name": "symfony/css-selector",
"version": "v5.2.2",
"version": "v5.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -3044,7 +3009,7 @@
"description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/css-selector/tree/v5.2.2"
"source": "https://github.com/symfony/css-selector/tree/v5.2.3"
},
"funding": [
{
@@ -3289,7 +3254,7 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v5.2.2",
"version": "v5.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -3354,7 +3319,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/event-dispatcher/tree/v5.2.2"
"source": "https://github.com/symfony/event-dispatcher/tree/v5.2.3"
},
"funding": [
{
@@ -3453,7 +3418,7 @@
},
{
"name": "symfony/filesystem",
"version": "v5.2.2",
"version": "v5.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
@@ -3495,7 +3460,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v5.2.2"
"source": "https://github.com/symfony/filesystem/tree/v5.2.3"
},
"funding": [
{
@@ -4164,7 +4129,7 @@
},
{
"name": "symfony/process",
"version": "v5.2.2",
"version": "v5.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -4206,7 +4171,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v5.2.2"
"source": "https://github.com/symfony/process/tree/v5.2.3"
},
"funding": [
{
@@ -4305,7 +4270,7 @@
},
{
"name": "symfony/string",
"version": "v5.2.2",
"version": "v5.2.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
@@ -4368,7 +4333,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v5.2.2"
"source": "https://github.com/symfony/string/tree/v5.2.3"
},
"funding": [
{