Skip to content

Commit

Permalink
merged branch dbu/make-baseurl-configurable (PR #5983)
Browse files Browse the repository at this point in the history
This PR was merged into the master branch.

Commits
-------

d0e5ef1 [FrameworkBundle] move change note to changelog of FrameworkBundle instead of master UPGRADE-2.2
e77ecc9 [FrameworkBundle] switch to parameter for base url to make it configurable for tests and cli as done for host and scheme in d30943c

Discussion
----------

[FrameworkBundle] switch to parameter for base url

This will make it configurable the same way we have it for host and scheme done for 2.1 in d30943c

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: (no new test breakage)
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: (none yet. if this is merged, i will happily PR against doc if somebody can point me to the right place)

---------------------------------------------------------------------------

by dbu at 2012-11-11T18:44:33Z

doc will go here once its merged: http://symfony.com/doc/current/cookbook/console/generating_urls.html

---------------------------------------------------------------------------

by dbu at 2012-11-11T20:12:41Z

ok, moved to the FrameworkBundle changelog

---------------------------------------------------------------------------

by Tobion at 2012-11-11T20:34:28Z

unfortunately is naming is so wrong in many places of the Request class and the routing.
`base_url` is just an example. It's not an "URL" at all. It's a path only.

---------------------------------------------------------------------------

by dbu at 2012-11-12T07:47:55Z

@Tobion i saw that, but i chose to be consistent with the method name of RequestContext even if it is a wrong name.
  • Loading branch information
fabpot committed Nov 12, 2012
2 parents 99ee736 + d0e5ef1 commit 0876a19
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
Expand Up @@ -7,6 +7,9 @@ CHANGELOG
* replaced Symfony\Bundle\FrameworkBundle\Controller\TraceableControllerResolver by Symfony\Component\HttpKernel\Controller\TraceableControllerResolver
* replaced Symfony\Component\HttpKernel\Debug\ContainerAwareTraceableEventDispatcher by Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher
* added Client::enableProfiler()
* A new parameter has been added to the DIC: `router.request_context.base_url`
You can customize it for your functional tests or for generating urls with
the right base url when your are in the cli context.

2.1.0
-----
Expand Down
Expand Up @@ -24,6 +24,7 @@
<parameter key="router_listener.class">Symfony\Component\HttpKernel\EventListener\RouterListener</parameter>
<parameter key="router.request_context.host">localhost</parameter>
<parameter key="router.request_context.scheme">http</parameter>
<parameter key="router.request_context.base_url"></parameter>
</parameters>

<services>
Expand Down Expand Up @@ -74,7 +75,7 @@
<service id="router" alias="router.default" />

<service id="router.request_context" class="%router.request_context.class%" public="false">
<argument></argument>
<argument>%router.request_context.base_url%</argument>
<argument>GET</argument>
<argument>%router.request_context.host%</argument>
<argument>%router.request_context.scheme%</argument>
Expand Down

0 comments on commit 0876a19

Please sign in to comment.