From 0f0622f625ca9fcf30a23de966fdb3829bfde4b4 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Thu, 26 Jul 2012 15:55:50 +0200
Subject: [PATCH] [feature/dic] Require symfony/* 2.1.*, tabs instead of
 spaces, --dev lock file

PHPBB3-10739
---
 phpBB/composer.json | 14 +++++------
 phpBB/composer.lock | 57 ++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/phpBB/composer.json b/phpBB/composer.json
index 366aea2ac3..2f4987afd8 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -1,12 +1,12 @@
 {
-    "minimum-stability": "beta",
-    "require": {
-        "symfony/config": "2.0.*",
-        "symfony/dependency-injection": "2.0.*",
+	"minimum-stability": "beta",
+	"require": {
+		"symfony/config": "2.1.*",
+		"symfony/dependency-injection": "2.1.*",
 		"symfony/event-dispatcher": "2.1.*",
-        "symfony/event-dispatcher": "2.0.*",
-        "symfony/yaml": "2.0.*"
-    },
+		"symfony/event-dispatcher": "2.1.*",
+		"symfony/yaml": "2.1.*"
+	},
 	"require-dev": {
 		"fabpot/goutte": "1.0.x-dev"
 	}
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index f3187749f5..1d8e6b5f8d 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -1,24 +1,69 @@
 {
-    "hash": "e4f5efe460878599e6fed6bb13584cfd",
+    "hash": "7024226b03c2abdfa95c76b11c1ec74d",
     "packages": [
         {
             "package": "symfony/config",
-            "version": "v2.0.16"
+            "version": "v2.1.0-BETA4"
         },
         {
             "package": "symfony/dependency-injection",
-            "version": "v2.0.16"
+            "version": "v2.1.0-BETA4"
         },
         {
             "package": "symfony/event-dispatcher",
-            "version": "v2.0.16"
+            "version": "v2.1.0-BETA4"
         },
         {
             "package": "symfony/yaml",
-            "version": "v2.0.16"
+            "version": "v2.1.0-BETA4"
+        }
+    ],
+    "packages-dev": [
+        {
+            "package": "fabpot/goutte",
+            "version": "dev-master",
+            "alias-pretty-version": "1.0.x-dev",
+            "alias-version": "1.0.9999999.9999999-dev"
+        },
+        {
+            "package": "fabpot/goutte",
+            "version": "dev-master",
+            "source-reference": "df14259688c7d6f1d366aa073a589695d2b9f451",
+            "commit-date": "1343194442"
+        },
+        {
+            "package": "guzzle/common",
+            "version": "v2.8.1"
+        },
+        {
+            "package": "guzzle/http",
+            "version": "v2.8.1"
+        },
+        {
+            "package": "guzzle/parser",
+            "version": "v2.8.1"
+        },
+        {
+            "package": "symfony/browser-kit",
+            "version": "v2.1.0-BETA4"
+        },
+        {
+            "package": "symfony/css-selector",
+            "version": "v2.1.0-BETA4"
+        },
+        {
+            "package": "symfony/dom-crawler",
+            "version": "v2.1.0-BETA4"
+        },
+        {
+            "package": "symfony/finder",
+            "version": "v2.1.0-BETA4"
+        },
+        {
+            "package": "symfony/process",
+            "version": "v2.1.0-BETA4"
         }
     ],
-    "packages-dev": null,
     "aliases": [
 
     ],