renamed proxy to router_proxy

fabpot · fabpot · commit 23f51450bd5a · 2013-01-23T13:57:53.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -73,7 +73,7 @@ public function getConfigTreeBuilder()
 
         $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 @@ private function addEsiSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    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()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -94,8 +94,8 @@ public function load(array $configs, ContainerBuilder $container)
             $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 @@ private function registerEsiConfiguration(array $config, XmlFileLoader $loader)
     }
 
     /**
-     * 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');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,8 @@ public function load(array $configs, ContainerBuilder $container)`
`94`	`94`	`$this->registerEsiConfiguration($config['esi'], $loader);`
`95`	`95`	`}`
`96`	`96`
`97`		`- if (isset($config['proxy'])) {`
`98`		`- $this->registerProxyConfiguration($config['proxy'], $container, $loader);`
	`97`	`+ if (isset($config['router_proxy'])) {`
	`98`	`+ $this->registerRouterProxyConfiguration($config['router_proxy'], $container, $loader);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`if (isset($config['profiler'])) {`
`@@ -189,12 +189,12 @@ private function registerEsiConfiguration(array $config, XmlFileLoader $loader)`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`/**`
`192`		`- * Loads the proxy configuration.`
	`192`	`+ * Loads the router proxy configuration.`
`193`	`193`	`*`
`194`	`194`	`* @param array $config A proxy configuration array`
`195`	`195`	`* @param XmlFileLoader $loader An XmlFileLoader instance`
`196`	`196`	`*/`
`197`		`- private function registerProxyConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
	`197`	`+ private function registerRouterProxyConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
`198`	`198`	`{`
`199`	`199`	`if (!empty($config['enabled'])) {`
`200`	`200`	`$loader->load('proxy.xml');`