From 238bbab123fb78df16ebcd6b9c3209b1fe8e37cd Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 16 Jan 2015 07:43:08 +0100
Subject: [PATCH] fixed wrong merge

---
 .../Resources/config/old_assets.xml           |  4 +--
 .../Fixtures/Descriptor/route_collection_1.md |  1 +
 .../Bundle/FrameworkBundle/composer.json      | 30 +++++++++----------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml
index 90d935906d..182560ccba 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml
@@ -12,7 +12,7 @@
 
     <services>
         <service id="templating.asset.path_package" class="%templating.asset.path_package.class%" abstract="true">
-            <argument type="service" id="request" />
+            <argument type="expression">service('request_stack').getMasterRequest()</argument>
             <argument /> <!-- version -->
             <argument /> <!-- version format -->
         </service>
@@ -25,7 +25,7 @@
 
         <service id="templating.asset.request_aware_package" class="Symfony\Component\Templating\Asset\PackageInterface" abstract="true">
             <factory service="templating.asset.package_factory" method="getPackage" />
-            <argument type="service" id="request" strict="false" />
+            <argument type="expression">service('request_stack').getMasterRequest()</argument>
             <argument /> <!-- HTTP id -->
             <argument /> <!-- SSL id -->
         </service>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md
index a1ae684674..c8e691bbd6 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md
@@ -34,3 +34,4 @@ route_2
     - `compiler_class`: Symfony\Component\Routing\RouteCompiler
     - `opt1`: val1
     - `opt2`: val2
+
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index 4dd76f374c..0c8bddcb0d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -17,8 +17,8 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "symfony/dependency-injection" : "~2.6,>=2.6.2",
-        "symfony/config" : "~2.4",
+        "symfony/dependency-injection" : "~2.7|~3.0",
+        "symfony/config" : "~2.7|~3.0",
         "symfony/event-dispatcher": "~2.7|~3.0",
         "symfony/http-foundation": "~2.7|~3.0",
         "symfony/http-kernel": "~2.7|~3.0",
@@ -32,19 +32,19 @@
         "doctrine/annotations": "~1.0"
     },
     "require-dev": {
-        "symfony/browser-kit": "~2.4|~3.0.0",
-        "symfony/console": "~2.6|~3.0.0",
-        "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
-        "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
-        "symfony/finder": "~2.0,>=2.0.5|~3.0.0",
-        "symfony/intl": "~2.3|~3.0.0",
-        "symfony/security": "~2.6|~3.0.0",
-        "symfony/form": "~2.6|~3.0.0",
-        "symfony/class-loader": "~2.1|~3.0.0",
-        "symfony/expression-language": "~2.6|~3.0.0",
-        "symfony/process": "~2.0,>=2.0.5|~3.0.0",
-        "symfony/validator": "~2.5|~3.0.0",
-        "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
+        "symfony/browser-kit": "~2.7|~3.0",
+        "symfony/console": "~2.7|~3.0",
+        "symfony/css-selector": "~2.7|~3.0",
+        "symfony/dom-crawler": "~2.7|~3.0",
+        "symfony/finder": "~2.7|~3.0",
+        "symfony/intl": "~2.7|~3.0",
+        "symfony/security": "~2.7|~3.0",
+        "symfony/form": "~2.7|~3.0",
+        "symfony/class-loader": "~2.7|~3.0",
+        "symfony/expression-language": "~2.7|~3.0",
+        "symfony/process": "~2.7|~3.0",
+        "symfony/validator": "~2.7|~3.0",
+        "symfony/yaml": "~2.7|~3.0"
     },
     "suggest": {
         "symfony/console": "For using the console commands",