diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-05 22:00:14 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-05 22:00:14 +0100 |
| commit | 019f61c8fc68a7beb98c0f34fae3816b6904e33d (patch) | |
| tree | ace409eeb3299392958f4a46d3076c7b5800eaa6 | |
| parent | 52f9447541af006926aa4e687410ba3403e80c16 (diff) | |
| parent | 177960dbfb60771cabbafff1fa570f981b509009 (diff) | |
| download | symfony-security-019f61c8fc68a7beb98c0f34fae3816b6904e33d.zip symfony-security-019f61c8fc68a7beb98c0f34fae3816b6904e33d.tar.gz symfony-security-019f61c8fc68a7beb98c0f34fae3816b6904e33d.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
use Table instead of the deprecated TableHelper
[2.3] fix failing test
fixed typo
Escape annotations in comments, refs #13089.
[2.3] missing cleanup for legacy test
add missing param names to @param annotation
Improve the composer root version setting on Travis
use Table instead of the deprecated TableHelper
Conflicts:
src/Symfony/Bundle/FrameworkBundle/composer.json
| -rw-r--r-- | Core/Util/ClassUtils.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php index 6107c40..6c87096 100644 --- a/Core/Util/ClassUtils.php +++ b/Core/Util/ClassUtils.php @@ -48,7 +48,7 @@ class ClassUtils /** * Gets the real class name of a class name that could be a proxy. * - * @param string|object + * @param string|object $object * * @return string */ |