public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge branch '1.6'

pull/7280/head
Jordi Boggiano 2018-04-13 15:44:15 +02:00
parent 38866ba310 0704cd5142
commit 03fb68009c
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -41,6 +41,9 @@
"phpunit/phpunit": "^4.8.35 || ^5.7", "phpunit/phpunit": "^4.8.35 || ^5.7",
"phpunit/phpunit-mock-objects": "^2.3 || ^3.0" "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
}, },
"conflict": {
"symfony/console": "2.8.38"
},
"config": { "config": {
"platform": { "platform": {
"php": "5.3.9" "php": "5.3.9"

14
composer.lock generated
View File

@ -1,10 +1,10 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"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#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "0d1f37a66bf7821e9aa424785ea8ab52", "content-hash": "c6378672910186460447c90de26a6c03",
"packages": [ "packages": [
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
@ -485,16 +485,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v2.8.38", "version": "v2.8.37",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "7f78892d900c72a40acd1fe793c856ef0c110f26" "reference": "390fa4899dbcc47bd41935d87c4572ea4305d3ce"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/7f78892d900c72a40acd1fe793c856ef0c110f26", "url": "https://api.github.com/repos/symfony/console/zipball/390fa4899dbcc47bd41935d87c4572ea4305d3ce",
"reference": "7f78892d900c72a40acd1fe793c856ef0c110f26", "reference": "390fa4899dbcc47bd41935d87c4572ea4305d3ce",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -542,7 +542,7 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-03T05:20:27+00:00" "time": "2018-03-19T21:13:58+00:00"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",