Merge pull request #2662 from pulzarraider/cs_doc_fix2

Minor doc and CS fix

Admin/Admin.php

@@ -1246,7 +1246,7 @@ abstract class Admin implements AdminInterface, DomainObjectInterface
      */
     public function generateMenuUrl($name, array $parameters = array(), $absolute = false)
     {
-        return $this->routeGenerator->generateMenuUrl($this, $name,$parameters, $absolute);
+        return $this->routeGenerator->generateMenuUrl($this, $name, $parameters, $absolute);
     }
 
     /**

Admin/AdminInterface.php

@@ -172,7 +172,7 @@ interface AdminInterface
      * @param array  $parameters
      * @param bool   $absolute
      *
-     * @return string return a complete url
+     * @return array return url parts: 'route', 'routeParameters', 'routeAbsolute'
      */
     public function generateMenuUrl($name, array $parameters = array(), $absolute = false);
 

Controller/CRUDController.php

@@ -186,7 +186,7 @@ class CRUDController extends Controller
 
         return parent::render($view, $parameters, $response);
     }
-    
+
     /**
      * @param \Exception $e
      *

Datagrid/DatagridInterface.php

@@ -57,7 +57,7 @@ interface DatagridInterface
     public function getValues();
 
     /**
-     * @return array
+     * @return \Sonata\AdminBundle\Admin\FieldDescriptionCollection
      */
     public function getColumns();
 

Tests/Admin/AdminTest.php

@@ -1042,12 +1042,6 @@ class AdminTest extends \PHPUnit_Framework_TestCase
 
         $this->assertNull($admin->getTemplate('edit'));
 
-        $templates = array(
-            'list' => 'FooAdminBundle:CRUD:list.html.twig',
-            'show' => 'FooAdminBundle:CRUD:show.html.twig',
-            'edit' => 'FooAdminBundle:CRUD:edit.html.twig'
-        );
-
         $admin->setTemplate('edit', 'FooAdminBundle:CRUD:edit.html.twig');
         $admin->setTemplate('show', 'FooAdminBundle:CRUD:show.html.twig');
 

Tests/Admin/PoolTest.php

@@ -16,7 +16,7 @@ use Sonata\AdminBundle\Admin\Pool;
 class PoolTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Sonata\AdminBundle\Admin\Pool
+     * @var Pool
      */
     private $pool = null;