Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 493ce7a64baf · 2018-06-29T18:28:23.000+02:00
* 2.8: [HttpFoundation] update phpdoc of FlashBagInterface::add() bug #27701 [SecurityBundle] Dont throw if "security.http_utils" is not found (nicolas-grekas) [Validator] Fix the namespace of RegexTest
diff --git a/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php b/src/Symfony/Component/HttpFoundation/Session/Flash/FlashBagInterface.php
@@ -24,7 +24,7 @@ interface FlashBagInterface extends SessionBagInterface
      * Adds a flash message for type.
      *
      * @param string $type
-     * @param string $message
+     * @param mixed  $message
      */
     public function add($type, $message);
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
@@ -74,6 +74,18 @@ public function testPeek()
         $this->assertEquals(array('A previous flash message'), $this->bag->peek('notice'));
     }
 
+    public function testAdd()
+    {
+        $tab = array('bar' => 'baz');
+        $this->bag->add('string_message', 'lorem');
+        $this->bag->add('object_message', new \stdClass());
+        $this->bag->add('array_message', $tab);
+
+        $this->assertEquals(array('lorem'), $this->bag->get('string_message'));
+        $this->assertEquals(array(new \stdClass()), $this->bag->get('object_message'));
+        $this->assertEquals(array($tab), $this->bag->get('array_message'));
+    }
+
     public function testGet()
     {
         $this->assertEquals(array(), $this->bag->get('non_existing'));
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/RegexTest.php b/src/Symfony/Component/Validator/Tests/Constraints/RegexTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Constraints;
+namespace Symfony\Component\Validator\Tests\Constraints;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraints\Regex;

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ interface FlashBagInterface extends SessionBagInterface`
`24`	`24`	`* Adds a flash message for type.`
`25`	`25`	`*`
`26`	`26`	`* @param string $type`
`27`		`- * @param string $message`
	`27`	`+ * @param mixed $message`
`28`	`28`	`*/`
`29`	`29`	`public function add($type, $message);`
`30`	`30`