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

Merge branch 'MDL-66945_35' of git://github.com/stronk7/moodle into MOODLE_35_STABLE

Browse Source
This commit is contained in:
Jake Dallimore
2019-10-29 14:57:04 +08:00
parent e22aba78ca a87d3a64bb
commit 9b898bf8b4
2 changed files with 111 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+1 -1
View File
@@ -13,7 +13,7 @@
"require-dev": {
"phpunit/phpunit": "6.5.*",
"phpunit/dbunit": "3.0.*",
"moodlehq/behat-extension": "3.35.3",
"moodlehq/behat-extension": "3.35.4",
"mikey179/vfsstream": "^1.6",
"instaclick/php-webdriver": "dev-local as 1.x-dev"
}
composer.lock
Generated
+110 -111
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": "727ed2d71a63f4567fde125863d19407",
"content-hash": "6aaa4a5a81f6318809d9d614c3262c03",
"packages": [],
"packages-dev": [
{
@@ -619,27 +619,28 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.3.3",
"version": "6.4.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
"reference": "0895c932405407fd3a7368b6910c09a24d26db11"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
"reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
"reference": "0895c932405407fd3a7368b6910c09a24d26db11",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.4",
"guzzlehttp/psr7": "^1.6.1",
"php": ">=5.5"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
"psr/log": "^1.0"
"psr/log": "^1.1"
},
"suggest": {
"psr/log": "Required for using the Log middleware"
@@ -651,12 +652,12 @@
}
},
"autoload": {
"files": [
"src/functions_include.php"
],
"psr-4": {
"GuzzleHttp\\": "src/"
}
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -680,7 +681,7 @@
"rest",
"web service"
],
"time": "2018-04-22T15:46:56+00:00"
"time": "2019-10-23T15:58:00+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -903,8 +904,8 @@
"authors": [
{
"name": "Frank Kleine",
"role": "Developer",
"homepage": "http://frankkleine.de/"
"homepage": "http://frankkleine.de/",
"role": "Developer"
}
],
"description": "Virtual file system to mock the real file system in unit tests.",
@@ -913,16 +914,16 @@
},
{
"name": "moodlehq/behat-extension",
"version": "v3.35.3",
"version": "v3.35.4",
"source": {
"type": "git",
"url": "https://github.com/moodlehq/moodle-behat-extension.git",
"reference": "e7239c27be9ec24cdc1c6c99e073922775d86769"
"reference": "5c54be1577b7e8a7c4a44f8859548fc44b595c1f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/moodlehq/moodle-behat-extension/zipball/e7239c27be9ec24cdc1c6c99e073922775d86769",
"reference": "e7239c27be9ec24cdc1c6c99e073922775d86769",
"url": "https://api.github.com/repos/moodlehq/moodle-behat-extension/zipball/5c54be1577b7e8a7c4a44f8859548fc44b595c1f",
"reference": "5c54be1577b7e8a7c4a44f8859548fc44b595c1f",
"shasum": ""
},
"require": {
@@ -947,9 +948,9 @@
"authors": [
{
"name": "David Monllaó",
"role": "Developer",
"email": "[email protected]",
"homepage": "http://moodle.com"
"homepage": "http://moodle.com",
"role": "Developer"
}
],
"description": "Moodle behat extension",
@@ -958,7 +959,7 @@
"Behat",
"moodle"
],
"time": "2019-08-26T21:52:50+00:00"
"time": "2019-10-28T11:42:45+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -1043,18 +1044,18 @@
"authors": [
{
"name": "Arne Blankerts",
"role": "Developer",
"email": "[email protected]"
"email": "[email protected]",
"role": "Developer"
},
{
"name": "Sebastian Heuer",
"role": "Developer",
"email": "[email protected]"
"email": "[email protected]",
"role": "Developer"
},
{
"name": "Sebastian Bergmann",
"role": "Developer",
"email": "[email protected]"
"email": "[email protected]",
"role": "Developer"
}
],
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
@@ -1090,18 +1091,18 @@
"authors": [
{
"name": "Arne Blankerts",
"role": "Developer",
"email": "[email protected]"
"email": "[email protected]",
"role": "Developer"
},
{
"name": "Sebastian Heuer",
"role": "Developer",
"email": "[email protected]"
"email": "[email protected]",
"role": "Developer"
},
{
"name": "Sebastian Bergmann",
"role": "Developer",
"email": "[email protected]"
"email": "[email protected]",
"role": "Developer"
}
],
"description": "Library for handling version information and constraints",
@@ -1163,26 +1164,26 @@
},
{
"name": "phpdocumentor/reflection-docblock",
"version": "4.3.1",
"version": "4.3.2",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
"reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
"reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
"reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
"shasum": ""
},
"require": {
"php": "^7.0",
"phpdocumentor/reflection-common": "^1.0.0",
"phpdocumentor/type-resolver": "^0.4.0",
"phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
"phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
"webmozart/assert": "^1.0"
},
"require-dev": {
"doctrine/instantiator": "~1.0.5",
"doctrine/instantiator": "^1.0.5",
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^6.4"
},
@@ -1210,29 +1211,29 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2019-04-30T17:48:53+00:00"
"time": "2019-09-12T14:27:41+00:00"
},
{
"name": "phpdocumentor/type-resolver",
"version": "0.4.0",
"version": "0.5.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
"reference": "cf842904952e64e703800d094cdf34e715a8a3ae"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
"reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/cf842904952e64e703800d094cdf34e715a8a3ae",
"reference": "cf842904952e64e703800d094cdf34e715a8a3ae",
"shasum": ""
},
"require": {
"php": "^5.5 || ^7.0",
"php": "^7.0",
"phpdocumentor/reflection-common": "^1.0"
},
"require-dev": {
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "^5.2||^4.8.24"
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^6.4"
},
"type": "library",
"extra": {
@@ -1242,9 +1243,7 @@
},
"autoload": {
"psr-4": {
"phpDocumentor\\Reflection\\": [
"src/"
]
"phpDocumentor\\Reflection\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1257,26 +1256,26 @@
"email": "[email protected]"
}
],
"time": "2017-07-14T14:27:02+00:00"
"time": "2017-12-30T13:23:38+00:00"
},
{
"name": "phpspec/prophecy",
"version": "1.8.1",
"version": "1.9.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76"
"reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
"reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203",
"reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
"sebastian/comparator": "^1.1|^2.0|^3.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
@@ -1320,7 +1319,7 @@
"spy",
"stub"
],
"time": "2019-06-13T12:50:23+00:00"
"time": "2019-10-03T11:07:50+00:00"
},
{
"name": "phpunit/dbunit",
@@ -1425,8 +1424,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"role": "lead",
"email": "[email protected]"
"email": "[email protected]",
"role": "lead"
}
],
"description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
@@ -1473,8 +1472,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"role": "lead",
"email": "[email protected]"
"email": "[email protected]",
"role": "lead"
}
],
"description": "FilterIterator implementation that filters files based on a list of suffixes.",
@@ -1515,8 +1514,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"role": "lead",
"email": "[email protected]"
"email": "[email protected]",
"role": "lead"
}
],
"description": "Simple template engine.",
@@ -1564,8 +1563,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"role": "lead",
"email": "[email protected]"
"email": "[email protected]",
"role": "lead"
}
],
"description": "Utility class for timing",
@@ -1695,8 +1694,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"role": "lead",
"email": "[email protected]"
"email": "[email protected]",
"role": "lead"
}
],
"description": "The PHP Unit Testing framework.",
@@ -1869,16 +1868,16 @@
},
{
"name": "psr/log",
"version": "1.1.0",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
"reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
"reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
"shasum": ""
},
"require": {
@@ -1887,7 +1886,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.1.x-dev"
}
},
"autoload": {
@@ -1912,7 +1911,7 @@
"psr",
"psr-3"
],
"time": "2018-11-20T15:27:04+00:00"
"time": "2019-10-25T08:06:51+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -2167,16 +2166,16 @@
},
{
"name": "sebastian/exporter",
"version": "3.1.1",
"version": "3.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
"reference": "06a9a5947f47b3029d76118eb5c22802e5869687"
"reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/06a9a5947f47b3029d76118eb5c22802e5869687",
"reference": "06a9a5947f47b3029d76118eb5c22802e5869687",
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
"reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
"shasum": ""
},
"require": {
@@ -2230,7 +2229,7 @@
"export",
"exporter"
],
"time": "2019-08-11T12:43:14+00:00"
"time": "2019-09-14T09:02:43+00:00"
},
{
"name": "sebastian/global-state",
@@ -2505,8 +2504,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"role": "lead",
"email": "[email protected]"
"email": "[email protected]",
"role": "lead"
}
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
@@ -2515,16 +2514,16 @@
},
{
"name": "symfony/browser-kit",
"version": "v3.4.31",
"version": "v3.4.32",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
"reference": "1a3406a6b9b61b492592a816ca056afcc9e976c0"
"reference": "abe4bf2c934ddd1fd490a7d9147df7827b5fff0f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/1a3406a6b9b61b492592a816ca056afcc9e976c0",
"reference": "1a3406a6b9b61b492592a816ca056afcc9e976c0",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/abe4bf2c934ddd1fd490a7d9147df7827b5fff0f",
"reference": "abe4bf2c934ddd1fd490a7d9147df7827b5fff0f",
"shasum": ""
},
"require": {
@@ -2568,11 +2567,11 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
"time": "2019-08-26T07:52:58+00:00"
"time": "2019-09-10T10:13:59+00:00"
},
{
"name": "symfony/class-loader",
"version": "v3.4.31",
"version": "v3.4.32",
"source": {
"type": "git",
"url": "https://github.com/symfony/class-loader.git",
@@ -2628,16 +2627,16 @@
},
{
"name": "symfony/config",
"version": "v3.4.31",
"version": "v3.4.32",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
"reference": "24a60c0d7ad98a0fa5d1f892e9286095a389404f"
"reference": "717ad66b5257e9752ae3c5722b5810bb4c40b236"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/24a60c0d7ad98a0fa5d1f892e9286095a389404f",
"reference": "24a60c0d7ad98a0fa5d1f892e9286095a389404f",
"url": "https://api.github.com/repos/symfony/config/zipball/717ad66b5257e9752ae3c5722b5810bb4c40b236",
"reference": "717ad66b5257e9752ae3c5722b5810bb4c40b236",
"shasum": ""
},
"require": {
@@ -2688,7 +2687,7 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
"time": "2019-08-26T07:52:57+00:00"
"time": "2019-09-19T15:32:51+00:00"
},
{
"name": "symfony/console",
@@ -2760,16 +2759,16 @@
},
{
"name": "symfony/css-selector",
"version": "v3.4.31",
"version": "v3.4.32",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "e18c5c4b35e7f17513448a25d02f7af34a4bdb41"
"reference": "f819f71ae3ba6f396b4c015bd5895de7d2f1f85f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/e18c5c4b35e7f17513448a25d02f7af34a4bdb41",
"reference": "e18c5c4b35e7f17513448a25d02f7af34a4bdb41",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/f819f71ae3ba6f396b4c015bd5895de7d2f1f85f",
"reference": "f819f71ae3ba6f396b4c015bd5895de7d2f1f85f",
"shasum": ""
},
"require": {
@@ -2809,20 +2808,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"time": "2019-08-20T13:31:17+00:00"
"time": "2019-10-01T11:57:37+00:00"
},
{
"name": "symfony/debug",
"version": "v3.4.31",
"version": "v3.4.32",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "0b600300918780001e2821db77bc28b677794486"
"reference": "b3e7ce815d82196435d16dc458023f8fb6b36ceb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/0b600300918780001e2821db77bc28b677794486",
"reference": "0b600300918780001e2821db77bc28b677794486",
"url": "https://api.github.com/repos/symfony/debug/zipball/b3e7ce815d82196435d16dc458023f8fb6b36ceb",
"reference": "b3e7ce815d82196435d16dc458023f8fb6b36ceb",
"shasum": ""
},
"require": {
@@ -2865,7 +2864,7 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2019-08-20T13:31:17+00:00"
"time": "2019-09-19T15:32:51+00:00"
},
{
"name": "symfony/dependency-injection",
@@ -2939,16 +2938,16 @@
},
{
"name": "symfony/dom-crawler",
"version": "v3.4.31",
"version": "v3.4.32",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "8558d1bc4554f5cb0b66e50377457967a8969263"
"reference": "29cffc38a38f2a8ed7e494c9cea2f890a40c2359"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/8558d1bc4554f5cb0b66e50377457967a8969263",
"reference": "8558d1bc4554f5cb0b66e50377457967a8969263",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/29cffc38a38f2a8ed7e494c9cea2f890a40c2359",
"reference": "29cffc38a38f2a8ed7e494c9cea2f890a40c2359",
"shasum": ""
},
"require": {
@@ -2992,11 +2991,11 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
"time": "2019-08-26T07:52:58+00:00"
"time": "2019-08-30T17:42:32+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v3.4.31",
"version": "v3.4.32",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -3059,7 +3058,7 @@
},
{
"name": "symfony/filesystem",
"version": "v3.4.31",
"version": "v3.4.32",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
@@ -3426,8 +3425,8 @@
"authors": [
{
"name": "Arne Blankerts",
"role": "Developer",
"email": "[email protected]"
"email": "[email protected]",
"role": "Developer"
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",