Merge branch '2.3'

Form/Extension/Field/Type/FormTypeFieldExtension.php

@@ -196,7 +196,7 @@ class FormTypeFieldExtension extends AbstractTypeExtension
      */
     public function getExtendedType()
     {
-        return 'field';
+        return 'form';
     }
 
     /**

Search/SearchHandler.php

@@ -65,6 +65,7 @@ class SearchHandler
         $pager = $datagrid->getPager();
         $pager->setPage($page);
         $pager->setMaxPerPage($offset);
+        $pager->init();
 
         return $pager;
     }

Tests/Form/Extension/Field/Type/FormTypeFieldExtensionTest.php

@@ -23,7 +23,7 @@ class FormTypeFieldExtensionTest extends \PHPUnit_Framework_TestCase
     {
         $extension = new FormTypeFieldExtension(array(), array());
 
-        $this->assertSame('field', $extension->getExtendedType());
+        $this->assertSame('form', $extension->getExtendedType());
     }
 
     public function testDefaultOptions()