diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-05 21:58:03 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-05 21:58:03 +0100 |
| commit | d5af07037de16d42a7037fc1c33a6f77b34244c3 (patch) | |
| tree | 49fd9091c8da9760e011a837bdade90f7650b8e0 | |
| parent | 4e37bf92e4581c109cf940f88b5aa24e51d0404e (diff) | |
| parent | c89020dda8f90ae69bf0e76af7720f51be83a760 (diff) | |
| download | symfony-security-d5af07037de16d42a7037fc1c33a6f77b34244c3.zip symfony-security-d5af07037de16d42a7037fc1c33a6f77b34244c3.tar.gz symfony-security-d5af07037de16d42a7037fc1c33a6f77b34244c3.tar.bz2 | |
Merge branch '2.3' into 2.5
* 2.3:
[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
| -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 */ |