Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

Conflicts:
	composer.lock
  • Loading branch information...
commit da8dc584447c28d794572ad1b5845536c9e60623 2 parents 338127f + 2735277
@Seldaek Seldaek authored
Showing with 18 additions and 18 deletions.
  1. +3 −3 composer.json
  2. +15 −15 composer.lock
View
6 composer.json
@@ -25,9 +25,9 @@
"php": ">=5.3.2",
"justinrainbow/json-schema": "1.1.*",
"seld/jsonlint": "1.*",
- "symfony/console": "2.1.*@dev",
- "symfony/finder": "2.1.*",
- "symfony/process": "2.1.*@dev"
+ "symfony/console": "~2.1@dev",
+ "symfony/finder": "~2.1",
+ "symfony/process": "~2.1@dev"
},
"suggest": {
"ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
View
30 composer.lock
@@ -1,5 +1,5 @@
{
- "hash": "9dc77643445a86e0dd3f1a4a268fffc5",
+ "hash": "62a43b569534e1cd55ce455d9f7f1c03",
"packages": [
{
"name": "justinrainbow/json-schema",
@@ -58,33 +58,33 @@
},
{
"name": "symfony/console",
- "version": "2.1.x-dev",
+ "version": "dev-master",
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console",
- "reference": "b52c747c551d8d71c02e17853c8f637d8d5e9cef"
+ "reference": "d214b141627b947ba16c7c8f8599e6823902d124"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Console/zipball/b52c747c551d8d71c02e17853c8f637d8d5e9cef",
- "reference": "b52c747c551d8d71c02e17853c8f637d8d5e9cef",
+ "url": "https://github.com/symfony/Console/zipball/d214b141627b947ba16c7c8f8599e6823902d124",
+ "reference": "d214b141627b947ba16c7c8f8599e6823902d124",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "1350717030",
+ "time": "1350379165",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "2.2-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
- "Symfony\\Component\\Console": ""
+ "Symfony\\Component\\Console\\": ""
}
},
"license": [
@@ -152,33 +152,33 @@
},
{
"name": "symfony/process",
- "version": "2.1.x-dev",
+ "version": "dev-master",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process",
- "reference": "6d483356f7496f1305a67f6a50cc33ec900c3930"
+ "reference": "f029d06585ad7646cc2e9ee9daf1f395014e1c7f"
},
"dist": {
"type": "zip",
- "url": "https://github.com/symfony/Process/zipball/6d483356f7496f1305a67f6a50cc33ec900c3930",
- "reference": "6d483356f7496f1305a67f6a50cc33ec900c3930",
+ "url": "https://github.com/symfony/Process/zipball/f029d06585ad7646cc2e9ee9daf1f395014e1c7f",
+ "reference": "f029d06585ad7646cc2e9ee9daf1f395014e1c7f",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
- "time": "1350717030",
+ "time": "1349553479",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "2.2-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-0": {
- "Symfony\\Component\\Process": ""
+ "Symfony\\Component\\Process\\": ""
}
},
"license": [
Please sign in to comment.
Something went wrong with that request. Please try again.