Merge branch '2.1'

* 2.1: [HttpFoundation] reverted variable rename
symfony · Nov 29, 2012 · 50a62da · 50a62da
2 parents 995219f + d50f9d7
commit 50a62da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -35,7 +35,7 @@ class Request
     const HEADER_CLIENT_PROTO = 'client_proto';
     const HEADER_CLIENT_PORT = 'client_port';
 
-    protected static $trustProxyData = false;
+    protected static $trustProxy = false;
 
     protected static $trustedProxies = array();
 
@@ -466,7 +466,7 @@ public function overrideGlobals()
      */
     public static function trustProxyData()
     {
-        self::$trustProxyData = true;
+        self::$trustProxy = true;
     }
 
     /**
@@ -481,7 +481,7 @@ public static function trustProxyData()
     public static function setTrustedProxies(array $proxies)
     {
         self::$trustedProxies = $proxies;
-        self::$trustProxyData = $proxies ? true : false;
+        self::$trustProxy = $proxies ? true : false;
     }
 
     /**
@@ -676,7 +676,7 @@ public function getClientIp()
     {
         $ip = $this->server->get('REMOTE_ADDR');
 
-        if (!self::$trustProxyData) {
+        if (!self::$trustProxy) {
             return $ip;
         }
 
@@ -687,7 +687,7 @@ public function getClientIp()
         $clientIps = array_map('trim', explode(',', $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_IP])));
         $clientIps[] = $ip;
 
-        $trustedProxies = self::$trustProxyData && !self::$trustedProxies ? array($ip) : self::$trustedProxies;
+        $trustedProxies = self::$trustProxy && !self::$trustedProxies ? array($ip) : self::$trustedProxies;
         $clientIps = array_diff($clientIps, $trustedProxies);
 
         return array_pop($clientIps);
@@ -803,7 +803,7 @@ public function getScheme()
      */
     public function getPort()
     {
-        if (self::$trustProxyData && self::$trustedHeaders[self::HEADER_CLIENT_PORT] && $port = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PORT])) {
+        if (self::$trustProxy && self::$trustedHeaders[self::HEADER_CLIENT_PORT] && $port = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PORT])) {
             return $port;
         }
 
@@ -965,7 +965,7 @@ public function getQueryString()
      */
     public function isSecure()
     {
-        if (self::$trustProxyData && self::$trustedHeaders[self::HEADER_CLIENT_PROTO] && $proto = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PROTO])) {
+        if (self::$trustProxy && self::$trustedHeaders[self::HEADER_CLIENT_PROTO] && $proto = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_PROTO])) {
             return in_array(strtolower($proto), array('https', 'on', '1'));
         }
 
@@ -989,7 +989,7 @@ public function isSecure()
      */
     public function getHost()
     {
-        if (self::$trustProxyData && self::$trustedHeaders[self::HEADER_CLIENT_HOST] && $host = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_HOST])) {
+        if (self::$trustProxy && self::$trustedHeaders[self::HEADER_CLIENT_HOST] && $host = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_HOST])) {
             $elements = explode(',', $host);
 
             $host = trim($elements[count($elements) - 1]);

diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1228,7 +1228,7 @@ public function urlencodedStringPrefixData()
     private function stopTrustingProxyData()
     {
         $class = new \ReflectionClass('Symfony\\Component\\HttpFoundation\\Request');
-        $property = $class->getProperty('trustProxyData');
+        $property = $class->getProperty('trustProxy');
         $property->setAccessible(true);
         $property->setValue(false);
     }