fixed wrong merge
This commit is contained in:
parent
88d88de80f
commit
238bbab123
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
<services>
|
<services>
|
||||||
<service id="templating.asset.path_package" class="%templating.asset.path_package.class%" abstract="true">
|
<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 -->
|
||||||
<argument /> <!-- version format -->
|
<argument /> <!-- version format -->
|
||||||
</service>
|
</service>
|
||||||
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
<service id="templating.asset.request_aware_package" class="Symfony\Component\Templating\Asset\PackageInterface" abstract="true">
|
<service id="templating.asset.request_aware_package" class="Symfony\Component\Templating\Asset\PackageInterface" abstract="true">
|
||||||
<factory service="templating.asset.package_factory" method="getPackage" />
|
<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 /> <!-- HTTP id -->
|
||||||
<argument /> <!-- SSL id -->
|
<argument /> <!-- SSL id -->
|
||||||
</service>
|
</service>
|
||||||
|
@ -34,3 +34,4 @@ route_2
|
|||||||
- `compiler_class`: Symfony\Component\Routing\RouteCompiler
|
- `compiler_class`: Symfony\Component\Routing\RouteCompiler
|
||||||
- `opt1`: val1
|
- `opt1`: val1
|
||||||
- `opt2`: val2
|
- `opt2`: val2
|
||||||
|
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.5.9",
|
"php": ">=5.5.9",
|
||||||
"symfony/dependency-injection" : "~2.6,>=2.6.2",
|
"symfony/dependency-injection" : "~2.7|~3.0",
|
||||||
"symfony/config" : "~2.4",
|
"symfony/config" : "~2.7|~3.0",
|
||||||
"symfony/event-dispatcher": "~2.7|~3.0",
|
"symfony/event-dispatcher": "~2.7|~3.0",
|
||||||
"symfony/http-foundation": "~2.7|~3.0",
|
"symfony/http-foundation": "~2.7|~3.0",
|
||||||
"symfony/http-kernel": "~2.7|~3.0",
|
"symfony/http-kernel": "~2.7|~3.0",
|
||||||
@ -32,19 +32,19 @@
|
|||||||
"doctrine/annotations": "~1.0"
|
"doctrine/annotations": "~1.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/browser-kit": "~2.4|~3.0.0",
|
"symfony/browser-kit": "~2.7|~3.0",
|
||||||
"symfony/console": "~2.6|~3.0.0",
|
"symfony/console": "~2.7|~3.0",
|
||||||
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
|
"symfony/css-selector": "~2.7|~3.0",
|
||||||
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
|
"symfony/dom-crawler": "~2.7|~3.0",
|
||||||
"symfony/finder": "~2.0,>=2.0.5|~3.0.0",
|
"symfony/finder": "~2.7|~3.0",
|
||||||
"symfony/intl": "~2.3|~3.0.0",
|
"symfony/intl": "~2.7|~3.0",
|
||||||
"symfony/security": "~2.6|~3.0.0",
|
"symfony/security": "~2.7|~3.0",
|
||||||
"symfony/form": "~2.6|~3.0.0",
|
"symfony/form": "~2.7|~3.0",
|
||||||
"symfony/class-loader": "~2.1|~3.0.0",
|
"symfony/class-loader": "~2.7|~3.0",
|
||||||
"symfony/expression-language": "~2.6|~3.0.0",
|
"symfony/expression-language": "~2.7|~3.0",
|
||||||
"symfony/process": "~2.0,>=2.0.5|~3.0.0",
|
"symfony/process": "~2.7|~3.0",
|
||||||
"symfony/validator": "~2.5|~3.0.0",
|
"symfony/validator": "~2.7|~3.0",
|
||||||
"symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
|
"symfony/yaml": "~2.7|~3.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"symfony/console": "For using the console commands",
|
"symfony/console": "For using the console commands",
|
||||||
|
Reference in New Issue
Block a user