renamed proxy to router_proxy
This commit is contained in:
parent
e5135f67be
commit
23f51450bd
@ -73,7 +73,7 @@ class Configuration implements ConfigurationInterface
|
||||
|
||||
$this->addFormSection($rootNode);
|
||||
$this->addEsiSection($rootNode);
|
||||
$this->addProxySection($rootNode);
|
||||
$this->addRouterProxySection($rootNode);
|
||||
$this->addProfilerSection($rootNode);
|
||||
$this->addRouterSection($rootNode);
|
||||
$this->addSessionSection($rootNode);
|
||||
@ -115,12 +115,12 @@ class Configuration implements ConfigurationInterface
|
||||
;
|
||||
}
|
||||
|
||||
private function addProxySection(ArrayNodeDefinition $rootNode)
|
||||
private function addRouterProxySection(ArrayNodeDefinition $rootNode)
|
||||
{
|
||||
$rootNode
|
||||
->children()
|
||||
->arrayNode('proxy')
|
||||
->info('proxy configuration')
|
||||
->arrayNode('router_proxy')
|
||||
->info('proxy configuration for the HTTP content renderer')
|
||||
->canBeDisabled()
|
||||
->children()
|
||||
->scalarNode('path')->defaultValue('/_proxy')->end()
|
||||
|
@ -94,8 +94,8 @@ class FrameworkExtension extends Extension
|
||||
$this->registerEsiConfiguration($config['esi'], $loader);
|
||||
}
|
||||
|
||||
if (isset($config['proxy'])) {
|
||||
$this->registerProxyConfiguration($config['proxy'], $container, $loader);
|
||||
if (isset($config['router_proxy'])) {
|
||||
$this->registerRouterProxyConfiguration($config['router_proxy'], $container, $loader);
|
||||
}
|
||||
|
||||
if (isset($config['profiler'])) {
|
||||
@ -189,12 +189,12 @@ class FrameworkExtension extends Extension
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the proxy configuration.
|
||||
* Loads the router proxy configuration.
|
||||
*
|
||||
* @param array $config A proxy configuration array
|
||||
* @param XmlFileLoader $loader An XmlFileLoader instance
|
||||
*/
|
||||
private function registerProxyConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
|
||||
private function registerRouterProxyConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
|
||||
{
|
||||
if (!empty($config['enabled'])) {
|
||||
$loader->load('proxy.xml');
|
||||
|
@ -12,7 +12,7 @@
|
||||
<xsd:element name="form" type="form" minOccurs="0" maxOccurs="1" />
|
||||
<xsd:element name="csrf-protection" type="csrf_protection" minOccurs="0" maxOccurs="1" />
|
||||
<xsd:element name="esi" type="esi" minOccurs="0" maxOccurs="1" />
|
||||
<xsd:element name="proxy" type="proxy" minOccurs="0" maxOccurs="1" />
|
||||
<xsd:element name="router-proxy" type="router-proxy" minOccurs="0" maxOccurs="1" />
|
||||
<xsd:element name="profiler" type="profiler" minOccurs="0" maxOccurs="1" />
|
||||
<xsd:element name="router" type="router" minOccurs="0" maxOccurs="1" />
|
||||
<xsd:element name="session" type="session" minOccurs="0" maxOccurs="1" />
|
||||
@ -45,7 +45,7 @@
|
||||
<xsd:attribute name="enabled" type="xsd:boolean" />
|
||||
</xsd:complexType>
|
||||
|
||||
<xsd:complexType name="proxy">
|
||||
<xsd:complexType name="router-proxy">
|
||||
<xsd:attribute name="enabled" type="xsd:boolean" />
|
||||
<xsd:attribute name="path" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
|
Reference in New Issue
Block a user