1
0
Fork 0

Merge branch '1.2'

pull/5653/head
Jordi Boggiano 2016-09-05 10:58:20 +02:00
commit 909dbf5731
1 changed files with 43 additions and 42 deletions

85
composer.lock generated
View File

@ -9,16 +9,16 @@
"packages": [ "packages": [
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
"version": "1.0.3", "version": "1.0.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/ca-bundle.git", "url": "https://github.com/composer/ca-bundle.git",
"reference": "5df9ed0ed0c9506ea6404a23450854e5df15cc12" "reference": "ec21a59414b99501e723b63fd664aa8ead9c5680"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/5df9ed0ed0c9506ea6404a23450854e5df15cc12", "url": "https://api.github.com/repos/composer/ca-bundle/zipball/ec21a59414b99501e723b63fd664aa8ead9c5680",
"reference": "5df9ed0ed0c9506ea6404a23450854e5df15cc12", "reference": "ec21a59414b99501e723b63fd664aa8ead9c5680",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -27,6 +27,7 @@
"php": "^5.3.2 || ^7.0" "php": "^5.3.2 || ^7.0"
}, },
"require-dev": { "require-dev": {
"psr/log": "^1.0",
"symfony/process": "^2.5 || ^3.0" "symfony/process": "^2.5 || ^3.0"
}, },
"suggest": { "suggest": {
@ -62,7 +63,7 @@
"ssl", "ssl",
"tls" "tls"
], ],
"time": "2016-07-18 23:07:53" "time": "2016-09-04 19:00:06"
}, },
{ {
"name": "composer/semver", "name": "composer/semver",
@ -431,16 +432,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v2.8.8", "version": "v2.8.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "c392a6ec72f2122748032c2ad6870420561ffcfa" "reference": "bac1eb5869c1848a173852aee61df960e3a49197"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/c392a6ec72f2122748032c2ad6870420561ffcfa", "url": "https://api.github.com/repos/symfony/console/zipball/bac1eb5869c1848a173852aee61df960e3a49197",
"reference": "c392a6ec72f2122748032c2ad6870420561ffcfa", "reference": "bac1eb5869c1848a173852aee61df960e3a49197",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -487,20 +488,20 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-06-29 07:02:14" "time": "2016-08-19 06:48:01"
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v2.8.8", "version": "v2.8.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/filesystem.git", "url": "https://github.com/symfony/filesystem.git",
"reference": "7258ddd6f987053f21fa43d03430580ba54e6096" "reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/7258ddd6f987053f21fa43d03430580ba54e6096", "url": "https://api.github.com/repos/symfony/filesystem/zipball/ab4c3f085c8f5a56536845bf985c4cef30bf75fd",
"reference": "7258ddd6f987053f21fa43d03430580ba54e6096", "reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -536,20 +537,20 @@
], ],
"description": "Symfony Filesystem Component", "description": "Symfony Filesystem Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-06-29 05:31:50" "time": "2016-07-20 05:41:28"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v2.8.8", "version": "v2.8.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "bf0506ef4e7778fd3f0f1f141ab5e8c1ef35dd7d" "reference": "bec5533e6ed650547d6ec8de4b541dc9929066f7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/bf0506ef4e7778fd3f0f1f141ab5e8c1ef35dd7d", "url": "https://api.github.com/repos/symfony/finder/zipball/bec5533e6ed650547d6ec8de4b541dc9929066f7",
"reference": "bf0506ef4e7778fd3f0f1f141ab5e8c1ef35dd7d", "reference": "bec5533e6ed650547d6ec8de4b541dc9929066f7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -585,7 +586,7 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-06-29 05:29:29" "time": "2016-08-26 11:57:43"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
@ -648,16 +649,16 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v2.8.8", "version": "v2.8.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "89f33c16796415ccfd8bb3cf8d520cbb79899bfe" "reference": "162d37eb3396225f31574b69a453118e5bc313d2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/89f33c16796415ccfd8bb3cf8d520cbb79899bfe", "url": "https://api.github.com/repos/symfony/process/zipball/162d37eb3396225f31574b69a453118e5bc313d2",
"reference": "89f33c16796415ccfd8bb3cf8d520cbb79899bfe", "reference": "162d37eb3396225f31574b69a453118e5bc313d2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -693,7 +694,7 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-06-29 05:29:29" "time": "2016-08-16 14:56:08"
} }
], ],
"packages-dev": [ "packages-dev": [
@ -1107,16 +1108,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "4.8.26", "version": "4.8.27",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "fc1d8cd5b5de11625979125c5639347896ac2c74" "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90",
"reference": "fc1d8cd5b5de11625979125c5639347896ac2c74", "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1175,7 +1176,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2016-05-17 03:09:28" "time": "2016-07-21 06:48:14"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
@ -1351,23 +1352,23 @@
}, },
{ {
"name": "sebastian/environment", "name": "sebastian/environment",
"version": "1.3.7", "version": "1.3.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/environment.git", "url": "https://github.com/sebastianbergmann/environment.git",
"reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716" "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716", "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
"reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716", "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": "^5.3.3 || ^7.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.4" "phpunit/phpunit": "^4.8 || ^5.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
@ -1397,7 +1398,7 @@
"environment", "environment",
"hhvm" "hhvm"
], ],
"time": "2016-05-17 03:18:57" "time": "2016-08-18 05:49:44"
}, },
{ {
"name": "sebastian/exporter", "name": "sebastian/exporter",
@ -1607,16 +1608,16 @@
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v2.8.8", "version": "v2.8.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8" "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/dba4bb5846798cd12f32e2d8f3f35d77045773c8", "url": "https://api.github.com/repos/symfony/yaml/zipball/e7540734bad981fe59f8ef14b6fc194ae9df8d9c",
"reference": "dba4bb5846798cd12f32e2d8f3f35d77045773c8", "reference": "e7540734bad981fe59f8ef14b6fc194ae9df8d9c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1652,7 +1653,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2016-06-29 05:29:29" "time": "2016-09-02 01:57:56"
} }
], ],
"aliases": [], "aliases": [],