Merge branch '2.3'

Conflicts:
	Route/RouteCollection.php

Route/RouteCollection.php

@@ -20,14 +20,29 @@ use Symfony\Component\Routing\Route;
  */
 class RouteCollection
 {
+    /**
+     * @var Route[]
+     */
     protected $elements = array();
 
+    /**
+     * @var string
+     */
     protected $baseCodeRoute;
 
+    /**
+     * @var string
+     */
     protected $baseRouteName;
 
+    /**
+     * @var string
+     */
     protected $baseControllerName;
 
+    /**
+     * @var string
+     */
     protected $baseRoutePattern;
 
     /**
@@ -100,7 +115,7 @@ class RouteCollection
     /**
      * @param RouteCollection $collection
      *
-     * @return \Sonata\AdminBundle\Route\RouteCollection
+     * @return RouteCollection
      */
     public function addCollection(RouteCollection $collection)
     {
@@ -126,7 +141,7 @@ class RouteCollection
     }
 
     /**
-     * @return array
+     * @return Route[]
      */
     public function getElements()
     {
@@ -170,7 +185,7 @@ class RouteCollection
     /**
      * @param string $name
      *
-     * @return \Sonata\AdminBundle\Route\RouteCollection
+     * @return RouteCollection
      */
     public function remove($name)
     {
@@ -184,7 +199,7 @@ class RouteCollection
      *
      * @param array $routeList
      *
-     * @return \Sonata\AdminBundle\Route\RouteCollection
+     * @return RouteCollection
      */
     public function clearExcept(array $routeList)
     {
@@ -206,7 +221,7 @@ class RouteCollection
     /**
      * Remove all routes.
      *
-     * @return \Sonata\AdminBundle\Route\RouteCollection
+     * @return RouteCollection
      */
     public function clear()
     {