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

Merge branch 'MDL-65810' of git://github.com/stronk7/moodle

Browse Source
This commit is contained in:
Jun Pataleta
2019-06-04 15:25:18 +08:00
parent a271b8ce20 d8ddd509e8
commit 6058e44ff8
2 changed files with 41 additions and 35 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.37.0",
"moodlehq/behat-extension": "3.38.0",
"mikey179/vfsstream": "^1.6"
}
}
composer.lock
Generated
+40 -34
View File
@@ -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": "c6d083d8c30f80b245ed03f8f064d4ec",
"packages": [],
"packages-dev": [
{
@@ -913,7 +913,7 @@
},
{
"name": "moodlehq/behat-extension",
"version": "v3.37.0",
"version": "v3.38.0",
"source": {
"type": "git",
"url": "https://github.com/moodlehq/moodle-behat-extension.git",
@@ -1633,16 +1633,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 +1713,7 @@
"testing",
"xunit"
],
"time": "2019-04-19T15:50:46+00:00"
"time": "2019-05-28T11:59:40+00:00"
},
{
"name": "psr/container",
@@ -2469,16 +2469,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 +2487,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 +2497,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.2-dev"
"dev-master": "4.3-dev"
}
},
"autoload": {
@@ -2522,11 +2524,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 +2584,7 @@
},
{
"name": "symfony/config",
"version": "v3.4.27",
"version": "v3.4.28",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
@@ -2714,7 +2716,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 +2769,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 +2821,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 +2895,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 +2912,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 +2925,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.2-dev"
"dev-master": "4.3-dev"
}
},
"autoload": {
@@ -2946,11 +2952,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 +3019,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 +3038,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.2-dev"
"dev-master": "4.3-dev"
}
},
"autoload": {
@@ -3059,7 +3065,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",