moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-50732_composerFix' of https://github.com/moodlerooms/moodle

Browse source
This commit is contained in:
Dan Poltawski 2015-07-13 13:41:15 +01:00
commit a1333dd3a3
2 changed files with 21 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
composer.json
View file

@ -1,10 +1,4 @@
{ {
"repositories" : [
{
"type": "vcs",
"url": "https://github.com/moodlehq/moodle-behat-extension"
}
],
"require-dev": { "require-dev": {
"phpunit/phpunit": "3.7.*", "phpunit/phpunit": "3.7.*",
"phpunit/dbUnit": "1.2.*", "phpunit/dbUnit": "1.2.*",

50
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "a8ea9182a53569160119098b9cb80407", "hash": "3ddf5ab21f539f6f64c7e80174be48bb",
"packages": [], "packages": [],
"packages-dev": [ "packages-dev": [
{ {
@ -405,16 +405,16 @@
}, },
{ {
"name": "doctrine/annotations", "name": "doctrine/annotations",
"version": "v1.2.4", "version": "v1.2.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/annotations.git", "url": "https://github.com/doctrine/annotations.git",
"reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e" "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/b5202eb9e83f8db52e0e58867e0a46e63be8332e", "url": "https://api.github.com/repos/doctrine/annotations/zipball/f4a91702ca3cd2e568c3736aa031ed00c3752af4",
"reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e", "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -469,7 +469,7 @@
"docblock", "docblock",
"parser" "parser"
], ],
"time": "2014-12-23 22:40:37" "time": "2015-06-17 12:21:22"
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
@ -1037,6 +1037,7 @@
"Moodle\\BehatExtension": "src/" "Moodle\\BehatExtension": "src/"
} }
}, },
"notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"GPLv3" "GPLv3"
], ],
@ -1052,11 +1053,8 @@
"keywords": [ "keywords": [
"BDD", "BDD",
"Behat", "Behat",
"Moodle" "moodle"
], ],
"support": {
"source": "https://github.com/moodlehq/moodle-behat-extension/tree/v1.30.0"
},
"time": "2015-05-15 02:00:06" "time": "2015-05-15 02:00:06"
}, },
{ {
@ -1227,16 +1225,16 @@
}, },
{ {
"name": "phpunit/php-text-template", "name": "phpunit/php-text-template",
"version": "1.2.0", "version": "1.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-text-template.git", "url": "https://github.com/sebastianbergmann/php-text-template.git",
"reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a" "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
"reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1245,20 +1243,17 @@
"type": "library", "type": "library",
"autoload": { "autoload": {
"classmap": [ "classmap": [
"Text/" "src/"
] ]
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"include-path": [
""
],
"license": [ "license": [
"BSD-3-Clause" "BSD-3-Clause"
], ],
"authors": [ "authors": [
{ {
"name": "Sebastian Bergmann", "name": "Sebastian Bergmann",
"email": "sb@sebastian-bergmann.de", "email": "sebastian@phpunit.de",
"role": "lead" "role": "lead"
} }
], ],
@ -1267,20 +1262,20 @@
"keywords": [ "keywords": [
"template" "template"
], ],
"time": "2014-01-30 17:20:04" "time": "2015-06-21 13:50:34"
}, },
{ {
"name": "phpunit/php-timer", "name": "phpunit/php-timer",
"version": "1.0.5", "version": "1.0.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git", "url": "https://github.com/sebastianbergmann/php-timer.git",
"reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c" "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c", "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/83fe1bdc5d47658b727595c14da140da92b3d66d",
"reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c", "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1289,13 +1284,10 @@
"type": "library", "type": "library",
"autoload": { "autoload": {
"classmap": [ "classmap": [
"PHP/" "src/"
] ]
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"include-path": [
""
],
"license": [ "license": [
"BSD-3-Clause" "BSD-3-Clause"
], ],
@ -1311,7 +1303,7 @@
"keywords": [ "keywords": [
"timer" "timer"
], ],
"time": "2013-08-02 07:42:54" "time": "2015-06-13 07:35:30"
}, },
{ {
"name": "phpunit/php-token-stream", "name": "phpunit/php-token-stream",