Minor doc and CS fix

mushkin-v · Jan 4, 2015 · 3fa8303 · 3fa8303
1 parent fd09943
commit 3fa8303
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 11 deletions.
diff --git a/Admin/Admin.php b/Admin/Admin.php
@@ -1246,7 +1246,7 @@ public function generateUrl($name, array $parameters = array(), $absolute = fals
      */
     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);
     }
 
     /**

diff --git a/Admin/AdminInterface.php b/Admin/AdminInterface.php
@@ -172,7 +172,7 @@ public function generateUrl($name, array $parameters = array(), $absolute = fals
      * @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);
 

diff --git a/Controller/CRUDController.php b/Controller/CRUDController.php
@@ -186,7 +186,7 @@ public function render($view, array $parameters = array(), Response $response =
 
         return parent::render($view, $parameters, $response);
     }
-    
+
     /**
      * @param \Exception $e
      *

diff --git a/Datagrid/DatagridInterface.php b/Datagrid/DatagridInterface.php
@@ -57,7 +57,7 @@ public function reorderFilters(array $keys);
     public function getValues();
 
     /**
-     * @return array
+     * @return \Sonata\AdminBundle\Admin\FieldDescriptionCollection
      */
     public function getColumns();
 

diff --git a/Tests/Admin/AdminTest.php b/Tests/Admin/AdminTest.php
@@ -1042,12 +1042,6 @@ public function testGetTemplate1()
 
         $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');
 

diff --git a/Tests/Admin/PoolTest.php b/Tests/Admin/PoolTest.php
@@ -16,7 +16,7 @@
 class PoolTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Sonata\AdminBundle\Admin\Pool
+     * @var Pool
      */
     private $pool = null;
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         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);
         }
         /**
@@ Expand Down @@