diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-08 09:43:57 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-08 09:43:57 +0100 |
| commit | 84d8e737d03979475eacb87a1239170fc6eab50e (patch) | |
| tree | b9e48852bca87fd8242ef54bb25d5eb42e947930 /Csrf/TokenStorage/NativeSessionTokenStorage.php | |
| parent | b7b837e189058e1009b94203146042069ec85982 (diff) | |
| parent | c7d59d4cf078674f865f4103cdf23077f6c1af95 (diff) | |
| download | symfony-security-84d8e737d03979475eacb87a1239170fc6eab50e.zip symfony-security-84d8e737d03979475eacb87a1239170fc6eab50e.tar.gz symfony-security-84d8e737d03979475eacb87a1239170fc6eab50e.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6: (25 commits)
Added information when an error occured during validation of an answer of a question
Adding note about known BC issues
Adding note about the PdoSessionHandler BC break
[Console] fixes some typos and phpdoc.
fix phpdoc's alignment
[2.6] CS Fixes And Removed An Unused Import
Minor phpcs fixes
[ClassLoader] Fix undefined index in ClassCollectionLoader
CS fixes
Revert "minor #12821 Remove deprecated class (MasterB)"
[2.3] More cs fixes
Removed unused imports
CS fixes
bumped Symfony version to 2.6.2
updated VERSION for 2.6.1
updated CHANGELOG for 2.6.1
bumped Symfony version to 2.5.9
updated VERSION for 2.5.8
update CONTRIBUTORS for 2.5.8
updated CHANGELOG for 2.5.8
...
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'Csrf/TokenStorage/NativeSessionTokenStorage.php')
| -rw-r--r-- | Csrf/TokenStorage/NativeSessionTokenStorage.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Csrf/TokenStorage/NativeSessionTokenStorage.php b/Csrf/TokenStorage/NativeSessionTokenStorage.php index bb1a417..60145c6 100644 --- a/Csrf/TokenStorage/NativeSessionTokenStorage.php +++ b/Csrf/TokenStorage/NativeSessionTokenStorage.php @@ -40,8 +40,8 @@ class NativeSessionTokenStorage implements TokenStorageInterface /** * Initializes the storage with a session namespace. * - * @param string $namespace The namespace under which the token is stored - * in the session + * @param string $namespace The namespace under which the token is stored + * in the session */ public function __construct($namespace = self::SESSION_NAMESPACE) { |