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

Merge remote-tracking branch 'simensen/update-symfony-deps' 

Conflicts:
	composer.lock
pull/1241/merge
Jordi Boggiano 2012-10-21 16:14:35 +02:00
parent 338127ff9c 27352776eb
commit da8dc58444
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
composer.json
View File

@ -25,9 +25,9 @@
"php": ">=5.3.2", "php": ">=5.3.2",
"justinrainbow/json-schema": "1.1.*", "justinrainbow/json-schema": "1.1.*",
"seld/jsonlint": "1.*", "seld/jsonlint": "1.*",
"symfony/console": "2.1.*@dev", "symfony/console": "~2.1@dev",
"symfony/finder": "2.1.*", "symfony/finder": "~2.1",
"symfony/process": "2.1.*@dev" "symfony/process": "~2.1@dev"
}, },
"suggest": { "suggest": {
"ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic", "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",

30
composer.lock generated
View File

@ -1,5 +1,5 @@
{ {
"hash": "9dc77643445a86e0dd3f1a4a268fffc5", "hash": "62a43b569534e1cd55ce455d9f7f1c03",
"packages": [ "packages": [
{ {
"name": "justinrainbow/json-schema", "name": "justinrainbow/json-schema",
@ -58,33 +58,33 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "2.1.x-dev", "version": "dev-master",
"target-dir": "Symfony/Component/Console", "target-dir": "Symfony/Component/Console",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Console", "url": "https://github.com/symfony/Console",
"reference": "b52c747c551d8d71c02e17853c8f637d8d5e9cef" "reference": "d214b141627b947ba16c7c8f8599e6823902d124"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/symfony/Console/zipball/b52c747c551d8d71c02e17853c8f637d8d5e9cef", "url": "https://github.com/symfony/Console/zipball/d214b141627b947ba16c7c8f8599e6823902d124",
"reference": "b52c747c551d8d71c02e17853c8f637d8d5e9cef", "reference": "d214b141627b947ba16c7c8f8599e6823902d124",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"time": "1350717030", "time": "1350379165",
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.1-dev" "dev-master": "2.2-dev"
} }
}, },
"installation-source": "source", "installation-source": "source",
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"Symfony\\Component\\Console": "" "Symfony\\Component\\Console\\": ""
} }
}, },
"license": [ "license": [
@ -152,33 +152,33 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "2.1.x-dev", "version": "dev-master",
"target-dir": "Symfony/Component/Process", "target-dir": "Symfony/Component/Process",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Process", "url": "https://github.com/symfony/Process",
"reference": "6d483356f7496f1305a67f6a50cc33ec900c3930" "reference": "f029d06585ad7646cc2e9ee9daf1f395014e1c7f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://github.com/symfony/Process/zipball/6d483356f7496f1305a67f6a50cc33ec900c3930", "url": "https://github.com/symfony/Process/zipball/f029d06585ad7646cc2e9ee9daf1f395014e1c7f",
"reference": "6d483356f7496f1305a67f6a50cc33ec900c3930", "reference": "f029d06585ad7646cc2e9ee9daf1f395014e1c7f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"time": "1350717030", "time": "1349553479",
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.1-dev" "dev-master": "2.2-dev"
} }
}, },
"installation-source": "source", "installation-source": "source",
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"Symfony\\Component\\Process": "" "Symfony\\Component\\Process\\": ""
} }
}, },
"license": [ "license": [