[FoundationBundle] removed the request.base_path parameter (the DIC can now be immutable)
This commit is contained in:
parent
d8efe7edb7
commit
95769bc315
@ -0,0 +1,37 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Symfony\Framework\FoundationBundle\Helper;
|
||||||
|
|
||||||
|
use Symfony\Components\HttpKernel\Request;
|
||||||
|
use Symfony\Components\Templating\Helper\AssetsHelper as BaseAssetsHelper;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AssetsHelper is the base class for all helper classes that manages assets.
|
||||||
|
*
|
||||||
|
* @package Symfony
|
||||||
|
* @subpackage Framework_FoundationBundle
|
||||||
|
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
|
||||||
|
*/
|
||||||
|
class AssetsHelper extends BaseAssetsHelper
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Constructor.
|
||||||
|
*
|
||||||
|
* @param Symfony\Components\HttpKernel\Request $request A Request instance
|
||||||
|
* @param string|array $baseURLs The domain URL or an array of domain URLs
|
||||||
|
* @param string $version The version
|
||||||
|
*/
|
||||||
|
public function __construct(Request $request, $baseURLs = array(), $version = null)
|
||||||
|
{
|
||||||
|
parent::__construct($request->getBasePath(), $baseURLs, $version);
|
||||||
|
}
|
||||||
|
}
|
@ -61,7 +61,6 @@ class RequestParser
|
|||||||
'host' => $request->getHost(),
|
'host' => $request->getHost(),
|
||||||
'is_secure' => $request->isSecure(),
|
'is_secure' => $request->isSecure(),
|
||||||
));
|
));
|
||||||
$this->container->setParameter('request.base_path', $request->getBasePath());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($request->path->has('_controller')) {
|
if ($request->path->has('_controller')) {
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<parameter key="templating.helper.javascripts.class">Symfony\Components\Templating\Helper\JavascriptsHelper</parameter>
|
<parameter key="templating.helper.javascripts.class">Symfony\Components\Templating\Helper\JavascriptsHelper</parameter>
|
||||||
<parameter key="templating.helper.stylesheets.class">Symfony\Components\Templating\Helper\StylesheetsHelper</parameter>
|
<parameter key="templating.helper.stylesheets.class">Symfony\Components\Templating\Helper\StylesheetsHelper</parameter>
|
||||||
<parameter key="templating.helper.slots.class">Symfony\Components\Templating\Helper\SlotsHelper</parameter>
|
<parameter key="templating.helper.slots.class">Symfony\Components\Templating\Helper\SlotsHelper</parameter>
|
||||||
<parameter key="templating.helper.assets.class">Symfony\Components\Templating\Helper\AssetsHelper</parameter>
|
<parameter key="templating.helper.assets.class">Symfony\Framework\FoundationBundle\Helper\AssetsHelper</parameter>
|
||||||
<parameter key="templating.helper.actions.class">Symfony\Framework\FoundationBundle\Helper\ActionsHelper</parameter>
|
<parameter key="templating.helper.actions.class">Symfony\Framework\FoundationBundle\Helper\ActionsHelper</parameter>
|
||||||
<parameter key="templating.helper.router.class">Symfony\Framework\FoundationBundle\Helper\RouterHelper</parameter>
|
<parameter key="templating.helper.router.class">Symfony\Framework\FoundationBundle\Helper\RouterHelper</parameter>
|
||||||
<parameter key="templating.helper.request.class">Symfony\Framework\FoundationBundle\Helper\RequestHelper</parameter>
|
<parameter key="templating.helper.request.class">Symfony\Framework\FoundationBundle\Helper\RequestHelper</parameter>
|
||||||
@ -61,7 +61,7 @@
|
|||||||
|
|
||||||
<service id="templating.helper.assets" class="%templating.helper.assets.class%">
|
<service id="templating.helper.assets" class="%templating.helper.assets.class%">
|
||||||
<annotation name="templating.helper" alias="assets" />
|
<annotation name="templating.helper" alias="assets" />
|
||||||
<argument>%request.base_path%</argument>
|
<argument type="service" id="request" />
|
||||||
<argument />
|
<argument />
|
||||||
<argument>%templating.assets.version%</argument>
|
<argument>%templating.assets.version%</argument>
|
||||||
</service>
|
</service>
|
||||||
|
Reference in New Issue
Block a user