diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-05 21:59:13 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-05 21:59:13 +0100 |
| commit | 177960dbfb60771cabbafff1fa570f981b509009 (patch) | |
| tree | 22ea0f168c335bfe3de49d97dca98619675d0daa | |
| parent | df42c78ad58cdb55207422d3d34925f8eb02374d (diff) | |
| parent | d5af07037de16d42a7037fc1c33a6f77b34244c3 (diff) | |
| download | symfony-security-177960dbfb60771cabbafff1fa570f981b509009.zip symfony-security-177960dbfb60771cabbafff1fa570f981b509009.tar.gz symfony-security-177960dbfb60771cabbafff1fa570f981b509009.tar.bz2 | |
Merge branch '2.5' into 2.6v2.6.2
* 2.5:
[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/Console/Descriptor/TextDescriptor.php
| -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 */ |