Merge branch '2.1' into 2.2

fabpot · fabpot · commit 7e77eb6db55c · 2013-04-06T12:15:43.000+02:00
* 2.1:
  [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
  [FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562)
  [WebProfilerBundle] removed next pointer class in a template
diff --git a/Session/Attribute/AttributeBag.php b/Session/Attribute/AttributeBag.php
@@ -31,7 +31,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
     /**
      * Constructor.
      *
-     * @param string $storageKey The key used to store flashes in the session.
+     * @param string $storageKey The key used to store attributes in the session.
      */
     public function __construct($storageKey = '_sf2_attributes')
     {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta`
`31`	`31`	`/**`
`32`	`32`	`* Constructor.`
`33`	`33`	`*`
`34`		`- * @param string $storageKey The key used to store flashes in the session.`
	`34`	`+ * @param string $storageKey The key used to store attributes in the session.`
`35`	`35`	`*/`
`36`	`36`	`public function __construct($storageKey = '_sf2_attributes')`
`37`	`37`	`{`