diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed proxy to router_proxy

Browse Source
This commit is contained in:
Fabien Potencier 2013-01-23 07:57:42 +01:00
parent e5135f67be
commit 23f51450bd
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
View File

@ -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()

8
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -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');

4
src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
View File

@ -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>