diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #13427 fixed wrong merge (fabpot)

Browse Source 
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
This commit is contained in:
Fabien Potencier 2015-01-16 08:21:08 +01:00
commit ceefea86cc
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/Resources/config/old_assets.xml
View File

@ -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>

1
src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md
View File

@ -34,3 +34,4 @@ route_2
- `compiler_class`: Symfony\Component\Routing\RouteCompiler
- `opt1`: val1
- `opt2`: val2

30
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -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",