Merge branch '2.7' into 2.8

* 2.7:
  [php7] Fix for substr() always returning a string
  [Security] Do not save the target path in the session for a stateless firewall
  Fix calls to HttpCache#getSurrogate triggering E_USER_DEPRECATED errors.
  [DependencyInjection] fixed FrozenParameterBag and improved Parameter…

Author: nicolas-grekas

ParameterBag/ParameterBagInterface.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\ParameterBag;
 
+use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
 
 /**
@@ -25,6 +26,8 @@ interface ParameterBagInterface
     /**
      * Clears all parameters.
      *
+     * @throws LogicException if the ParameterBagInterface can not be cleared
+     *
      * @api
      */
     public function clear();
@@ -34,6 +37,8 @@ public function clear();
      *
      * @param array $parameters An array of parameters
      *
+     * @throws LogicException if the parameter can not be added
+     *
      * @api
      */
     public function add(array $parameters);
@@ -66,6 +71,8 @@ public function get($name);
      * @param string $name  The parameter name
      * @param mixed  $value The parameter value
      *
+     * @throws LogicException if the parameter can not be set
+     *
      * @api
      */
     public function set($name, $value);

Tests/ParameterBag/FrozenParameterBagTest.php

@@ -57,4 +57,13 @@ public function testAdd()
         $bag = new FrozenParameterBag(array());
         $bag->add(array());
     }
+
+    /**
+     * @expectedException \LogicException
+     */
+    public function testRemove()
+    {
+        $bag = new FrozenParameterBag(array('foo' => 'bar'));
+        $bag->remove('foo');
+    }
 }