Merge pull request #1590 from maryo/master

Fixed required controller generation in GenerateAdminCommand and it’s template

Command/GenerateAdminCommand.php

@@ -80,7 +80,8 @@ class GenerateAdminCommand extends ContainerAwareCommand
             $this->writeError($output, $e->getMessage());
         }
 
-        if ($controllerClassBasename = Validators::validateControllerClassBasename($input->getOption('controller'))) {
+        if ($controllerClassBasename = $input->getOption('controller')) {
+            $controllerClassBasename = Validators::validateControllerClassBasename($controllerClassBasename);
             $controllerGenerator = new ControllerGenerator($skeletonDirectory);
 
             try {

Resources/skeleton/Admin.php.twig

@@ -14,7 +14,7 @@ use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
 
-class {{ classBasename }}
+class {{ classBasename }} extends Admin
 {
     /**
      * @param DatagridMapper $datagridMapper

Tests/Fixtures/Admin/ModelAdmin.php

@@ -8,7 +8,7 @@ use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
 
-class ModelAdmin
+class ModelAdmin extends Admin
 {
     /**
      * @param DatagridMapper $datagridMapper