Merge branch '2.5' into 2.6

fabpot · fabpot · commit 177960dbfb60 · 2015-01-05T21:59:13.000+01:00
* 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
diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php
@@ -48,7 +48,7 @@ private function __construct()
     /**
      * Gets the real class name of a class name that could be a proxy.
      *
-     * @param string|object
+     * @param string|object $object
      *
      * @return string
      */

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private function __construct()`
`48`	`48`	`/**`
`49`	`49`	`* Gets the real class name of a class name that could be a proxy.`
`50`	`50`	`*`
`51`		`- * @param string\|object`
	`51`	`+ * @param string\|object $object`
`52`	`52`	`*`
`53`	`53`	`* @return string`
`54`	`54`	`*/`