8000 minor #13427 fixed wrong merge (fabpot) · symfony/symfony@ceefea8 · GitHub
[go: up one dir, main page]
Skip to content

Commit ceefea8

Browse files
fabpotfabpot
committed
minor #13427 fixed wrong merge (fabpot)
This PR was merged into the 3.0-dev branch. Discussion ---------- fixed wrong merge | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | no | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 238bbab fixed wrong merge
2 parents 88d88de + 238bbab commit ceefea8

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<services>
1414
<service id="templating.asset.path_package" class="%templating.asset.path_package.class%" abstract="true">
15-
<argument type="service" id="request" />
15+
<argument type="expression">service('request_stack').getMasterRequest()</argument>
1616
<argument /> <!-- version -->
1717
<argument /> <!-- version format -->
1818
</service>
@@ -25,7 +25,7 @@
2525

2626
<service id="templating.asset.request_aware_package" class="Symfony\Component\Templating\Asset\PackageInterface" abstract="true">
2727
<factory service="templating.asset.package_factory" method="getPackage" />
28-
<argument type="service" id="request" strict="false" />
28+
<argument type="expression">service('request_stack').getMasterRequest()</argument>
2929
<argument /> <!-- HTTP id -->
3030
<argument /> <!-- SSL id -->
3131
</service>

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/D 8000 escriptor/route_collection_1.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ route_2
3434
- `compiler_class`: Symfony\Component\Routing\RouteCompiler
3535
- `opt1`: val1
3636
- `opt2`: val2
37+

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
],
1818
"require": {
1919
"php": ">=5.5.9",
20-
"symfony/dependency-injection" : "~2.6,>=2.6.2",
21-
"symfony/config" : "~2.4",
20+
"symfony/dependency-injection" : "~2.7|~3.0",
21+
"symfony/config" : "~2.7|~3.0",
2222
"symfony/event-dispatcher": "~2.7|~3.0",
2323
"symfony/http-foundation": "~2.7|~3.0",
2424
"symfony/http-kernel": "~2.7|~3.0",
@@ -32,19 +32,19 @@
3232
"doctrine/annotations": "~1.0"
3333
},
3434
"require-dev": {
35-
"symfony/browser-kit": "~2.4|~3.0.0",
36-
"symfony/console": "~2.6|~3.0.0",
37-
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
38-
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
39-
"symfony/finder": "~2.0,>=2.0.5|~3.0.0",
40-
"symfony/intl": "~2.3|~3.0.0",
41-
"symfony/security": "~2.6|~3.0.0",
42-
"symfony/form": "~2.6|~3.0.0",
43-
"symfony/class-loader": "~2.1|~3.0.0",
44-
"symfony/expression-language": "~2.6|~3.0.0",
45-
"symfony/process": "~2.0,>=2.0.5|~3.0.0",
46-
"symfony/validator": "~2.5|~3.0.0",
47-
"symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
35+
"symfony/browser-kit": "~2.7|~3.0",
36+
"symfony/console": "~2.7|~3.0",
37+
"symfony/css-selector": "~2.7|~3.0",
38+
"symfony/dom-crawler": "~2.7|~3.0",
39+
"symfony/finder": "~2.7|~3.0",
40+
"symfony/intl": "~2.7|~3.0",
41+
"symfony/security": "~2.7|~3.0",
42+
"symfony/form": "~2.7|~3.0",
43+
"symfony/class-loader": "~2.7|~3.0",
44+
"symfony/expression-language": "~2.7|~3.0",
45+
"symfony/process": "~2.7|~3.0",
46+
"symfony/validator": "~2.7|~3.0",
47+
"symfony/yaml": "~2.7|~3.0"
4848
},
4949
"suggest": {
5050
"symfony/console": "For using the console commands",

0 commit comments

Comments
 (0)
0