Merge branch '1.6'

main
Jordi Boggiano 6 years ago
commit 03fb68009c

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

14
composer.lock generated

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

Loading…
Cancel
Save