made the assets optional
This commit is contained in:
parent
d61ffa9c63
commit
ddf5ac4429
@ -49,7 +49,6 @@ class FrameworkExtension extends Extension
|
|||||||
$loader->load('web.xml');
|
$loader->load('web.xml');
|
||||||
$loader->load('services.xml');
|
$loader->load('services.xml');
|
||||||
$loader->load('fragment_renderer.xml');
|
$loader->load('fragment_renderer.xml');
|
||||||
$loader->load('assets.xml');
|
|
||||||
|
|
||||||
// A translator must always be registered (as support is included by
|
// A translator must always be registered (as support is included by
|
||||||
// default in the Form component). If disabled, an identity translator
|
// default in the Form component). If disabled, an identity translator
|
||||||
@ -562,6 +561,8 @@ class FrameworkExtension extends Extension
|
|||||||
*/
|
*/
|
||||||
private function registerAssetsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
|
private function registerAssetsConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
|
||||||
{
|
{
|
||||||
|
$loader->load('assets.xml');
|
||||||
|
|
||||||
$defaultVersion = $this->createVersion($container, $config['version'], $config['version_format'], '_default');
|
$defaultVersion = $this->createVersion($container, $config['version'], $config['version_format'], '_default');
|
||||||
|
|
||||||
$defaultPackage = $this->createPackageDefinition($config['base_path'], $config['base_urls'], $defaultVersion);
|
$defaultPackage = $this->createPackageDefinition($config['base_path'], $config['base_urls'], $defaultVersion);
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<title>{% block title %}Welcome!{% endblock %}</title>
|
<title>{% block title %}Welcome!{% endblock %}</title>
|
||||||
{% block stylesheets %}{% endblock %}
|
{% block stylesheets %}{% endblock %}
|
||||||
<link rel="shortcut icon" href="{{ asset('favicon.ico') }}" />
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
{% block body %}{% endblock %}
|
{% block body %}{% endblock %}
|
||||||
|
@ -78,6 +78,10 @@ class ExtensionPass implements CompilerPassInterface
|
|||||||
$container->setDefinition('twig.loader.filesystem', $loader);
|
$container->setDefinition('twig.loader.filesystem', $loader);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($container->has('assets.packages')) {
|
||||||
|
$loader->addTag('twig.extension');
|
||||||
|
}
|
||||||
|
|
||||||
if (method_exists('Symfony\Bridge\Twig\AppVariable', 'setContainer')) {
|
if (method_exists('Symfony\Bridge\Twig\AppVariable', 'setContainer')) {
|
||||||
// we are on Symfony <3.0, where the setContainer method exists
|
// we are on Symfony <3.0, where the setContainer method exists
|
||||||
$container->getDefinition('twig.app_variable')->addMethodCall('setContainer', array(new Reference('service_container')));
|
$container->getDefinition('twig.app_variable')->addMethodCall('setContainer', array(new Reference('service_container')));
|
||||||
|
@ -86,7 +86,6 @@
|
|||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service id="twig.extension.assets" class="Symfony\Bridge\Twig\Extension\AssetExtension" public="false">
|
<service id="twig.extension.assets" class="Symfony\Bridge\Twig\Extension\AssetExtension" public="false">
|
||||||
<tag name="twig.extension" />
|
|
||||||
<argument type="service" id="assets.packages" />
|
<argument type="service" id="assets.packages" />
|
||||||
<argument type="service" id="twig.extension.httpfoundation" />
|
<argument type="service" id="twig.extension.httpfoundation" />
|
||||||
</service>
|
</service>
|
||||||
|
Reference in New Issue
Block a user