[FrameworkBundle] add missing attribute to XSD
The hinclude_default_template configuration option couldn't have been set in XML configurations since it wasn't defined in the XML schema definition.
This commit is contained in:
parent
64543909f8
commit
8a2b423b53
@ -105,6 +105,7 @@
|
|||||||
<xsd:attribute name="assets-version" type="xsd:string" />
|
<xsd:attribute name="assets-version" type="xsd:string" />
|
||||||
<xsd:attribute name="assets-version-format" type="xsd:string" />
|
<xsd:attribute name="assets-version-format" type="xsd:string" />
|
||||||
<xsd:attribute name="cache" type="xsd:string" />
|
<xsd:attribute name="cache" type="xsd:string" />
|
||||||
|
<xsd:attribute name="hinclude-default-template" type="xsd:string" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
|
|
||||||
<xsd:complexType name="form-resources">
|
<xsd:complexType name="form-resources">
|
||||||
|
@ -56,6 +56,7 @@ $container->loadFromExtension('framework', array(
|
|||||||
'form' => array(
|
'form' => array(
|
||||||
'resources' => array('theme1', 'theme2')
|
'resources' => array('theme1', 'theme2')
|
||||||
),
|
),
|
||||||
|
'hinclude_default_template' => 'global_hinclude_template',
|
||||||
),
|
),
|
||||||
'translator' => array(
|
'translator' => array(
|
||||||
'enabled' => true,
|
'enabled' => true,
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
<framework:profiler only-exceptions="true" enabled="false" />
|
<framework:profiler only-exceptions="true" enabled="false" />
|
||||||
<framework:router resource="%kernel.root_dir%/config/routing.xml" type="xml" />
|
<framework:router resource="%kernel.root_dir%/config/routing.xml" type="xml" />
|
||||||
<framework:session gc-maxlifetime="90000" gc-probability="1" gc-divisor="108" storage-id="session.storage.native" handler-id="session.handler.native_file" name="_SYMFONY" cookie-lifetime="86400" cookie-path="/" cookie-domain="example.com" cookie-secure="true" cookie-httponly="true" save-path="/path/to/sessions" />
|
<framework:session gc-maxlifetime="90000" gc-probability="1" gc-divisor="108" storage-id="session.storage.native" handler-id="session.handler.native_file" name="_SYMFONY" cookie-lifetime="86400" cookie-path="/" cookie-domain="example.com" cookie-secure="true" cookie-httponly="true" save-path="/path/to/sessions" />
|
||||||
<framework:templating assets-version="SomeVersionScheme" cache="/path/to/cache" >
|
<framework:templating assets-version="SomeVersionScheme" cache="/path/to/cache" hinclude-default-template="global_hinclude_template">
|
||||||
<framework:loader>loader.foo</framework:loader>
|
<framework:loader>loader.foo</framework:loader>
|
||||||
<framework:loader>loader.bar</framework:loader>
|
<framework:loader>loader.bar</framework:loader>
|
||||||
<framework:engine>php</framework:engine>
|
<framework:engine>php</framework:engine>
|
||||||
|
@ -44,6 +44,7 @@ framework:
|
|||||||
base_urls: ["http://images1.example.com", "http://images2.example.com"]
|
base_urls: ["http://images1.example.com", "http://images2.example.com"]
|
||||||
form:
|
form:
|
||||||
resources: [theme1, theme2]
|
resources: [theme1, theme2]
|
||||||
|
hinclude_default_template: global_hinclude_template
|
||||||
translator:
|
translator:
|
||||||
enabled: true
|
enabled: true
|
||||||
fallback: fr
|
fallback: fr
|
||||||
|
@ -158,6 +158,7 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||||||
$this->assertEquals(array('php', 'twig'), $container->getParameter('templating.engines'), '->registerTemplatingConfiguration() sets a templating.engines parameter');
|
$this->assertEquals(array('php', 'twig'), $container->getParameter('templating.engines'), '->registerTemplatingConfiguration() sets a templating.engines parameter');
|
||||||
|
|
||||||
$this->assertEquals(array('FrameworkBundle:Form', 'theme1', 'theme2'), $container->getParameter('templating.helper.form.resources'), '->registerTemplatingConfiguration() registers the theme and adds the base theme');
|
$this->assertEquals(array('FrameworkBundle:Form', 'theme1', 'theme2'), $container->getParameter('templating.helper.form.resources'), '->registerTemplatingConfiguration() registers the theme and adds the base theme');
|
||||||
|
$this->assertEquals('global_hinclude_template', $container->getParameter('fragment.renderer.hinclude.global_template'), '->registerTemplatingConfiguration() registers the global hinclude.js template');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testTemplatingAssetsHelperScopeDependsOnPackageArgumentScopes()
|
public function testTemplatingAssetsHelperScopeDependsOnPackageArgumentScopes()
|
||||||
|
Reference in New Issue
Block a user