merged branch phc/2.1 (PR #7569)

fabpot · fabpot · commit 7221d25fc427 · 2013-04-05T15:22:11.000+02:00
This PR was merged into the 2.1 branch. Discussion ---------- [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag | Q | A | ------------- | --- | Bug fix? | [no] | New feature? | [no] | BC breaks? | [no] | Deprecations? | [no] | Tests pass? | [yes] I assume : only changed a comment word | License | MIT Commits ------- 815eb61 [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php b/src/Symfony/Component/HttpFoundation/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`	`{`