deblan-mirror/magallanes
1
0
Fork 0
mirror of https://github.com/andres-montanez/Magallanes synced 2024-06-16 20:45:02 +02:00
Code Issues Projects Releases Wiki Activity

Merge a9cbbf3f4f into 0ddf969efe

Browse source
This commit is contained in:
Markus Malkusch 2017-01-02 05:12:06 +00:00 committed by GitHub
parent 0ddf969efe a9cbbf3f4f
commit 887ad38e43
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -11,7 +11,7 @@
"require-dev": { "require-dev": {
"phpunit/phpunit": "4.3.5", "phpunit/phpunit": "4.3.5",
"satooshi/php-coveralls": ">=0.6.1", "satooshi/php-coveralls": ">=0.6.1",
"malkusch/php-mock": "dev-php-5.3" "php-mock/php-mock": "^0.1"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

20
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "caa09089c7b57461ed42e97a4449f2c6", "hash": "38a662749dc90d3cd6bb06c095ec14f1",
"packages": [], "packages": [],
"packages-dev": [ "packages-dev": [
{ {
@ -154,17 +154,17 @@
"time": "2014-08-11 04:32:36" "time": "2014-08-11 04:32:36"
}, },
{ {
"name": "malkusch/php-mock", "name": "php-mock/php-mock",
"version": "dev-php-5.3", "version": "0.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/malkusch/php-mock.git", "url": "https://github.com/php-mock/php-mock.git",
"reference": "37b301b4b479601232f3919920451c6e777c3264" "reference": "b48b05bfd43d8b051103a4515ab5613cb90e71da"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/malkusch/php-mock/zipball/37b301b4b479601232f3919920451c6e777c3264", "url": "https://api.github.com/repos/php-mock/php-mock/zipball/b48b05bfd43d8b051103a4515ab5613cb90e71da",
"reference": "37b301b4b479601232f3919920451c6e777c3264", "reference": "b48b05bfd43d8b051103a4515ab5613cb90e71da",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -199,7 +199,7 @@
"stub", "stub",
"test" "test"
], ],
"time": "2014-12-01 18:01:18" "time": "2015-04-14 18:12:12"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
@ -1256,9 +1256,7 @@
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": [],
"malkusch/php-mock": 20
},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {