Merge pull request #105 from antograssiot/bake-form

Add possibility to bake modeless form
cakephp · Jun 1, 2015 · da683a0 · da683a0
2 parents 9241859 + 9076aef
commit da683a0
Show file tree

Hide file tree

Showing 6 changed files with 126 additions and 2 deletions.
diff --git a/src/Shell/Task/FormTask.php b/src/Shell/Task/FormTask.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         1.0.9
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+namespace Bake\Shell\Task;
+
+/**
+ * ShellHelper code generator.
+ */
+class FormTask extends SimpleBakeTask
+{
+    /**
+     * Task name used in path generation.
+     *
+     * @var string
+     */
+    public $pathFragment = 'Form/';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function name()
+    {
+        return 'form';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function fileName($name)
+    {
+        return $name . 'Form.php';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function template()
+    {
+        return 'Form/form';
+    }
+}
diff --git a/src/Shell/Task/TestTask.php b/src/Shell/Task/TestTask.php
@@ -55,6 +55,7 @@ class TestTask extends BakeTask
         'Helper' => 'View\Helper',
         'Shell' => 'Shell',
         'Cell' => 'View\Cell',
+        'Form' => 'Form'
     ];
 
     /**
@@ -71,6 +72,7 @@ class TestTask extends BakeTask
         'helper' => 'Helper',
         'shell' => 'Shell',
         'cell' => 'Cell',
+        'form' => 'Form'
     ];
 
     /**
@@ -486,7 +488,7 @@ public function generateConstructor($type, $fullClassName)
             $pre = "\$config = TableRegistry::exists('{$className}') ? [] : ['className' => '{$fullClassName}'];";
             $construct = "TableRegistry::get('{$className}', \$config);";
         }
-        if ($type === 'behavior' || $type === 'entity') {
+        if ($type === 'behavior' || $type === 'entity' || $type === 'form') {
             $construct = "new {$className}();";
         }
         if ($type === 'helper') {
@@ -591,6 +593,7 @@ public function getOptionParser()
                 'Behavior', 'behavior',
                 'Shell', 'shell',
                 'Cell', 'cell',
+                'Form', 'form'
             ]
         ])->addArgument('name', [
             'help' => 'An existing class to bake tests for.'

diff --git a/src/Template/Bake/Form/form.ctp b/src/Template/Bake/Form/form.ctp
@@ -0,0 +1,59 @@
+<%
+/**
+* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+*
+* Licensed under The MIT License
+* For full copyright and license information, please see the LICENSE.txt
+* Redistributions of files must retain the above copyright notice.
+*
+* @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+* @link          http://cakephp.org CakePHP(tm) Project
+* @since         1.0.9
+* @license       http://www.opensource.org/licenses/mit-license.php MIT License
+*/
+%>
+<?php
+namespace <%= $namespace %>\Form;
+
+use Cake\Form\Form;
+use Cake\Form\Schema;
+use Cake\Validation\Validator;
+
+/**
+ * <%= $name %> Form.
+ */
+class <%= $name %>Form extends Form
+{
+    /**
+     * Builds the schema for the modeless form
+     *
+     * @param Schema $schema From schema
+     * @return $this
+     */
+    protected function _buildSchema(Schema $schema)
+    {
+        return $schema;
+    }
+
+    /**
+     * Form validation builder
+     *
+     * @param Validator $validator to use against the form
+     * @return Validator
+     */
+    protected function _buildValidator(Validator $validator)
+    {
+        return $validator;
+    }
+
+    /**
+     * Defines what to execute once the From is being processed
+     *
+     * @return bool
+     */
+    protected function _execute(array $data)
+    {
+        return true;
+    }
+}
diff --git a/tests/TestCase/Shell/BakeShellTest.php b/tests/TestCase/Shell/BakeShellTest.php
@@ -106,7 +106,7 @@ public function testMain()
             ->method('out')
             ->with($this->stringContains('The following commands'));
 
-        $this->Shell->expects($this->exactly(16))
+        $this->Shell->expects($this->exactly(17))
             ->method('out');
 
         $this->Shell->loadTasks();
@@ -143,6 +143,7 @@ public function testLoadTasksCoreAndApp()
             'Bake.Component',
             'Bake.Controller',
             'Bake.Fixture',
+            'Bake.Form',
             'Bake.Helper',
             'Bake.Model',
             'Bake.Plugin',

diff --git a/tests/TestCase/Shell/Task/SimpleBakeTaskTest.php b/tests/TestCase/Shell/Task/SimpleBakeTaskTest.php
@@ -191,6 +191,7 @@ public function subclassProvider()
             ['Bake\Shell\Task\ComponentTask'],
             ['Bake\Shell\Task\HelperTask'],
             ['Bake\Shell\Task\ShellTask'],
+            ['Bake\Shell\Task\FormTask'],
         ];
     }
 

diff --git a/tests/TestCase/Shell/Task/TestTaskTest.php b/tests/TestCase/Shell/Task/TestTaskTest.php
@@ -498,6 +498,14 @@ public function testGenerateConstructor()
         $result = $this->Task->generateConstructor('entity', 'TestBake\Model\Entity\Article');
         $expected = ["", "new Article();", ''];
         $this->assertEquals($expected, $result);
+
+        $result = $this->Task->generateConstructor('form', 'TestBake\Form\ExampleForm');
+        $expected = [
+            '',
+            "new ExampleForm();",
+            ''
+        ];
+        $this->assertEquals($expected, $result);
     }
 
     /**