Merge branch '2.1' into 2.2

* 2.1:
  Fix default value handling for multi-value options
  [HttpKernel] truncate profiler token to 6 chars (see #7665)
  Disabled APC on Travis for PHP 5.5+ as it is not available
  [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path
  [Yaml] improved boolean naming ($notEOF -> !$EOF)
  [Yaml] fixed handling an empty value
  [Routing][XML Loader] Add a possibility to set a default value to null
  The /e modifier for preg_replace() is deprecated in PHP 5.5; replace with preg_replace_callback()
  [HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag
  [Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation
  Update PhpEngine.php
  [HttpFoundation] getClientIp is fixed.

Conflicts:
	.travis.yml
	src/Symfony/Component/Routing/Loader/XmlFileLoader.php
	src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd
	src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml
	src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php

Author: fabpot

ApacheRequest.php

@@ -40,12 +40,4 @@ protected function prepareBaseUrl()
 
         return $baseUrl;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function preparePathInfo()
-    {
-        return $this->server->get('PATH_INFO') ?: substr($this->prepareRequestUri(), strlen($this->prepareBaseUrl())) ?: '/';
-    }
 }

Request.php

@@ -721,9 +721,10 @@ public function getClientIp()
         $clientIps[] = $ip;
 
         $trustedProxies = self::$trustProxy && !self::$trustedProxies ? array($ip) : self::$trustedProxies;
+        $ip = $clientIps[0];
         $clientIps = array_diff($clientIps, $trustedProxies);
 
-        return array_pop($clientIps);
+        return $clientIps ? array_pop($clientIps) : $ip;
     }
 
     /**

Session/Attribute/NamespacedAttributeBag.php

@@ -46,6 +46,10 @@ public function has($name)
         $attributes = $this->resolveAttributePath($name);
         $name = $this->resolveKey($name);
 
+        if (null === $attributes) {
+            return false;
+        }
+
         return array_key_exists($name, $attributes);
     }
 
@@ -57,6 +61,10 @@ public function get($name, $default = null)
         $attributes = $this->resolveAttributePath($name);
         $name = $this->resolveKey($name);
 
+        if (null === $attributes) {
+            return $default;
+        }
+
         return array_key_exists($name, $attributes) ? $attributes[$name] : $default;
     }
 
@@ -120,12 +128,8 @@ protected function &resolveAttributePath($name, $writeContext = false)
         unset($parts[count($parts)-1]);
 
         foreach ($parts as $part) {
-            if (!array_key_exists($part, $array)) {
-                if (!$writeContext) {
-                    return $array;
-                }
-
-                $array[$part] = array();
+            if (null !== $array && !array_key_exists($part, $array)) {
+                $array[$part] = $writeContext ? array() : null;
             }
 
             $array = & $array[$part];

Tests/RequestTest.php

@@ -778,6 +778,7 @@ public function testGetClientIpProvider()
     {
         return array(
             array('88.88.88.88',              false, '88.88.88.88',  null,                                  null),
+            array('88.88.88.88',              true,  '88.88.88.88',  null,                                  null),
             array('127.0.0.1',                false, '127.0.0.1',    null,                                  null),
             array('::1',                      false, '::1',          null,                                  null),
             array('127.0.0.1',                false, '127.0.0.1',    '88.88.88.88',                         null),
@@ -786,6 +787,8 @@ public function testGetClientIpProvider()
             array('88.88.88.88',              true,  '123.45.67.89', '127.0.0.1, 87.65.43.21, 88.88.88.88', null),
             array('87.65.43.21',              true,  '123.45.67.89', '127.0.0.1, 87.65.43.21, 88.88.88.88', array('123.45.67.89', '88.88.88.88')),
             array('87.65.43.21',              false, '123.45.67.89', '127.0.0.1, 87.65.43.21, 88.88.88.88', array('123.45.67.89', '88.88.88.88')),
+            array('88.88.88.88',              true,  '123.45.67.89', '88.88.88.88',                         array('123.45.67.89', '88.88.88.88')),
+            array('88.88.88.88',              false, '123.45.67.89', '88.88.88.88',                         array('123.45.67.89', '88.88.88.88')),
         );
     }
 

Tests/Session/Attribute/NamespacedAttributeBagTest.php

@@ -160,8 +160,10 @@ public function attributesProvider()
             array('csrf.token/b', '4321', true),
             array('category', array('fishing' => array('first' => 'cod', 'second' => 'sole')), true),
             array('category/fishing', array('first' => 'cod', 'second' => 'sole'), true),
+            array('category/fishing/missing/first', null, false),
             array('category/fishing/first', 'cod', true),
             array('category/fishing/second', 'sole', true),
+            array('category/fishing/missing/second', null, false),
             array('user2.login', null, false),
             array('never', null, false),
             array('bye', null, false),