Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 851e3ffe8a36 · 2015-07-28T16:07:07.000+02:00
* 2.3:
  [php7] Fix for substr() always returning a string
  [Security] Do not save the target path in the session for a stateless firewall
  [DependencyInjection] fixed FrozenParameterBag and improved Parameter…

Conflicts:
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
diff --git a/ParameterBag/ParameterBagInterface.php b/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);
diff --git a/Tests/ParameterBag/FrozenParameterBagTest.php b/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');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,4 +57,13 @@ public function testAdd()`
`57`	`57`	`$bag = new FrozenParameterBag(array());`
`58`	`58`	`$bag->add(array());`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+ /**`
	`62`	`+ * @expectedException \LogicException`
	`63`	`+ */`
	`64`	`+ public function testRemove()`
	`65`	`+ {`
	`66`	`+ $bag = new FrozenParameterBag(array('foo' => 'bar'));`
	`67`	`+ $bag->remove('foo');`
	`68`	`+ }`
`60`	`69`	`}`