From 88f9dca7e9079da4e321ef3652a848750ba22526 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 21 Oct 2017 01:07:41 +0530
Subject: [PATCH 01/44] Add support for writing bake templates using Twig
 syntax.

---
 .editorconfig                                 |   3 +
 composer.json                                 |   6 +-
 src/Shell/Task/BakeTemplateTask.php           |   8 +-
 src/Template/Bake/Layout/default.twig         |  16 +++
 src/Template/Bake/tests/fixture.twig          |  69 ++++++++++
 src/Utility/CommonOptionsTrait.php            |   5 +
 src/View/BakeTwigView.php                     | 128 ++++++++++++++++++
 .../Shell/Task/BakeTemplateTaskTest.php       |   3 +
 tests/bootstrap.php                           |   9 +-
 tests/test_app/App/Template/Bake/example.twig |   2 +
 .../src/Template/Bake/config/routes.twig      |   9 ++
 11 files changed, 252 insertions(+), 6 deletions(-)
 create mode 100644 src/Template/Bake/Layout/default.twig
 create mode 100644 src/Template/Bake/tests/fixture.twig
 create mode 100644 src/View/BakeTwigView.php
 create mode 100644 tests/test_app/App/Template/Bake/example.twig
 create mode 100644 tests/test_app/Plugin/TestBakeTheme/src/Template/Bake/config/routes.twig

diff --git a/.editorconfig b/.editorconfig
index 8eb4b0795..f84f04779 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,3 +14,6 @@ trim_trailing_whitespace = true
 [*.yml]
 indent_style = space
 indent_size = 2
+
+[*.twig]
+insert_final_newline = false
diff --git a/composer.json b/composer.json
index 13104d9af..439519e1c 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,8 @@
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^3.0",
-        "phpunit/phpunit": "~5.7 | ~6.0"
+        "phpunit/phpunit": "~5.7 | ~6.0",
+        "wyrihaximus/twig-view": "4.x-dev as 4.1"
     },
     "autoload": {
         "psr-4": {
@@ -39,6 +40,5 @@
             "Bake\\Test\\App\\": "tests/test_app/App",
             "Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
         }
-    },
-    "minimum-stability": "beta"
+    }
 }
diff --git a/src/Shell/Task/BakeTemplateTask.php b/src/Shell/Task/BakeTemplateTask.php
index 6a6a53e74..3843e2c8e 100644
--- a/src/Shell/Task/BakeTemplateTask.php
+++ b/src/Shell/Task/BakeTemplateTask.php
@@ -14,8 +14,8 @@
  */
 namespace Bake\Shell\Task;
 
-use Bake\View\BakeView;
 use Cake\Console\Shell;
+use Cake\Core\App;
 use Cake\Core\ConventionsTrait;
 use Cake\Event\Event;
 use Cake\Event\EventManager;
@@ -61,7 +61,11 @@ public function getView()
             ],
             'theme' => $theme
         ];
-        $view = new BakeView(new Request(), new Response(), null, $viewOptions);
+
+        $viewClass = isset($this->params['view-class']) ? $this->params['view-class'] : 'Bake.Bake';
+        $viewClass = App::className($viewClass, 'View', 'View');
+
+        $view = new $viewClass(new Request(), new Response(), null, $viewOptions);
         $event = new Event('Bake.initialize', $view);
         EventManager::instance()->dispatch($event);
         $this->View = $event->subject;
diff --git a/src/Template/Bake/Layout/default.twig b/src/Template/Bake/Layout/default.twig
new file mode 100644
index 000000000..5ffcffb57
--- /dev/null
+++ b/src/Template/Bake/Layout/default.twig
@@ -0,0 +1,16 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+{{ _view.fetch('content')|raw }}
\ No newline at end of file
diff --git a/src/Template/Bake/tests/fixture.twig b/src/Template/Bake/tests/fixture.twig
new file mode 100644
index 000000000..3e72753e3
--- /dev/null
+++ b/src/Template/Bake/tests/fixture.twig
@@ -0,0 +1,69 @@
+{#
+/**
+ * Fixture Template file
+ *
+ * Fixture Template used when baking fixtures with bake
+ *
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+namespace {{ namespace }}\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+/**
+ * {{ name }}Fixture
+ *
+ */
+class {{ name }}Fixture extends TestFixture
+{
+{% if table %}
+
+    /**
+     * Table name
+     *
+     * @var string
+     */
+    public $table = '{{ table }}';
+{% endif %}
+{% if import %}
+
+    /**
+     * Import
+     *
+     * @var array
+     */
+    public $import = {{ import }};
+{% endif %}
+{% if schema %}
+
+    /**
+     * Fields
+     *
+     * @var array
+     */
+    // @codingStandardsIgnoreStart
+    public $fields = {{ schema }};
+    // @codingStandardsIgnoreEnd
+{% endif %}
+{% if records %}
+
+    /**
+     * Records
+     *
+     * @var array
+     */
+    public $records = {{ records }};
+{% endif %}
+}
diff --git a/src/Utility/CommonOptionsTrait.php b/src/Utility/CommonOptionsTrait.php
index 739d5ad15..41d3bd809 100644
--- a/src/Utility/CommonOptionsTrait.php
+++ b/src/Utility/CommonOptionsTrait.php
@@ -52,6 +52,11 @@ protected function _setCommonOptions($parser)
             'help' => 'The theme to use when baking code.',
             'default' => Configure::read('Bake.theme'),
             'choices' => $bakeThemes
+        ])->addOption('view-class', [
+            'short' => 'v',
+            'help' => 'The view class to use baking code.',
+            'default' => Configure::read('Bake.viewClass') ?: 'Bake.Bake',
+            'choices' => ['Bake.Bake', 'Bake.BakeTwig'],
         ]);
 
         return $parser;
diff --git a/src/View/BakeTwigView.php b/src/View/BakeTwigView.php
new file mode 100644
index 000000000..555cfb82e
--- /dev/null
+++ b/src/View/BakeTwigView.php
@@ -0,0 +1,128 @@
+<?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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+namespace Bake\View;
+
+use Bake\View\Listener\TwigLoaderListener;
+use Cake\Core\Configure;
+use WyriHaximus\TwigView\Event\ConstructEvent;
+use WyriHaximus\TwigView\Lib\Twig\Extension\Inflector;
+use WyriHaximus\TwigView\View\TwigView;
+
+class BakeTwigView extends TwigView
+{
+    public function initialize()
+    {
+        $bakeTemplates = dirname(dirname(__FILE__)) . DS . 'Template' . DS;
+        $paths = (array)Configure::read('App.paths.templates');
+
+        if (!in_array($bakeTemplates, $paths)) {
+            $paths[] = $bakeTemplates;
+            Configure::write('App.paths.templates', $paths);
+        }
+
+        $this->loadHelper('Bake.Bake');
+        $this->loadHelper('Bake.DocBlock');
+
+        $this->getEventManager()->on(ConstructEvent::EVENT, function ($event) {
+            $event->getTwig()->addExtension(new Inflector);
+        });
+
+        parent::initialize();
+    }
+
+    /**
+     * Renders view for given view file and layout.
+     *
+     * Render triggers helper callbacks, which are fired before and after the view are rendered,
+     * as well as before and after the layout. The helper callbacks are called:
+     *
+     * - `beforeRender`
+     * - `afterRender`
+     *
+     * View names can point to plugin views/layouts. Using the `Plugin.view` syntax
+     * a plugin view/layout can be used instead of the app ones. If the chosen plugin is not found
+     * the view will be located along the regular view path cascade.
+     *
+     * View can also be a template string, rather than the name of a view file
+     *
+     * @param string|null $view Name of view file to use, or a template string to render
+     * @param string|null $layout Layout to use. Not used, for consistency with other views only
+     * @return string|null Rendered content.
+     * @throws \Cake\Core\Exception\Exception If there is an error in the view.
+     */
+    public function render($view = null, $layout = null)
+    {
+        $viewFileName = $this->_getViewFileName($view);
+        $templateEventName = str_replace(
+            ['.ctp', DS],
+            ['', '.'],
+            explode('Template' . DS . 'Bake' . DS, $viewFileName)[1]
+        );
+
+        $this->_currentType = static::TYPE_TEMPLATE;
+        $this->dispatchEvent('View.beforeRender', [$viewFileName]);
+        $this->dispatchEvent('View.beforeRender.' . $templateEventName, [$viewFileName]);
+        $this->Blocks->set('content', $this->_render($viewFileName));
+        $this->dispatchEvent('View.afterRender', [$viewFileName]);
+        $this->dispatchEvent('View.afterRender.' . $templateEventName, [$viewFileName]);
+
+        if ($layout === null) {
+            $layout = $this->layout;
+        }
+        if ($layout && $this->autoLayout) {
+            $this->Blocks->set('content', $this->renderLayout('', $layout));
+        }
+
+        return $this->Blocks->get('content');
+    }
+
+    /**
+     * Wrapper for creating and dispatching events.
+     *
+     * Use the Bake prefix for bake related view events
+     *
+     * @param string $name Name of the event.
+     * @param array|null $data Any value you wish to be transported with this event to
+     * it can be read by listeners.
+     *
+     * @param object|null $subject The object that this event applies to
+     * ($this by default).
+     *
+     * @return \Cake\Event\Event
+     */
+    public function dispatchEvent($name, $data = null, $subject = null)
+    {
+        $name = preg_replace('/^View\./', 'Bake.', $name);
+
+        return parent::dispatchEvent($name, $data, $subject);
+    }
+
+    /**
+     * Return all possible paths to find view files in order
+     *
+     * @param string $plugin Optional plugin name to scan for view files.
+     * @param bool $cached Set to false to force a refresh of view paths. Default true.
+     * @return array paths
+     */
+    protected function _paths($plugin = null, $cached = true)
+    {
+        $paths = parent::_paths($plugin, false);
+        foreach ($paths as &$path) {
+            $path .= 'Bake' . DS;
+        }
+
+        return $paths;
+    }
+}
diff --git a/tests/TestCase/Shell/Task/BakeTemplateTaskTest.php b/tests/TestCase/Shell/Task/BakeTemplateTaskTest.php
index 96a2e4511..efd3d5a6d 100644
--- a/tests/TestCase/Shell/Task/BakeTemplateTaskTest.php
+++ b/tests/TestCase/Shell/Task/BakeTemplateTaskTest.php
@@ -15,6 +15,7 @@
 namespace Bake\Test\TestCase\Shell\Task;
 
 use Bake\Test\TestCase\TestCase;
+use Cake\Core\Configure;
 use Cake\Core\Plugin;
 
 /**
@@ -45,6 +46,8 @@ public function setUp()
             ->setConstructorArgs([$io])
             ->getMock();
         ;
+
+        $this->Task->params['view-class'] = Configure::read('Bake.viewClass');
     }
 
     /**
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 0ae9852c1..ce786bde8 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -39,6 +39,7 @@
 define('ROOT', $root . DS . 'tests' . DS . 'test_app' . DS);
 define('APP', ROOT . 'App' . DS);
 define('TMP', sys_get_temp_dir() . DS);
+define('CACHE', TMP . 'cache' . DS);
 
 Configure::write('debug', true);
 Configure::write('App', [
@@ -46,14 +47,20 @@
     'paths' => [
         'plugins' => [ROOT . 'Plugin' . DS],
         'templates' => [ROOT . 'App' . DS . 'Template' . DS]
-    ]
+    ],
+    'encoding' => 'UTF-8'
 ]);
+Configure::write('Bake.viewClass', getenv('bake_class') ?: 'Bake.Bake');
 
 if (!getenv('db_dsn')) {
     putenv('db_dsn=sqlite:///:memory:');
 }
 ConnectionManager::config('test', ['url' => getenv('db_dsn')]);
 
+Plugin::load('WyriHaximus/TwigView', [
+    'bootstrap' => true,
+]);
+
 Plugin::load('Bake', [
     'path' => dirname(dirname(__FILE__)) . DS,
 ]);
diff --git a/tests/test_app/App/Template/Bake/example.twig b/tests/test_app/App/Template/Bake/example.twig
new file mode 100644
index 000000000..e3ca219ba
--- /dev/null
+++ b/tests/test_app/App/Template/Bake/example.twig
@@ -0,0 +1,2 @@
+I got rendered
+{{ test }}
\ No newline at end of file
diff --git a/tests/test_app/Plugin/TestBakeTheme/src/Template/Bake/config/routes.twig b/tests/test_app/Plugin/TestBakeTheme/src/Template/Bake/config/routes.twig
new file mode 100644
index 000000000..4def19ad0
--- /dev/null
+++ b/tests/test_app/Plugin/TestBakeTheme/src/Template/Bake/config/routes.twig
@@ -0,0 +1,9 @@
+<?php
+/**
+ * These are my routes. There are many like them but these are my own.
+ */
+use Cake\Routing\Router;
+
+Router::plugin('{{ plugin }}', function ($routes) {
+    $routes->fallbacks();
+});

From 0c65148361fc1653e5ff14ef52c41049ea824557 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 21 Oct 2017 01:10:27 +0530
Subject: [PATCH 02/44] Add twig templates for ControllerTask.

---
 src/Template/Bake/Controller/controller.twig  | 47 +++++++++++++++++++
 src/Template/Bake/Element/array_property.twig |  7 +++
 .../Shell/Task/ControllerTaskTest.php         |  2 +
 3 files changed, 56 insertions(+)
 create mode 100644 src/Template/Bake/Controller/controller.twig
 create mode 100644 src/Template/Bake/Element/array_property.twig

diff --git a/src/Template/Bake/Controller/controller.twig b/src/Template/Bake/Controller/controller.twig
new file mode 100644
index 000000000..eabc0c95e
--- /dev/null
+++ b/src/Template/Bake/Controller/controller.twig
@@ -0,0 +1,47 @@
+{#
+/**
+ * Controller bake template file
+ *
+ * Allows templating of Controllers generated from bake.
+ *
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+namespace {{ namespace }}\Controller{{ prefix }};
+
+use {{ namespace }}\Controller\AppController;
+
+/**
+ * {{ name }} Controller
+ *
+{% if defaultModel %}
+ * @property \{{ defaultModel }} ${{ name }}
+{% endif %}
+{% for component in components %}
+{% set classInfo = Bake.classInfo(component, 'Controller/Component', 'Component') %}
+ * @property {{ classInfo.fqn }} ${{ classInfo.name }}
+{% endfor %}
+{% if 'index' in actions %}
+ *
+ * @method \{{ namespace }}\Model\Entity\{{ entityClassName }}[] paginate($object = null, array $settings = [])
+{% endif %}
+ */
+class {{ name }}Controller extends AppController
+{
+{{ Bake.arrayProperty('helpers', helpers, {'indent': false})|raw }}
+{{ Bake.arrayProperty('components', components, {'indent': false})|raw }}
+{% for action in actions %}
+    {% element 'Controller/' ~ action %}
+{% endfor %}
+}
diff --git a/src/Template/Bake/Element/array_property.twig b/src/Template/Bake/Element/array_property.twig
new file mode 100644
index 000000000..d177d81a6
--- /dev/null
+++ b/src/Template/Bake/Element/array_property.twig
@@ -0,0 +1,7 @@
+
+    /**
+     * {{ name|humanize }}
+     *
+     * @var array
+     */
+    public ${{ name }} = [{{ Bake.stringifyList(value, {'indent': false})|raw }}];
\ No newline at end of file
diff --git a/tests/TestCase/Shell/Task/ControllerTaskTest.php b/tests/TestCase/Shell/Task/ControllerTaskTest.php
index cada7b3b8..ed72960a7 100644
--- a/tests/TestCase/Shell/Task/ControllerTaskTest.php
+++ b/tests/TestCase/Shell/Task/ControllerTaskTest.php
@@ -16,6 +16,7 @@
 
 use Bake\Shell\Task\BakeTemplateTask;
 use Bake\Test\TestCase\TestCase;
+use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\ORM\TableRegistry;
 use Cake\View\Helper;
@@ -64,6 +65,7 @@ public function setUp()
         $this->Task->connection = 'test';
 
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
 
         $this->Task->Model = $this->getMockBuilder('Bake\Shell\Task\ModelTask')
             ->setMethods(['in', 'out', 'err', 'createFile', '_stop'])

From c244431562f12b7276c5a922182730b002c7266d Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 21 Oct 2017 01:12:24 +0530
Subject: [PATCH 03/44] Add travis job to run tests using BakeTwig class.

---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e0368d061..159d90ceb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
-
-sudo: false
+  - 7.2
 
 cache:
   directories:
@@ -17,6 +16,7 @@ env:
     - DB=mysql db_dsn='mysql://root@127.0.0.1/cakephp_test'
     - DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
     - DB=sqlite db_dsn='sqlite:///:memory:'
+    - bake_class='Bake.BakeTwig'
   global:
     - RUN_TESTS=1
 
@@ -33,9 +33,8 @@ before_install:
   - if [[ $DB = 'mysql' ]]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi
   - if [[ $DB = 'pgsql' ]]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi
 
-  - phpenv rehash
-  - set +H
-  - composer update
+before_script:
+  - composer install --prefer-dist --no-interaction
 
 script:
   - if [[ $RUN_TESTS = 1 && $TRAVIS_PHP_VERSION != 7.* ]]; then vendor/bin/phpunit; fi

From 890523d81c88232b419e75ddc615e1dfdd482d86 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 21 Oct 2017 03:54:02 +0530
Subject: [PATCH 04/44] Add twig templates for Cell, Fixture, Mailer, Middlware
 tasks.

---
 src/Template/Bake/Mailer/mailer.twig          | 33 ++++++++++++++
 src/Template/Bake/Middleware/middleware.twig  | 40 +++++++++++++++++
 src/Template/Bake/View/cell.twig              | 43 +++++++++++++++++++
 src/Template/Bake/tests/fixture.twig          |  8 ++--
 tests/TestCase/Shell/Task/CellTaskTest.php    |  1 +
 tests/TestCase/Shell/Task/FixtureTaskTest.php |  2 +
 tests/TestCase/Shell/Task/MailerTaskTest.php  |  1 +
 .../Shell/Task/MiddlewareTaskTest.php         |  1 +
 8 files changed, 125 insertions(+), 4 deletions(-)
 create mode 100644 src/Template/Bake/Mailer/mailer.twig
 create mode 100644 src/Template/Bake/Middleware/middleware.twig
 create mode 100644 src/Template/Bake/View/cell.twig

diff --git a/src/Template/Bake/Mailer/mailer.twig b/src/Template/Bake/Mailer/mailer.twig
new file mode 100644
index 000000000..621e9d6fe
--- /dev/null
+++ b/src/Template/Bake/Mailer/mailer.twig
@@ -0,0 +1,33 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+namespace {{ namespace }}\Mailer;
+
+use Cake\Mailer\Mailer;
+
+/**
+ * {{ name }} mailer.
+ */
+class {{ name }}Mailer extends Mailer
+{
+
+    /**
+     * Mailer's name.
+     *
+     * @var string
+     */
+    static public $name = '{{ name }}';
+}
diff --git a/src/Template/Bake/Middleware/middleware.twig b/src/Template/Bake/Middleware/middleware.twig
new file mode 100644
index 000000000..7ef906852
--- /dev/null
+++ b/src/Template/Bake/Middleware/middleware.twig
@@ -0,0 +1,40 @@
+{#
+/**
+ * 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.3.6
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+namespace {{namespace }}\Middleware;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+/**
+ * {{ name }} middleware
+ */
+class {{ name }}Middleware
+{
+
+    /**
+     * Invoke method.
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request The request.
+     * @param \Psr\Http\Message\ResponseInterface $response The response.
+     * @param callable $next Callback to invoke the next middleware.
+     * @return \Psr\Http\Message\ResponseInterface A response
+     */
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, $next)
+    {
+        return $next($request, $response);
+    }
+}
diff --git a/src/Template/Bake/View/cell.twig b/src/Template/Bake/View/cell.twig
new file mode 100644
index 000000000..fa9e92be7
--- /dev/null
+++ b/src/Template/Bake/View/cell.twig
@@ -0,0 +1,43 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+namespace {{ namespace }}\View\Cell;
+
+use Cake\View\Cell;
+
+/**
+ * {{ name }} cell
+ */
+class {{ name }}Cell extends Cell
+{
+
+    /**
+     * List of valid options that can be passed into this
+     * cell's constructor.
+     *
+     * @var array
+     */
+    protected $_validCellOptions = [];
+
+    /**
+     * Default display method.
+     *
+     * @return void
+     */
+    public function display()
+    {
+    }
+}
diff --git a/src/Template/Bake/tests/fixture.twig b/src/Template/Bake/tests/fixture.twig
index 3e72753e3..7bce9bebd 100644
--- a/src/Template/Bake/tests/fixture.twig
+++ b/src/Template/Bake/tests/fixture.twig
@@ -35,7 +35,7 @@ class {{ name }}Fixture extends TestFixture
      *
      * @var string
      */
-    public $table = '{{ table }}';
+    public $table = '{{ table|raw }}';
 {% endif %}
 {% if import %}
 
@@ -44,7 +44,7 @@ class {{ name }}Fixture extends TestFixture
      *
      * @var array
      */
-    public $import = {{ import }};
+    public $import = {{ import|raw }};
 {% endif %}
 {% if schema %}
 
@@ -54,7 +54,7 @@ class {{ name }}Fixture extends TestFixture
      * @var array
      */
     // @codingStandardsIgnoreStart
-    public $fields = {{ schema }};
+    public $fields = {{ schema|raw }};
     // @codingStandardsIgnoreEnd
 {% endif %}
 {% if records %}
@@ -64,6 +64,6 @@ class {{ name }}Fixture extends TestFixture
      *
      * @var array
      */
-    public $records = {{ records }};
+    public $records = {{ records|raw }};
 {% endif %}
 }
diff --git a/tests/TestCase/Shell/Task/CellTaskTest.php b/tests/TestCase/Shell/Task/CellTaskTest.php
index 1cd931d07..358b07aaa 100644
--- a/tests/TestCase/Shell/Task/CellTaskTest.php
+++ b/tests/TestCase/Shell/Task/CellTaskTest.php
@@ -54,6 +54,7 @@ public function setUp()
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->initialize();
         $this->Task->BakeTemplate->interactive = false;
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
     }
 
     /**
diff --git a/tests/TestCase/Shell/Task/FixtureTaskTest.php b/tests/TestCase/Shell/Task/FixtureTaskTest.php
index c993cf809..19d251206 100644
--- a/tests/TestCase/Shell/Task/FixtureTaskTest.php
+++ b/tests/TestCase/Shell/Task/FixtureTaskTest.php
@@ -16,6 +16,7 @@
 
 use Bake\Shell\Task\BakeTemplateTask;
 use Bake\Test\TestCase\TestCase;
+use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\ORM\TableRegistry;
 
@@ -67,6 +68,7 @@ public function setUp()
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->interactive = false;
         $this->Task->BakeTemplate->initialize();
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
 
         $this->_compareBasePath = Plugin::path('Bake') . 'tests' . DS . 'comparisons' . DS . 'Fixture' . DS;
     }
diff --git a/tests/TestCase/Shell/Task/MailerTaskTest.php b/tests/TestCase/Shell/Task/MailerTaskTest.php
index ad3aa9e5c..e9a52e9f1 100644
--- a/tests/TestCase/Shell/Task/MailerTaskTest.php
+++ b/tests/TestCase/Shell/Task/MailerTaskTest.php
@@ -54,6 +54,7 @@ public function setUp()
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->initialize();
         $this->Task->BakeTemplate->interactive = false;
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
     }
 
     /**
diff --git a/tests/TestCase/Shell/Task/MiddlewareTaskTest.php b/tests/TestCase/Shell/Task/MiddlewareTaskTest.php
index 9972d2515..3180ac2bb 100644
--- a/tests/TestCase/Shell/Task/MiddlewareTaskTest.php
+++ b/tests/TestCase/Shell/Task/MiddlewareTaskTest.php
@@ -54,6 +54,7 @@ public function setUp()
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->initialize();
         $this->Task->BakeTemplate->interactive = false;
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
     }
 
     /**

From ba721d7cd8a0c328de37b1558c40d013292c4d25 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 21 Oct 2017 03:57:37 +0530
Subject: [PATCH 05/44] Add docblock

---
 src/View/BakeTwigView.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/View/BakeTwigView.php b/src/View/BakeTwigView.php
index 555cfb82e..eafd0412d 100644
--- a/src/View/BakeTwigView.php
+++ b/src/View/BakeTwigView.php
@@ -14,7 +14,6 @@
  */
 namespace Bake\View;
 
-use Bake\View\Listener\TwigLoaderListener;
 use Cake\Core\Configure;
 use WyriHaximus\TwigView\Event\ConstructEvent;
 use WyriHaximus\TwigView\Lib\Twig\Extension\Inflector;
@@ -22,6 +21,11 @@
 
 class BakeTwigView extends TwigView
 {
+    /**
+     * Initialize view
+     *
+     * @return void
+     */
     public function initialize()
     {
         $bakeTemplates = dirname(dirname(__FILE__)) . DS . 'Template' . DS;

From a871dbe9cefa2c75f39441bfd373671c34a9ba9e Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 21 Oct 2017 12:29:32 +0530
Subject: [PATCH 06/44] Add more twig templates.

---
 src/Template/Bake/Controller/component.twig   | 34 +++++++++++
 src/Template/Bake/Form/form.twig              | 60 +++++++++++++++++++
 src/Template/Bake/Plugin/README.md.twig       | 26 ++++++++
 .../Bake/Plugin/config/routes.php.twig        | 27 +++++++++
 .../Bake/Plugin/phpunit.xml.dist.twig         | 53 ++++++++++++++++
 .../src/Controller/AppController.php.twig     | 25 ++++++++
 .../Bake/Plugin/tests/bootstrap.php.twig      | 47 +++++++++++++++
 src/Template/Bake/Plugin/webroot/empty.twig   | 15 +++++
 src/Template/Bake/Shell/helper.twig           | 37 ++++++++++++
 src/Template/Bake/Shell/shell.twig            | 50 ++++++++++++++++
 src/Template/Bake/Shell/task.twig             | 34 +++++++++++
 src/Template/Bake/Template/add.twig           | 22 +++++++
 src/Template/Bake/Template/edit.twig          | 22 +++++++
 src/Template/Bake/Template/login.twig         | 31 ++++++++++
 src/Template/Bake/View/helper.twig            | 35 +++++++++++
 .../ModelTaskAssociationDetectionTest.php     |  1 +
 tests/TestCase/Shell/Task/ModelTaskTest.php   |  1 +
 tests/TestCase/Shell/Task/PluginTaskTest.php  |  1 +
 .../Shell/Task/SimpleBakeTaskTest.php         |  1 +
 tests/TestCase/Shell/Task/TaskTaskTest.php    |  1 +
 tests/TestCase/Shell/Task/TestTaskTest.php    |  1 +
 21 files changed, 524 insertions(+)
 create mode 100644 src/Template/Bake/Controller/component.twig
 create mode 100644 src/Template/Bake/Form/form.twig
 create mode 100644 src/Template/Bake/Plugin/README.md.twig
 create mode 100644 src/Template/Bake/Plugin/config/routes.php.twig
 create mode 100644 src/Template/Bake/Plugin/phpunit.xml.dist.twig
 create mode 100644 src/Template/Bake/Plugin/src/Controller/AppController.php.twig
 create mode 100644 src/Template/Bake/Plugin/tests/bootstrap.php.twig
 create mode 100644 src/Template/Bake/Plugin/webroot/empty.twig
 create mode 100644 src/Template/Bake/Shell/helper.twig
 create mode 100644 src/Template/Bake/Shell/shell.twig
 create mode 100644 src/Template/Bake/Shell/task.twig
 create mode 100644 src/Template/Bake/Template/add.twig
 create mode 100644 src/Template/Bake/Template/edit.twig
 create mode 100644 src/Template/Bake/Template/login.twig
 create mode 100644 src/Template/Bake/View/helper.twig

diff --git a/src/Template/Bake/Controller/component.twig b/src/Template/Bake/Controller/component.twig
new file mode 100644
index 000000000..65ba0b97f
--- /dev/null
+++ b/src/Template/Bake/Controller/component.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+namespace {{ namespace }}\Controller\Component;
+
+use Cake\Controller\Component;
+use Cake\Controller\ComponentRegistry;
+
+/**
+ * {{ name }} component
+ */
+class {{ name }}Component extends Component
+{
+
+    /**
+     * Default configuration.
+     *
+     * @var array
+     */
+    protected $_defaultConfig = [];
+}
diff --git a/src/Template/Bake/Form/form.twig b/src/Template/Bake/Form/form.twig
new file mode 100644
index 000000000..835c42c6e
--- /dev/null
+++ b/src/Template/Bake/Form/form.twig
@@ -0,0 +1,60 @@
+{#
+/**
+* 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         2.0.0
+* @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 modelless form
+     *
+     * @param \Cake\Form\Schema $schema From schema
+     * @return \Cake\Form\Schema
+     */
+    protected function _buildSchema(Schema $schema)
+    {
+        return $schema;
+    }
+
+    /**
+     * Form validation builder
+     *
+     * @param \Cake\Validation\Validator $validator to use against the form
+     * @return \Cake\Validation\Validator
+     */
+    protected function _buildValidator(Validator $validator)
+    {
+        return $validator;
+    }
+
+    /**
+     * Defines what to execute once the From is being processed
+     *
+     * @param array $data Form data.
+     * @return bool
+     */
+    protected function _execute(array $data)
+    {
+        return true;
+    }
+}
diff --git a/src/Template/Bake/Plugin/README.md.twig b/src/Template/Bake/Plugin/README.md.twig
new file mode 100644
index 000000000..8ede8ffc0
--- /dev/null
+++ b/src/Template/Bake/Plugin/README.md.twig
@@ -0,0 +1,26 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+# {{ plugin }} plugin for CakePHP
+
+## Installation
+
+You can install this plugin into your CakePHP application using [composer](http://getcomposer.org).
+
+The recommended way to install composer packages is:
+
+```
+composer require {{ package }}
+```
diff --git a/src/Template/Bake/Plugin/config/routes.php.twig b/src/Template/Bake/Plugin/config/routes.php.twig
new file mode 100644
index 000000000..30c802010
--- /dev/null
+++ b/src/Template/Bake/Plugin/config/routes.php.twig
@@ -0,0 +1,27 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+use Cake\Routing\RouteBuilder;
+use Cake\Routing\Router;
+use Cake\Routing\Route\DashedRoute;
+
+Router::plugin(
+    '{{ plugin }}',
+    ['path' => '/{{ routePath }}'],
+    function (RouteBuilder $routes) {
+        $routes->fallbacks(DashedRoute::class);
+    }
+);
diff --git a/src/Template/Bake/Plugin/phpunit.xml.dist.twig b/src/Template/Bake/Plugin/phpunit.xml.dist.twig
new file mode 100644
index 000000000..bd3feb5a5
--- /dev/null
+++ b/src/Template/Bake/Plugin/phpunit.xml.dist.twig
@@ -0,0 +1,53 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    colors="true"
+    processIsolation="false"
+    stopOnFailure="false"
+    syntaxCheck="false"
+    bootstrap="./tests/bootstrap.php"
+    >
+    <php>
+        <ini name="memory_limit" value="-1"/>
+        <ini name="apc.enable_cli" value="1"/>
+    </php>
+
+    <!-- Add any additional test suites you want to run here -->
+    <testsuites>
+        <testsuite name="{{ plugin }} Test Suite">
+            <directory>./tests/TestCase</directory>
+        </testsuite>
+    </testsuites>
+
+    <!-- Setup a listener for fixtures -->
+    <listeners>
+        <listener
+        class="\Cake\TestSuite\Fixture\FixtureInjector"
+        file="./vendor/cakephp/cakephp/src/TestSuite/Fixture/FixtureInjector.php">
+            <arguments>
+                <object class="\Cake\TestSuite\Fixture\FixtureManager" />
+            </arguments>
+        </listener>
+    </listeners>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src/</directory>
+        </whitelist>
+    </filter>
+
+</phpunit>
diff --git a/src/Template/Bake/Plugin/src/Controller/AppController.php.twig b/src/Template/Bake/Plugin/src/Controller/AppController.php.twig
new file mode 100644
index 000000000..d06ea6823
--- /dev/null
+++ b/src/Template/Bake/Plugin/src/Controller/AppController.php.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+
+namespace {{ namespace }}\Controller;
+
+use {{ baseNamespace }}\Controller\AppController as BaseController;
+
+class AppController extends BaseController
+{
+
+}
diff --git a/src/Template/Bake/Plugin/tests/bootstrap.php.twig b/src/Template/Bake/Plugin/tests/bootstrap.php.twig
new file mode 100644
index 000000000..32ca2be72
--- /dev/null
+++ b/src/Template/Bake/Plugin/tests/bootstrap.php.twig
@@ -0,0 +1,47 @@
+{#
+/**
+ * Tests bootstrap file
+ *
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+/**
+ * Test suite bootstrap for {{ plugin }}.
+ *
+ * This function is used to find the location of CakePHP whether CakePHP
+ * has been installed as a dependency of the plugin, or the plugin is itself
+ * installed as a dependency of an application.
+ */
+$findRoot = function ($root) {
+    do {
+        $lastRoot = $root;
+        $root = dirname($root);
+        if (is_dir($root . '/vendor/cakephp/cakephp')) {
+            return $root;
+        }
+    } while ($root !== $lastRoot);
+
+    throw new Exception("Cannot find the root of the application, unable to run tests");
+};
+$root = $findRoot(__FILE__);
+unset($findRoot);
+
+chdir($root);
+
+if (file_exists($root . '/config/bootstrap.php')) {
+    require $root . '/config/bootstrap.php';
+
+    return;
+}
+require $root . '/vendor/cakephp/cakephp/tests/bootstrap.php';
diff --git a/src/Template/Bake/Plugin/webroot/empty.twig b/src/Template/Bake/Plugin/webroot/empty.twig
new file mode 100644
index 000000000..69fe6e5ba
--- /dev/null
+++ b/src/Template/Bake/Plugin/webroot/empty.twig
@@ -0,0 +1,15 @@
+{#
+/**
+ * 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         0.1.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
\ No newline at end of file
diff --git a/src/Template/Bake/Shell/helper.twig b/src/Template/Bake/Shell/helper.twig
new file mode 100644
index 000000000..a9284d560
--- /dev/null
+++ b/src/Template/Bake/Shell/helper.twig
@@ -0,0 +1,37 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+namespace {{ namespace }}\Shell\Helper;
+
+use Cake\Console\Helper;
+
+/**
+ * {{ name }} shell helper.
+ */
+class {{ name }}Helper extends Helper
+{
+
+    /**
+     * Output method.
+     *
+     * Generate the output for this shell helper.
+     *
+     * @return void
+     */
+    public function output($args)
+    {
+    }
+}
diff --git a/src/Template/Bake/Shell/shell.twig b/src/Template/Bake/Shell/shell.twig
new file mode 100644
index 000000000..037428876
--- /dev/null
+++ b/src/Template/Bake/Shell/shell.twig
@@ -0,0 +1,50 @@
+{#
+/**
+ * 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         0.1.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+namespace {{ namespace }}\Shell;
+
+use Cake\Console\Shell;
+
+/**
+ * {{ name }} shell command.
+ */
+class {{ name }}Shell extends Shell
+{
+
+    /**
+     * Manage the available sub-commands along with their arguments and help
+     *
+     * @see http://book.cakephp.org/3.0/en/console-and-shells.html#configuring-options-and-generating-help
+     *
+     * @return \Cake\Console\ConsoleOptionParser
+     */
+    public function getOptionParser()
+    {
+        $parser = parent::getOptionParser();
+
+        return $parser;
+    }
+
+    /**
+     * main() method.
+     *
+     * @return bool|int|null Success or error code.
+     */
+    public function main()
+    {
+        $this->out($this->OptionParser->help());
+    }
+}
diff --git a/src/Template/Bake/Shell/task.twig b/src/Template/Bake/Shell/task.twig
new file mode 100644
index 000000000..7e7804ce9
--- /dev/null
+++ b/src/Template/Bake/Shell/task.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * 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
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+namespace {{ namespace }}\Shell\Task;
+
+use Cake\Console\Shell;
+
+/**
+ * {{ name }} shell task.
+ */
+class {{ name }}Task extends Shell
+{
+
+    /**
+     * main() method.
+     *
+     * @return bool|int|null Success or error code.
+     */
+    public function main()
+    {
+    }
+}
diff --git a/src/Template/Bake/Template/add.twig b/src/Template/Bake/Template/add.twig
new file mode 100644
index 000000000..de628d0e9
--- /dev/null
+++ b/src/Template/Bake/Template/add.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+/**
+ * @var \{{ namespace }}\View\AppView $this
+ * @var \{{ entityClass }} ${{ singularVar }}
+ */
+?>
+{{ element 'form' }}
diff --git a/src/Template/Bake/Template/edit.twig b/src/Template/Bake/Template/edit.twig
new file mode 100644
index 000000000..eab98d3fa
--- /dev/null
+++ b/src/Template/Bake/Template/edit.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * 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         0.1.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+/**
+ * @var \{{ namespace }}\View\AppView $this
+ * @var \{{ entityClass }} ${{ singularVar }}
+ */
+?>
+{{ element 'form' }}
diff --git a/src/Template/Bake/Template/login.twig b/src/Template/Bake/Template/login.twig
new file mode 100644
index 000000000..7b03c8cff
--- /dev/null
+++ b/src/Template/Bake/Template/login.twig
@@ -0,0 +1,31 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+/**
+ * @var \{{ namespace }}\View\AppView $this
+ */
+?>
+<div class="{{ pluralVar }} form">
+<?= $this->Flash->render('auth') ?>
+    <?= $this->Form->create() ?>
+    <fieldset>
+        <legend><?= __('Please enter your username and password') ?></legend>
+        <?= $this->Form->control('username') ?>
+        <?= $this->Form->control('password') ?>
+    </fieldset>
+    <?= $this->Form->button(__('Login')); ?>
+    <?= $this->Form->end() ?>
+</div>
diff --git a/src/Template/Bake/View/helper.twig b/src/Template/Bake/View/helper.twig
new file mode 100644
index 000000000..cddf60aac
--- /dev/null
+++ b/src/Template/Bake/View/helper.twig
@@ -0,0 +1,35 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+namespace {{ namespace }}\View\Helper;
+
+use Cake\View\Helper;
+use Cake\View\View;
+
+/**
+ * {{ name }} helper
+ */
+class {{ name }}Helper extends Helper
+{
+
+    /**
+     * Default configuration.
+     *
+     * @var array
+     */
+    protected $_defaultConfig = [];
+
+}
diff --git a/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php b/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php
index ed2ae8b42..4a0f56bf0 100644
--- a/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php
+++ b/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php
@@ -66,6 +66,7 @@ public function setUp()
             ->getMock();
 
         $this->Task->connection = 'default';
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
         $this->_setupOtherMocks();
         TableRegistry::clear();
     }
diff --git a/tests/TestCase/Shell/Task/ModelTaskTest.php b/tests/TestCase/Shell/Task/ModelTaskTest.php
index 1610cf535..06432e385 100644
--- a/tests/TestCase/Shell/Task/ModelTaskTest.php
+++ b/tests/TestCase/Shell/Task/ModelTaskTest.php
@@ -80,6 +80,7 @@ public function setUp()
             ->getMock();
 
         $this->Task->connection = 'test';
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
         $this->_setupOtherMocks();
         TableRegistry::clear();
     }
diff --git a/tests/TestCase/Shell/Task/PluginTaskTest.php b/tests/TestCase/Shell/Task/PluginTaskTest.php
index c79d64f1c..9dd553b04 100644
--- a/tests/TestCase/Shell/Task/PluginTaskTest.php
+++ b/tests/TestCase/Shell/Task/PluginTaskTest.php
@@ -59,6 +59,7 @@ public function setUp()
 
         $this->Task->BakeTemplate = new BakeTemplateTask($this->io);
         $this->Task->BakeTemplate->interactive = false;
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
 
         $this->Task->path = TMP . 'tests' . DS . 'BakedPlugins' . DS;
         new Folder($this->Task->path, true);
diff --git a/tests/TestCase/Shell/Task/SimpleBakeTaskTest.php b/tests/TestCase/Shell/Task/SimpleBakeTaskTest.php
index 229dbb963..bd3bbb311 100644
--- a/tests/TestCase/Shell/Task/SimpleBakeTaskTest.php
+++ b/tests/TestCase/Shell/Task/SimpleBakeTaskTest.php
@@ -54,6 +54,7 @@ public function setUp()
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->initialize();
         $this->Task->BakeTemplate->interactive = false;
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
 
         $this->Task->pathFragment = 'Model/Behavior/';
 
diff --git a/tests/TestCase/Shell/Task/TaskTaskTest.php b/tests/TestCase/Shell/Task/TaskTaskTest.php
index ffbc587eb..25e10fc10 100644
--- a/tests/TestCase/Shell/Task/TaskTaskTest.php
+++ b/tests/TestCase/Shell/Task/TaskTaskTest.php
@@ -54,6 +54,7 @@ public function setUp()
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->initialize();
         $this->Task->BakeTemplate->interactive = false;
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
     }
 
     /**
diff --git a/tests/TestCase/Shell/Task/TestTaskTest.php b/tests/TestCase/Shell/Task/TestTaskTest.php
index b08a71a4c..a0808fd69 100644
--- a/tests/TestCase/Shell/Task/TestTaskTest.php
+++ b/tests/TestCase/Shell/Task/TestTaskTest.php
@@ -75,6 +75,7 @@ public function setUp()
         $this->Task->name = 'Test';
         $this->Task->BakeTemplate = new BakeTemplateTask($this->io);
         $this->Task->BakeTemplate->interactive = false;
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
     }
 
     /**

From 4bcbc07cb0d1f88b6b745dc2054590990572e8ac Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 21 Oct 2017 13:14:11 +0530
Subject: [PATCH 07/44] Fix tests.

---
 tests/TestCase/Shell/BakeShellTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/TestCase/Shell/BakeShellTest.php b/tests/TestCase/Shell/BakeShellTest.php
index 9fe6febb6..7301e8cbc 100644
--- a/tests/TestCase/Shell/BakeShellTest.php
+++ b/tests/TestCase/Shell/BakeShellTest.php
@@ -149,6 +149,7 @@ public function testMain()
             '- task',
             '- template',
             '- test',
+            '- twig_template',
             '',
             'By using <info>`cake bake [name]`</info> you can invoke a specific bake task.',
         ];
@@ -203,7 +204,8 @@ public function testLoadTasksCoreAndApp()
             'Bake.Test',
             'Bake.Template',
             'Controller',
-            'CustomController'
+            'CustomController',
+            'WyriHaximus/TwigView.TwigTemplate',
         ];
         sort($this->Shell->tasks);
         sort($expected);

From 7fd68de5e71be5c50185d11f350f3f781c087b07 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 21 Oct 2017 18:01:39 +0530
Subject: [PATCH 08/44] Load all available twig extensions.

---
 src/View/BakeTwigView.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/View/BakeTwigView.php b/src/View/BakeTwigView.php
index eafd0412d..42c9bd860 100644
--- a/src/View/BakeTwigView.php
+++ b/src/View/BakeTwigView.php
@@ -16,6 +16,7 @@
 
 use Cake\Core\Configure;
 use WyriHaximus\TwigView\Event\ConstructEvent;
+use WyriHaximus\TwigView\Event\ExtensionsListener;
 use WyriHaximus\TwigView\Lib\Twig\Extension\Inflector;
 use WyriHaximus\TwigView\View\TwigView;
 
@@ -39,9 +40,7 @@ public function initialize()
         $this->loadHelper('Bake.Bake');
         $this->loadHelper('Bake.DocBlock');
 
-        $this->getEventManager()->on(ConstructEvent::EVENT, function ($event) {
-            $event->getTwig()->addExtension(new Inflector);
-        });
+        $this->getEventManager()->on(new ExtensionsListener());
 
         parent::initialize();
     }

From e5672d63ae1a12621fe911343f057293fe8b4542 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 21 Oct 2017 21:34:45 +0530
Subject: [PATCH 09/44] Fix test.

---
 tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php b/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php
index 4a0f56bf0..ccced4ceb 100644
--- a/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php
+++ b/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php
@@ -66,7 +66,6 @@ public function setUp()
             ->getMock();
 
         $this->Task->connection = 'default';
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
         $this->_setupOtherMocks();
         TableRegistry::clear();
     }
@@ -109,6 +108,7 @@ protected function _setupOtherMocks()
             ->getMock();
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->interactive = false;
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
 
         $this->Task->name = 'Model';
     }

From 5145ee31cdc04f197e796bb70e60e9da63423e3a Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 21 Oct 2017 21:38:25 +0530
Subject: [PATCH 10/44] Fix tests.

---
 tests/TestCase/Shell/Task/ModelTaskTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestCase/Shell/Task/ModelTaskTest.php b/tests/TestCase/Shell/Task/ModelTaskTest.php
index 06432e385..f090f2e9b 100644
--- a/tests/TestCase/Shell/Task/ModelTaskTest.php
+++ b/tests/TestCase/Shell/Task/ModelTaskTest.php
@@ -80,7 +80,6 @@ public function setUp()
             ->getMock();
 
         $this->Task->connection = 'test';
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
         $this->_setupOtherMocks();
         TableRegistry::clear();
     }
@@ -123,6 +122,7 @@ protected function _setupOtherMocks()
             ->getMock();
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->interactive = false;
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
 
         $this->Task->name = 'Model';
     }

From 57ed3810e49497e2c7884b8b1c62fa64fa1f1dce Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sat, 21 Oct 2017 22:49:28 +0530
Subject: [PATCH 11/44] Add more twig templates.

---
 src/Template/Bake/Element/form.twig   |  72 ++++++++++++++++++
 src/Template/Bake/Model/behavior.twig |  34 +++++++++
 src/Template/Bake/Model/entity.twig   |  72 ++++++++++++++++++
 src/Template/Bake/Template/index.twig | 102 ++++++++++++++++++++++++++
 src/View/Helper/BakeHelper.php        |  32 ++++++++
 5 files changed, 312 insertions(+)
 create mode 100644 src/Template/Bake/Element/form.twig
 create mode 100644 src/Template/Bake/Model/behavior.twig
 create mode 100644 src/Template/Bake/Model/entity.twig
 create mode 100644 src/Template/Bake/Template/index.twig

diff --git a/src/Template/Bake/Element/form.twig b/src/Template/Bake/Element/form.twig
new file mode 100644
index 000000000..320072f35
--- /dev/null
+++ b/src/Template/Bake/Element/form.twig
@@ -0,0 +1,72 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+{% set fields = Bake.filterFields(fields, schema) %}
+<nav class="large-3 medium-4 columns" id="actions-sidebar">
+    <ul class="side-nav">
+        <li class="heading"><?= __('Actions') ?></li>
+{% if action|strpos('add') is false) }}
+        <li><?= $this->Form->postLink(
+                __('Delete'),
+                ['action' => 'delete', ${{ singularVar }}->{{ primaryKey.0 }}],
+                ['confirm' => __('Are you sure you want to delete # {0}?', ${{ singularVar }}->{{ primaryKey.0 }})]
+            )
+        ?></li>
+{{ endif }}
+        <li><?= $this->Html->link(__('List {{ pluralHumanName }}'), ['action' => 'index']) ?></li>
+{% set done = [] %}
+{% for type, data in associations %}
+{% for alias, details in data %}
+{% if details.controller != _view.name && done not in details.controller %}
+        <li><?= $this->Html->link(__('List {{ _view._pluralHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'index']) ?></li>
+        <li><?= $this->Html->link(__('New {{ _view._singularHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'add']) ?></li>
+{% done|push(details.controller) %}
+{% endif %}
+{% endfor %}
+{% endfor %}
+    </ul>
+</nav>
+<div class="{{ pluralVar }} form large-9 medium-8 columns content">
+    <?= $this->Form->create(${{ singularVar }}) ?>
+    <fieldset>
+        <legend><?= __('{{ action|humanize }} {{ singularHumanName }}') ?></legend>
+        <?php
+{% for field in fields if field in primaryKey %}
+{% if keyFields.field %}
+{% set fieldData = Bake.fieldData(field, schema) %}
+{% if fieldData.null %}
+            echo $this->Form->control('{{ field }}', ['options' => ${{ keyFields.field }}, 'empty' => true]);
+{% else %}
+            echo $this->Form->control('{{ field }}', ['options' => ${{ keyFields.field }}]);
+{% endif %}
+{% elseif field in ['created', 'modified', 'updated'] %}
+{% set fieldData = Bake.fieldData(field, schema) %}
+{% if fieldData.type|in_array(['date', 'datetime', 'time']) and fieldData.null %}
+            echo $this->Form->control('{{ field }}', ['empty' => true]);
+{% else %}
+            echo $this->Form->control('{{ field }}');
+{% endif %}
+{% endif %}
+{% endfor %}
+{% if associations.BelongsToMany %}
+{% for assocName, assocData in associations.BelongsToMany %}
+            echo $this->Form->control('{{ assocData.property }}._ids', ['options' => ${{ assocData.variable }}]);
+{% endfor %}
+{% endif %}
+        ?>
+    </fieldset>
+    <?= $this->Form->button(__('Submit')) ?>
+    <?= $this->Form->end() ?>
+</div>
diff --git a/src/Template/Bake/Model/behavior.twig b/src/Template/Bake/Model/behavior.twig
new file mode 100644
index 000000000..3f42750ca
--- /dev/null
+++ b/src/Template/Bake/Model/behavior.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+namespace {{ namespace }}\Model\Behavior;
+
+use Cake\ORM\Behavior;
+use Cake\ORM\Table;
+
+/**
+ * {{ name }} behavior
+ */
+class {{ name }}Behavior extends Behavior
+{
+
+    /**
+     * Default configuration.
+     *
+     * @var array
+     */
+    protected $_defaultConfig = [];
+}
diff --git a/src/Template/Bake/Model/entity.twig b/src/Template/Bake/Model/entity.twig
new file mode 100644
index 000000000..7bb8dc7ae
--- /dev/null
+++ b/src/Template/Bake/Model/entity.twig
@@ -0,0 +1,72 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+{% set propertyHintMap = DocBlock.buildEntityPropertyHintTypeMap(propertySchema ?: []) %}
+{% set associationHintMap = DocBlock.buildEntityAssociationHintTypeMap(propertySchema ?: []) %}
+{% set annotations = DocBlock.propertyHints(propertyHintMap) %}
+
+{% if associationHintMap %}
+{% annotations|push('') %}
+{% set annotations = annotations|merge(DocBlock.propertyHints(associationHintMap)) %}
+{% endif %}
+
+{% set accessible = [] %}
+
+{% if fields %}
+{% for field in fields %}
+{% set accessible.field = 'true' %}
+{% endfor %}
+{% endif %}
+
+{% if fields and primaryKey %}
+{% set accessible['*'] = 'true' %}
+{% for field in primaryKey %}
+{% set accessible.field = 'false' %}
+{% endfor %}
+{% endif %}
+<?php
+namespace {{ namespace }}\Model\Entity;
+
+use Cake\ORM\Entity;
+
+{{ DocBlock.classDescription(name, 'Entity', $annotations)|raw }}
+class {{ name }} extends Entity
+{
+{% if accessible %}
+
+    /**
+     * Fields that can be mass assigned using newEntity() or patchEntity().
+     *
+     * Note that when '*' is set to true, this allows all unspecified fields to
+     * be mass assigned. For security purposes, it is advised to set '*' to false
+     * (or remove it), and explicitly make individual fields accessible as needed.
+     *
+     * @var array
+     */
+    protected $_accessible = [{{ Bake.stringifyList(accessible, ['quotes' => false])|raw }}];
+{% endif %}
+{% if hidden %}
+
+    /**
+     * Fields that are excluded from JSON versions of the entity.
+     *
+     * @var array
+     */
+    protected $_hidden = [{{ Bake.stringifyList(hidden) }}];
+{% endif %}
+{% if not accessible and not hidden %}
+
+{% endif %}
+}
diff --git a/src/Template/Bake/Template/index.twig b/src/Template/Bake/Template/index.twig
new file mode 100644
index 000000000..b1edbc22d
--- /dev/null
+++ b/src/Template/Bake/Template/index.twig
@@ -0,0 +1,102 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+/**
+ * @var \{{ namespace }}\View\AppView $this
+ * @var \{{ entityClass }}[]|\Cake\Collection\CollectionInterface ${{ pluralVar }}
+ */
+?>
+{% set fields = Bake.filterFields(fields, schema, indexColumns, ['binary', 'text']) %}
+<nav class="large-3 medium-4 columns" id="actions-sidebar">
+    <ul class="side-nav">
+        <li class="heading"><?= __('Actions') ?></li>
+        <li><?= $this->Html->link(__('New {{ singularHumanName }}'), ['action' => 'add']) ?></li>
+{% set done = [] %}
+{% for type, data in associations %}
+{% for alias, details in data %}
+{% if details.navLink and details.controller != _view.name and details.controller not in done %}
+        <li><?= $this->Html->link(__('List {{ _view._pluralHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'index']) ?></li>
+        <li><?= $this->Html->link(__('New {{ _view._singularHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'add']) ?></li>
+{% done|push(details.controller) %}
+{% endif %}
+{% endfor %}
+{% endfor %}
+    </ul>
+</nav>
+<div class="{{ pluralVar }} index large-9 medium-8 columns content">
+    <h3><?= __('{{ pluralHumanName }}') ?></h3>
+    <table cellpadding="0" cellspacing="0">
+        <thead>
+            <tr>
+{% for field in fields %}
+                <th scope="col"><?= $this->Paginator->sort('{{ field }}') ?></th>
+{% endfor %}
+                <th scope="col" class="actions"><?= __('Actions') ?></th>
+            </tr>
+        </thead>
+        <tbody>
+            <?php foreach (${{ pluralVar }} as ${{ singularVar }}): ?>
+            <tr>
+{% for field in fields %}
+{% set isKey = false %}
+{% if associations.BelongsTo %}
+{% for alias, details in associations.BelongsTo %}
+<%
+                    if ($field === $details['foreignKey']) {
+                        $isKey = true;
+%>
+                <td><?= ${{ singularVar }}->has('<%= $details['property'] %>') ? $this->Html->link(${{ singularVar }}-><%= $details['property'] %>->{{ details.displayField }}, ['controller' => '{{ details.controller }}', 'action' => 'view', ${{ singularVar }}-><%= $details['property'] %>-><%= $details['primaryKey'][0] %>]) : '' ?></td>
+<%
+                        break;
+                    }
+%>
+{% endfor %}
+{% endif %}
+{% if isKey is not true %}
+<%
+                if (!in_array($schema->columnType($field), ['integer', 'float', 'decimal', 'biginteger', 'smallinteger', 'tinyinteger'])) {
+%>
+                <td><?= h(${{ singularVar }}->{{ field }}) ?></td>
+<%
+                } else {
+%>
+                <td><?= $this->Number->format(${{ singularVar }}->{{ field }}) ?></td>
+<%
+                }
+%>
+{% endif %}
+{% endfor %}
+{% set pk '$' ~ singularVar ~ '->' ~ primaryKey.0 %}
+                <td class="actions">
+                    <?= $this->Html->link(__('View'), ['action' => 'view', {{ pk }}]) ?>
+                    <?= $this->Html->link(__('Edit'), ['action' => 'edit', {{ pk }}]) ?>
+                    <?= $this->Form->postLink(__('Delete'), ['action' => 'delete', {{ pk }}], ['confirm' => __('Are you sure you want to delete # {0}?', {{ pk }})]) ?>
+                </td>
+            </tr>
+            <?php endforeach; ?>
+        </tbody>
+    </table>
+    <div class="paginator">
+        <ul class="pagination">
+            <?= $this->Paginator->first('<< ' . __('first')) ?>
+            <?= $this->Paginator->prev('< ' . __('previous')) ?>
+            <?= $this->Paginator->numbers() ?>
+            <?= $this->Paginator->next(__('next') . ' >') ?>
+            <?= $this->Paginator->last(__('last') . ' >>') ?>
+        </ul>
+        <p><?= $this->Paginator->counter(['format' => __('Page {{page}} of {{pages}}, showing {{current}} record(s) out of {{count}} total')]) ?></p>
+    </div>
+</div>
diff --git a/src/View/Helper/BakeHelper.php b/src/View/Helper/BakeHelper.php
index b33e56709..053f4f6bd 100644
--- a/src/View/Helper/BakeHelper.php
+++ b/src/View/Helper/BakeHelper.php
@@ -162,6 +162,38 @@ public function classInfo($class, $type, $suffix)
         ];
     }
 
+    /**
+     * Return list of fields to generate controls for.
+     *
+     * @param array $fields Fields list.
+     * @param \Cake\Datasource\SchemaInterface $schema Schema instance.
+     * @return \Cake\Collection\CollectionInterface
+     */
+    public function filterFields($fields, $schema, $takeFields = [], $filterTypes = ['binary'])
+    {
+        $fields = collection($fields)
+            ->filter(function ($field) use ($schema) {
+                return !in_array($schema->columnType($field), ['binary', 'text']);
+            });
+
+        if (isset($modelObject) && $modelObject->hasBehavior('Tree')) {
+            $fields = $fields->reject(function ($field) {
+                return $field === 'lft' || $field === 'rght';
+            });
+        }
+
+        if (!empty($takeFields)) {
+            $fields = $fields->take($takeFields);
+        }
+
+        return $fields;
+    }
+
+    public function fieldData($field, $schema)
+    {
+        return $schema->column($field);
+    }
+
     /**
      * To be mocked elsewhere...
      *

From a99a9b4ecac225f4f2fa3ea34ca38734a76dc97b Mon Sep 17 00:00:00 2001
From: Cees-Jan Kiewiet <ceesjank@gmail.com>
Date: Sat, 21 Oct 2017 21:52:10 +0200
Subject: [PATCH 12/44] Added missing TokenParsersListener listener for element

---
 src/View/BakeTwigView.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/View/BakeTwigView.php b/src/View/BakeTwigView.php
index 42c9bd860..8b8b023a3 100644
--- a/src/View/BakeTwigView.php
+++ b/src/View/BakeTwigView.php
@@ -17,6 +17,7 @@
 use Cake\Core\Configure;
 use WyriHaximus\TwigView\Event\ConstructEvent;
 use WyriHaximus\TwigView\Event\ExtensionsListener;
+use WyriHaximus\TwigView\Event\TokenParsersListener;
 use WyriHaximus\TwigView\Lib\Twig\Extension\Inflector;
 use WyriHaximus\TwigView\View\TwigView;
 
@@ -41,6 +42,7 @@ public function initialize()
         $this->loadHelper('Bake.DocBlock');
 
         $this->getEventManager()->on(new ExtensionsListener());
+        $this->getEventManager()->on(new TokenParsersListener());
 
         parent::initialize();
     }

From abfdc5b648ebcd884636b3c36028d3acb9225627 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 09:57:15 +0530
Subject: [PATCH 13/44] Load TwigView plugin in TestCase::setUp().

The global event manager instance is reset before each test hence
the plugin has to be laoded later to ensure TwigView's listeners
set in it's bootstrap are not lost.
---
 src/View/BakeTwigView.php   |  7 -------
 tests/TestCase/TestCase.php | 12 ++++++++++++
 tests/bootstrap.php         |  4 ----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/View/BakeTwigView.php b/src/View/BakeTwigView.php
index 8b8b023a3..f69e2fd65 100644
--- a/src/View/BakeTwigView.php
+++ b/src/View/BakeTwigView.php
@@ -15,10 +15,6 @@
 namespace Bake\View;
 
 use Cake\Core\Configure;
-use WyriHaximus\TwigView\Event\ConstructEvent;
-use WyriHaximus\TwigView\Event\ExtensionsListener;
-use WyriHaximus\TwigView\Event\TokenParsersListener;
-use WyriHaximus\TwigView\Lib\Twig\Extension\Inflector;
 use WyriHaximus\TwigView\View\TwigView;
 
 class BakeTwigView extends TwigView
@@ -41,9 +37,6 @@ public function initialize()
         $this->loadHelper('Bake.Bake');
         $this->loadHelper('Bake.DocBlock');
 
-        $this->getEventManager()->on(new ExtensionsListener());
-        $this->getEventManager()->on(new TokenParsersListener());
-
         parent::initialize();
     }
 
diff --git a/tests/TestCase/TestCase.php b/tests/TestCase/TestCase.php
index 8dd970885..1e94c5535 100644
--- a/tests/TestCase/TestCase.php
+++ b/tests/TestCase/TestCase.php
@@ -14,6 +14,7 @@
  */
 namespace Bake\Test\TestCase;
 
+use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\TestSuite\StringCompareTrait;
 use Cake\TestSuite\TestCase as ParentTestCase;
@@ -22,6 +23,17 @@ abstract class TestCase extends ParentTestCase
 {
     use StringCompareTrait;
 
+    public function setUp()
+    {
+        parent::setUp();
+
+        if (Configure::read('Bake.viewClass') === 'Bake.BakeTwig') {
+            Plugin::load('WyriHaximus/TwigView', [
+                'bootstrap' => true,
+            ]);
+        }
+    }
+
     /**
      * Load a plugin from the tests folder, and add to the autoloader
      *
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index ce786bde8..a29e0268c 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -57,10 +57,6 @@
 }
 ConnectionManager::config('test', ['url' => getenv('db_dsn')]);
 
-Plugin::load('WyriHaximus/TwigView', [
-    'bootstrap' => true,
-]);
-
 Plugin::load('Bake', [
     'path' => dirname(dirname(__FILE__)) . DS,
 ]);

From 860883fd1f5953a58edc4466a2ffeced895f73d2 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 11:46:28 +0530
Subject: [PATCH 14/44] Add templates for controller actions.

---
 src/Template/Bake/Controller/controller.twig  | 12 +++--
 src/Template/Bake/Element/Controller/add.twig | 45 +++++++++++++++++
 .../Bake/Element/Controller/delete.twig       | 35 +++++++++++++
 .../Bake/Element/Controller/edit.twig         | 49 +++++++++++++++++++
 .../Bake/Element/Controller/index.twig        | 34 +++++++++++++
 .../Bake/Element/Controller/login.twig        | 33 +++++++++++++
 .../Bake/Element/Controller/logout.twig       | 25 ++++++++++
 .../Bake/Element/Controller/view.twig         | 36 ++++++++++++++
 src/View/BakeTwigView.php                     |  8 +++
 src/View/Helper/BakeHelper.php                | 14 ++++++
 10 files changed, 288 insertions(+), 3 deletions(-)
 create mode 100644 src/Template/Bake/Element/Controller/add.twig
 create mode 100644 src/Template/Bake/Element/Controller/delete.twig
 create mode 100644 src/Template/Bake/Element/Controller/edit.twig
 create mode 100644 src/Template/Bake/Element/Controller/index.twig
 create mode 100644 src/Template/Bake/Element/Controller/login.twig
 create mode 100644 src/Template/Bake/Element/Controller/logout.twig
 create mode 100644 src/Template/Bake/Element/Controller/view.twig

diff --git a/src/Template/Bake/Controller/controller.twig b/src/Template/Bake/Controller/controller.twig
index eabc0c95e..e80459356 100644
--- a/src/Template/Bake/Controller/controller.twig
+++ b/src/Template/Bake/Controller/controller.twig
@@ -39,9 +39,15 @@ use {{ namespace }}\Controller\AppController;
  */
 class {{ name }}Controller extends AppController
 {
-{{ Bake.arrayProperty('helpers', helpers, {'indent': false})|raw }}
-{{ Bake.arrayProperty('components', components, {'indent': false})|raw }}
+{% set helpers = Bake.arrayProperty('helpers', helpers, {'indent': false})|raw %}
+{% if helpers|trim %}
+{{ helpers|raw }}
+{% endif %}
+{% set components = Bake.arrayProperty('components', components, {'indent': false})|raw %}
+{% if components|trim %}
+{{ components|raw }}
+{% endif %}
 {% for action in actions %}
-    {% element 'Controller/' ~ action %}
+{% element 'Controller/' ~ action %}
 {% endfor %}
 }
diff --git a/src/Template/Bake/Element/Controller/add.twig b/src/Template/Bake/Element/Controller/add.twig
new file mode 100644
index 000000000..ddceaa9b8
--- /dev/null
+++ b/src/Template/Bake/Element/Controller/add.twig
@@ -0,0 +1,45 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+{% set compact = [("'" ~ singularName ~ "'")] %}
+
+    /**
+     * Add method
+     *
+     * @return \Cake\Http\Response|null Redirects on successful add, renders view otherwise.
+     */
+    public function add()
+    {
+        ${{ singularName }} = $this->{{ currentModelName }}->newEntity();
+        if ($this->request->is('post')) {
+            ${{ singularName }} = $this->{{ currentModelName }}->patchEntity(${{ singularName }}, $this->request->getData());
+            if ($this->{{ currentModelName }}->save(${{ singularName }})) {
+                $this->Flash->success(__('The {{ singularHumanName|lower }} has been saved.'));
+
+                return $this->redirect(['action' => 'index']);
+            }
+            $this->Flash->error(__('The {{ singularHumanName|lower }} could not be saved. Please, try again.'));
+        }
+{% set associations = Bake.aliasExtractor(modelObj, 'BelongsTo') %}
+{% set associations = associations|merge(Bake.aliasExtractor(modelObj, 'BelongsToMany')) %}
+{% for assoc in associations %}
+{% set otherName = Bake.getAssociatedTableAlias(modelObj, assoc) %}
+{% set otherPlural = _view.variableName(otherName) %}
+        ${{ otherPlural }} = $this->{{ currentModelName }}->{{ otherName }}->find('list', ['limit' => 200]);
+{% set compact = compact|merge(["'" ~ otherPlural ~ "'"]) %}
+{% endfor %}
+        $this->set(compact({{ compact|join(', ')|raw }}));
+        $this->set('_serialize', ['{{ singularName }}']);
+    }
diff --git a/src/Template/Bake/Element/Controller/delete.twig b/src/Template/Bake/Element/Controller/delete.twig
new file mode 100644
index 000000000..2fbbf6db1
--- /dev/null
+++ b/src/Template/Bake/Element/Controller/delete.twig
@@ -0,0 +1,35 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+
+    /**
+     * Delete method
+     *
+     * @param string|null $id {{ singularHumanName }} id.
+     * @return \Cake\Http\Response|null Redirects to index.
+     * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
+     */
+    public function delete($id = null)
+    {
+        $this->request->allowMethod(['post', 'delete']);
+        ${{ singularName }} = $this->{{ currentModelName }}->get($id);
+        if ($this->{{ currentModelName }}->delete(${{ singularName }})) {
+            $this->Flash->success(__('The {{ singularHumanName|lower }} has been deleted.'));
+        } else {
+            $this->Flash->error(__('The {{ singularHumanName|lower }} could not be deleted. Please, try again.'));
+        }
+
+        return $this->redirect(['action' => 'index']);
+    }
diff --git a/src/Template/Bake/Element/Controller/edit.twig b/src/Template/Bake/Element/Controller/edit.twig
new file mode 100644
index 000000000..4b0db617f
--- /dev/null
+++ b/src/Template/Bake/Element/Controller/edit.twig
@@ -0,0 +1,49 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+{% set belongsTo = Bake.aliasExtractor(modelObj, 'BelongsTo') %}
+{% set belongsToMany = Bake.aliasExtractor(modelObj, 'belongsToMany') %}
+{% set compact = ["'" ~ singularName ~ "'"] %}
+
+    /**
+     * Edit method
+     *
+     * @param string|null $id {{ singularHumanName }} id.
+     * @return \Cake\Http\Response|null Redirects on successful edit, renders view otherwise.
+     * @throws \Cake\Network\Exception\NotFoundException When record not found.
+     */
+    public function edit($id = null)
+    {
+        ${{ singularName }} = $this->{{ currentModelName }}->get($id, [
+            'contain' => [{{ Bake.stringifyList(belongsToMany, {'indent': false})|raw }}]
+        ]);
+        if ($this->request->is(['patch', 'post', 'put'])) {
+            ${{ singularName }} = $this->{{ currentModelName }}->patchEntity(${{ singularName }}, $this->request->getData());
+            if ($this->{{ currentModelName }}->save(${{ singularName }})) {
+                $this->Flash->success(__('The {{ singularHumanName|lower }} has been saved.'));
+
+                return $this->redirect(['action' => 'index']);
+            }
+            $this->Flash->error(__('The {{ singularHumanName|lower }} could not be saved. Please, try again.'));
+        }
+{% for assoc in belongsTo|merge(belongsToMany) %}
+{% set otherName = Bake.getAssociatedTableAlias(modelObj, assoc) %}
+{% set otherPlural = _view.variableName(otherName) %}
+        ${{ otherPlural }} = $this->{{ currentModelName }}->{{ otherName }}->find('list', ['limit' => 200]);
+{% set compact = compact|merge(["'" ~ otherPlural ~ "'"]) %}
+{% endfor %}
+        $this->set(compact({{ compact|join(', ')|raw }}));
+        $this->set('_serialize', ['{{ singularName }}']);
+    }
diff --git a/src/Template/Bake/Element/Controller/index.twig b/src/Template/Bake/Element/Controller/index.twig
new file mode 100644
index 000000000..52ed9e15b
--- /dev/null
+++ b/src/Template/Bake/Element/Controller/index.twig
@@ -0,0 +1,34 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+
+    /**
+     * Index method
+     *
+     * @return \Cake\Http\Response|void
+     */
+    public function index()
+    {
+{% set belongsTo = Bake.aliasExtractor(modelObj, 'BelongsTo') %}
+{% if belongsTo %}
+        $this->paginate = [
+            'contain' => [{{ Bake.stringifyList(belongsTo, {'indent': false})|raw }}]
+        ];
+{% endif %}
+        ${{ pluralName }} = $this->paginate($this->{{ currentModelName }});
+
+        $this->set(compact('{{ pluralName }}'));
+        $this->set('_serialize', ['{{ pluralName }}']);
+    }
diff --git a/src/Template/Bake/Element/Controller/login.twig b/src/Template/Bake/Element/Controller/login.twig
new file mode 100644
index 000000000..ee473edad
--- /dev/null
+++ b/src/Template/Bake/Element/Controller/login.twig
@@ -0,0 +1,33 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+
+    /**
+     * Login method
+     *
+     * @return \Cake\Http\Response|null
+     */
+    public function login()
+    {
+        if ($this->request->is('post')) {
+            $user = $this->Auth->identify();
+            if ($user) {
+                $this->Auth->setUser($user);
+
+                return $this->redirect($this->Auth->redirectUrl());
+            }
+            $this->Flash->error(__('Invalid credentials, try again'));
+        }
+    }
diff --git a/src/Template/Bake/Element/Controller/logout.twig b/src/Template/Bake/Element/Controller/logout.twig
new file mode 100644
index 000000000..dd75231ad
--- /dev/null
+++ b/src/Template/Bake/Element/Controller/logout.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * 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         0.1.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+
+    /**
+     * Logout method
+     *
+     * @return \Cake\Http\Response
+     */
+    public function logout()
+    {
+        return $this->redirect($this->Auth->logout());
+    }
diff --git a/src/Template/Bake/Element/Controller/view.twig b/src/Template/Bake/Element/Controller/view.twig
new file mode 100644
index 000000000..5b48d8c3c
--- /dev/null
+++ b/src/Template/Bake/Element/Controller/view.twig
@@ -0,0 +1,36 @@
+{#
+/**
+ * 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         0.1.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+{% set allAssociations = Bake.aliasExtractor(modelObj, 'BelongsTo') %}
+{% set allAssociations = allAssociations|merge(Bake.aliasExtractor(modelObj, 'BelongsToMany')) %}
+{% set allAssociations = allAssociations|merge(Bake.aliasExtractor(modelObj, 'HasOne')) %}
+{% set allAssociations = allAssociations|merge(Bake.aliasExtractor(modelObj, 'HasMany')) %}
+
+    /**
+     * View method
+     *
+     * @param string|null $id {{ singularHumanName }} id.
+     * @return \Cake\Http\Response|void
+     * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
+     */
+    public function view($id = null)
+    {
+        ${{ singularName }} = $this->{{ currentModelName }}->get($id, [
+            'contain' => [{{ Bake.stringifyList(allAssociations, {'indent': false})|raw }}]
+        ]);
+
+        $this->set('{{ singularName }}', ${{ singularName }});
+        $this->set('_serialize', ['{{ singularName }}']);
+    }
diff --git a/src/View/BakeTwigView.php b/src/View/BakeTwigView.php
index f69e2fd65..885d4afae 100644
--- a/src/View/BakeTwigView.php
+++ b/src/View/BakeTwigView.php
@@ -15,10 +15,13 @@
 namespace Bake\View;
 
 use Cake\Core\Configure;
+use Cake\Core\ConventionsTrait;
 use WyriHaximus\TwigView\View\TwigView;
 
 class BakeTwigView extends TwigView
 {
+    use ConventionsTrait;
+
     /**
      * Initialize view
      *
@@ -86,6 +89,11 @@ public function render($view = null, $layout = null)
         return $this->Blocks->get('content');
     }
 
+    public function variableName($string)
+    {
+        return $this->_variableName($string);
+    }
+
     /**
      * Wrapper for creating and dispatching events.
      *
diff --git a/src/View/Helper/BakeHelper.php b/src/View/Helper/BakeHelper.php
index 053f4f6bd..820fbd092 100644
--- a/src/View/Helper/BakeHelper.php
+++ b/src/View/Helper/BakeHelper.php
@@ -194,6 +194,20 @@ public function fieldData($field, $schema)
         return $schema->column($field);
     }
 
+    /**
+     * Get alias of associated table.
+     *
+     * @param \Cake\ORM\Table $modelObj Model object.
+     * @param string $assoc Association name.
+     * @return string
+     */
+    public function getAssociatedTableAlias($modelObj, $assoc)
+    {
+        $association = $modelObj->association($assoc);
+
+        return $association->getTarget()->getAlias();
+    }
+
     /**
      * To be mocked elsewhere...
      *

From ead145b9eb4784b8396f9e71f29bac1310277a53 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 12:45:48 +0530
Subject: [PATCH 15/44] Add more templates.

---
 src/Template/Bake/Plugin/composer.json.twig |  39 +++++++
 src/Template/Bake/tests/test_case.twig      | 117 ++++++++++++++++++++
 2 files changed, 156 insertions(+)
 create mode 100644 src/Template/Bake/Plugin/composer.json.twig
 create mode 100644 src/Template/Bake/tests/test_case.twig

diff --git a/src/Template/Bake/Plugin/composer.json.twig b/src/Template/Bake/Plugin/composer.json.twig
new file mode 100644
index 000000000..b243674d7
--- /dev/null
+++ b/src/Template/Bake/Plugin/composer.json.twig
@@ -0,0 +1,39 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+{% set namespace = namespace|replace('\\', '\\\\') %}
+{
+    "name": "{{ package }}",
+    "description": "{{ plugin }} plugin for CakePHP",
+    "type": "cakephp-plugin",
+    "license": "MIT",
+    "require": {
+        "cakephp/cakephp": "^3.4"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.7|^6.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "{{ namespace }}\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "{{ namespace }}\\Test\\": "tests",
+            "Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
+        }
+    }
+}
diff --git a/src/Template/Bake/tests/test_case.twig b/src/Template/Bake/tests/test_case.twig
new file mode 100644
index 000000000..8ba2d4fae
--- /dev/null
+++ b/src/Template/Bake/tests/test_case.twig
@@ -0,0 +1,117 @@
+{#
+/**
+ * Test Case bake template
+ *
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+{% set isController = type|lower == 'controller' %}
+{% if isController %}
+{% set uses = uses|merge(['Cake\\TestSuite\\IntegrationTestCase']) %}
+{% else %}
+{% set uses = uses|merge(['Cake\\TestSuite\\TestCase']) %}
+{% endif %}
+{% set uses = uses|sort %}
+<?php
+namespace {{ baseNamespace }}\Test\TestCase\{{ subNamespace }};
+
+{% for dependency in uses %}
+use {{ dependency }};
+{% endfor %}
+
+/**
+ * {{ fullClassName }} Test Case
+ */
+{% if isController %}
+class {{ className }}Test extends IntegrationTestCase
+{
+{% else %}
+class {{ className }}Test extends TestCase
+{
+{% endif %}
+{% if properties %}
+{% for propertyInfo in properties %}
+
+    /**
+     * {{ propertyInfo.description }}
+     *
+     * @var {{ propertyInfo.type }}
+     */
+    public ${{ propertyInfo.name }}{% if propertyInfo.value %} = {{ propertyInfo.value }}{% endif %};
+{% endfor %}
+{% endif %}
+{% if fixtures %}
+
+    /**
+     * Fixtures
+     *
+     * @var array
+     */
+    public $fixtures = [{{ Bake.stringifyList(fixtures)|raw }}];
+{% endif %}
+{% if construction %}
+
+    /**
+     * setUp method
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        parent::setUp();
+{% if preConstruct %}
+        {{ preConstruct|raw }}
+{% endif %}
+        $this->{{ (subject ~ ' = ' ~ construction)|raw }}
+{% if postConstruct %}
+        {{ postConstruct|raw }}
+{% endif %}
+    }
+
+    /**
+     * tearDown method
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        unset($this->{{ subject }});
+
+        parent::tearDown();
+    }
+{% endif %}
+{% for method in methods %}
+
+    /**
+     * Test {{ method }} method
+     *
+     * @return void
+     */
+    public function test{{ method|camelize }}()
+    {
+        $this->markTestIncomplete('Not implemented yet.');
+    }
+{% endfor %}
+{% if not methods %}
+
+    /**
+     * Test initial setup
+     *
+     * @return void
+     */
+    public function testInitialization()
+    {
+        $this->markTestIncomplete('Not implemented yet.');
+    }
+{% endif %}
+}

From 8a4ca967cdac220d26b282fc39cec9f1246e6e90 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 15:05:36 +0530
Subject: [PATCH 16/44] Add / update templates for baking models.

---
 src/Template/Bake/Model/entity.twig |  22 ++---
 src/Template/Bake/Model/table.twig  | 124 ++++++++++++++++++++++++++++
 src/View/Helper/BakeHelper.php      |  45 ++++++++++
 src/View/Helper/DocBlockHelper.php  |  35 ++++++++
 4 files changed, 215 insertions(+), 11 deletions(-)
 create mode 100644 src/Template/Bake/Model/table.twig

diff --git a/src/Template/Bake/Model/entity.twig b/src/Template/Bake/Model/entity.twig
index 7bb8dc7ae..7ee23334b 100644
--- a/src/Template/Bake/Model/entity.twig
+++ b/src/Template/Bake/Model/entity.twig
@@ -17,23 +17,23 @@
 {% set associationHintMap = DocBlock.buildEntityAssociationHintTypeMap(propertySchema ?: []) %}
 {% set annotations = DocBlock.propertyHints(propertyHintMap) %}
 
-{% if associationHintMap %}
-{% annotations|push('') %}
+{%- if associationHintMap %}
+{% set annotations = annotations|merge(['']) %}
 {% set annotations = annotations|merge(DocBlock.propertyHints(associationHintMap)) %}
 {% endif %}
 
-{% set accessible = [] %}
+{%- set accessible = [] %}
 
-{% if fields %}
+{% if fields is not defined or fields is not same as(false) %}
 {% for field in fields %}
-{% set accessible.field = 'true' %}
+{% set accessible = accessible|merge({field: 'true'}) %}
 {% endfor %}
 {% endif %}
 
-{% if fields and primaryKey %}
-{% set accessible['*'] = 'true' %}
+{%- if fields and primaryKey %}
+{% set accessible = accessible|merge({'*': 'true'}) %}
 {% for field in primaryKey %}
-{% set accessible.field = 'false' %}
+{% set accessible = accessible|merge({field: 'false'}) %}
 {% endfor %}
 {% endif %}
 <?php
@@ -41,7 +41,7 @@ namespace {{ namespace }}\Model\Entity;
 
 use Cake\ORM\Entity;
 
-{{ DocBlock.classDescription(name, 'Entity', $annotations)|raw }}
+{{ DocBlock.classDescription(name, 'Entity', annotations)|raw }}
 class {{ name }} extends Entity
 {
 {% if accessible %}
@@ -55,7 +55,7 @@ class {{ name }} extends Entity
      *
      * @var array
      */
-    protected $_accessible = [{{ Bake.stringifyList(accessible, ['quotes' => false])|raw }}];
+    protected $_accessible = [{{ Bake.stringifyList(accessible, {'quotes': false})|raw }}];
 {% endif %}
 {% if hidden %}
 
@@ -64,7 +64,7 @@ class {{ name }} extends Entity
      *
      * @var array
      */
-    protected $_hidden = [{{ Bake.stringifyList(hidden) }}];
+    protected $_hidden = [{{ Bake.stringifyList(hidden)|raw }}];
 {% endif %}
 {% if not accessible and not hidden %}
 
diff --git a/src/Template/Bake/Model/table.twig b/src/Template/Bake/Model/table.twig
new file mode 100644
index 000000000..fa7ea24c6
--- /dev/null
+++ b/src/Template/Bake/Model/table.twig
@@ -0,0 +1,124 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+{% set annotations = DocBlock.buildTableAnnotations(associations, associationInfo, behaviors, entity, namespace) %}
+<?php
+namespace {{ namespace }}\Model\Table;
+
+{% set uses = ['use Cake\ORM\Query;', 'use Cake\ORM\RulesChecker;', 'use Cake\ORM\Table;', 'use Cake\Validation\Validator;'] %}
+{{ uses|join('\n')|raw }}
+
+{{ DocBlock.classDescription(name, 'Model', annotations)|raw }}
+class {{ name }}Table extends Table
+{
+
+    /**
+     * Initialize method
+     *
+     * @param array $config The configuration for the Table.
+     * @return void
+     */
+    public function initialize(array $config)
+    {
+        parent::initialize($config);
+
+{% if table %}
+        $this->setTable('{{ table }}');
+{% endif %}
+{% if displayField %}
+        $this->setDisplayField('{{ displayField }}');
+{% endif %}
+{% if primaryKey %}
+{% if primaryKey|count > 1 %}
+        $this->setPrimaryKey([{{ Bake.stringifyList(primaryKey, {'indent': false})|raw }}]);
+{% else %}
+        $this->setPrimaryKey('{{ primaryKey|as_array|first }}');
+{% endif %}
+{% endif %}
+{% if behaviors %}
+
+{% endif %}
+{% for behavior, behaviorData in behaviors %}
+        $this->addBehavior('{{ behavior }}'{{ (behaviorData ? (", [" ~ behaviorData|join(', ') ~ ']') : '')|raw }});
+{% endfor %}
+{% if associations.belongsTo or associations.hasMany or associations.belongsToMany %}
+
+{% endif %}
+{% for type, assocs in associations %}
+{% for assoc in assocs %}
+{% set alias = assoc.alias %}
+{# https://www.drupal.org/node/1696912 #}
+{#{% set assoc = assoc|unset('alias') %}#}
+        $this->{{ type }}('{{ alias }}', [{{ Bake.stringifyList(assoc, {'indent': 3})|raw }}]);
+{% endfor %}
+{% endfor %}
+    }
+{% if validation %}
+
+    /**
+     * Default validation rules.
+     *
+     * @param \Cake\Validation\Validator $validator Validator instance.
+     * @return \Cake\Validation\Validator
+     */
+    public function validationDefault(Validator $validator)
+    {
+{% for field, rules in validation %}
+{% set validationMethods = Bake.getValidationMethods(field, rules) %}
+{% if validationMethods %}
+        $validator
+{% for validationMethod in validationMethods %}
+{% if loop.last %}
+{% set validationMethod = validationMethod ~ ';' %}
+{% endif %}
+        $validator
+            {{ validationMethod|raw }}
+{% endfor %}
+{% endif %}
+{% endfor %}
+        return $validator;
+    }
+{% endif %}
+{% if rulesChecker %}
+
+    /**
+     * Returns a rules checker object that will be used for validating
+     * application integrity.
+     *
+     * @param \Cake\ORM\RulesChecker $rules The rules object to be modified.
+     * @return \Cake\ORM\RulesChecker
+     */
+    public function buildRules(RulesChecker $rules)
+    {
+{% for field, rule in rulesChecker %}
+        $rules->add($rules->{{ rule.name }}(['{{ field }}']{{ (rule.extra ? (", '" ~ rule.extra ~ "'") : '')|raw }}));
+{% endfor %}
+
+        return $rules;
+    }
+{% endif %}
+{% if connection is not same as('default') %}
+
+    /**
+     * Returns the database connection name to use by default.
+     *
+     * @return string
+     */
+    public static function defaultConnectionName()
+    {
+        return '{{ connection }}';
+    }
+{% endif %}
+}
diff --git a/src/View/Helper/BakeHelper.php b/src/View/Helper/BakeHelper.php
index 820fbd092..4df7ee9d6 100644
--- a/src/View/Helper/BakeHelper.php
+++ b/src/View/Helper/BakeHelper.php
@@ -208,6 +208,51 @@ public function getAssociatedTableAlias($modelObj, $assoc)
         return $association->getTarget()->getAlias();
     }
 
+    public function getValidationMethods($field, $rules)
+    {
+        $validationMethods = [];
+
+        foreach ($rules as $ruleName => $rule) {
+            if ($rule['rule'] && !isset($rule['provider'])) {
+                $validationMethods[] = sprintf("->%s('%s')", $rule['rule'], $field);
+            } elseif ($rule['rule'] && isset($rule['provider'])) {
+                $validationMethods[] = sprintf(
+                    "->add('%s', '%s', ['rule' => '%s', 'provider' => '%s'])",
+                    $field,
+                    $ruleName,
+                    $rule['rule'],
+                    $rule['provider']
+                );
+            }
+
+            if (isset($rule['allowEmpty'])) {
+                if (is_string($rule['allowEmpty'])) {
+                    $validationMethods[] = sprintf(
+                        "->allowEmpty('%s', '%s')",
+                        $field,
+                        $rule['allowEmpty']
+                    );
+                } elseif ($rule['allowEmpty']) {
+                    $validationMethods[] = sprintf(
+                        "->allowEmpty('%s')",
+                        $field
+                    );
+                } else {
+                    $validationMethods[] = sprintf(
+                        "->requirePresence('%s', 'create')",
+                        $field
+                    );
+                    $validationMethods[] = sprintf(
+                        "->notEmpty('%s')",
+                        $field
+                    );
+                }
+            }
+        }
+
+        return $validationMethods;
+    }
+
     /**
      * To be mocked elsewhere...
      *
diff --git a/src/View/Helper/DocBlockHelper.php b/src/View/Helper/DocBlockHelper.php
index 901b5e323..bab245d96 100644
--- a/src/View/Helper/DocBlockHelper.php
+++ b/src/View/Helper/DocBlockHelper.php
@@ -4,6 +4,7 @@
 use Cake\Collection\Collection;
 use Cake\Database\Type;
 use Cake\ORM\Association;
+use Cake\Utility\Inflector;
 use Cake\View\Helper;
 
 /**
@@ -213,6 +214,40 @@ public function propertyHints(array $properties)
         return $lines;
     }
 
+    /**
+     * Build property, method, mixing annotations for table class.
+     *
+     * @param array $associations Associations list.
+     * @param array $associationInfo Association info.
+     * @param array $behaviors Behaviors list.
+     * @param string $entity Entity name.
+     * @param string $namespace Namespace.
+     * @return array
+     */
+    public function buildTableAnnotations($associations, $associationInfo, $behaviors, $entity, $namespace)
+    {
+        $annotations = [];
+        foreach ($associations as $type => $assocs) {
+            foreach ($assocs as $assoc) {
+                $typeStr = Inflector::camelize($type);
+                $tableFqn = $associationInfo[$assoc['alias']]['targetFqn'];
+                $annotations[] = "@property {$tableFqn}|\Cake\ORM\Association\\{$typeStr} \${$assoc['alias']}";
+            }
+        }
+        $annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity} get(\$primaryKey, \$options = [])";
+        $annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity} newEntity(\$data = null, array \$options = [])";
+        $annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity}[] newEntities(array \$data, array \$options = [])";
+        $annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity}|bool save(\\Cake\\Datasource\\EntityInterface \$entity, \$options = [])";
+        $annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity} patchEntity(\\Cake\\Datasource\\EntityInterface \$entity, array \$data, array \$options = [])";
+        $annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity}[] patchEntities(\$entities, array \$data, array \$options = [])";
+        $annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity} findOrCreate(\$search, callable \$callback = null, \$options = [])";
+        foreach ($behaviors as $behavior => $behaviorData) {
+            $annotations[] = "@mixin \Cake\ORM\Behavior\\{$behavior}Behavior";
+        }
+
+        return $annotations;
+    }
+
     /**
      * Inserts a value after a specific key in an associative array.
      *

From 8f6a379ad6680450eab8d39c21e1435cc56892e0 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 19:13:48 +0530
Subject: [PATCH 17/44] Fix template.

---
 src/Template/Bake/tests/test_case.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Template/Bake/tests/test_case.twig b/src/Template/Bake/tests/test_case.twig
index 8ba2d4fae..e4aa40368 100644
--- a/src/Template/Bake/tests/test_case.twig
+++ b/src/Template/Bake/tests/test_case.twig
@@ -57,7 +57,7 @@ class {{ className }}Test extends TestCase
      *
      * @var array
      */
-    public $fixtures = [{{ Bake.stringifyList(fixtures)|raw }}];
+    public $fixtures = [{{ Bake.stringifyList(fixtures|values)|raw }}];
 {% endif %}
 {% if construction %}
 

From c78ba5cac3ba77310097f1152c786efc5fd18ff8 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 19:44:31 +0530
Subject: [PATCH 18/44] More template fixes.

---
 src/Template/Bake/Model/entity.twig         | 15 +--------------
 src/Template/Bake/Model/table.twig          |  4 ++--
 src/Template/Bake/Plugin/composer.json.twig |  4 ++--
 src/View/Helper/BakeHelper.php              | 20 ++++++++++++++++++++
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/Template/Bake/Model/entity.twig b/src/Template/Bake/Model/entity.twig
index 7ee23334b..79589e4e6 100644
--- a/src/Template/Bake/Model/entity.twig
+++ b/src/Template/Bake/Model/entity.twig
@@ -22,20 +22,7 @@
 {% set annotations = annotations|merge(DocBlock.propertyHints(associationHintMap)) %}
 {% endif %}
 
-{%- set accessible = [] %}
-
-{% if fields is not defined or fields is not same as(false) %}
-{% for field in fields %}
-{% set accessible = accessible|merge({field: 'true'}) %}
-{% endfor %}
-{% endif %}
-
-{%- if fields and primaryKey %}
-{% set accessible = accessible|merge({'*': 'true'}) %}
-{% for field in primaryKey %}
-{% set accessible = accessible|merge({field: 'false'}) %}
-{% endfor %}
-{% endif %}
+{%- set accessible = Bake.getFieldAccessibility(fields, primaryKey) %}
 <?php
 namespace {{ namespace }}\Model\Entity;
 
diff --git a/src/Template/Bake/Model/table.twig b/src/Template/Bake/Model/table.twig
index fa7ea24c6..e50355af0 100644
--- a/src/Template/Bake/Model/table.twig
+++ b/src/Template/Bake/Model/table.twig
@@ -17,7 +17,7 @@
 <?php
 namespace {{ namespace }}\Model\Table;
 
-{% set uses = ['use Cake\ORM\Query;', 'use Cake\ORM\RulesChecker;', 'use Cake\ORM\Table;', 'use Cake\Validation\Validator;'] %}
+{% set uses = ['use Cake\\ORM\\Query;', 'use Cake\\ORM\\RulesChecker;', 'use Cake\\ORM\\Table;', 'use Cake\\Validation\\Validator;'] %}
 {{ uses|join('\n')|raw }}
 
 {{ DocBlock.classDescription(name, 'Model', annotations)|raw }}
@@ -83,9 +83,9 @@ class {{ name }}Table extends Table
 {% if loop.last %}
 {% set validationMethod = validationMethod ~ ';' %}
 {% endif %}
-        $validator
             {{ validationMethod|raw }}
 {% endfor %}
+
 {% endif %}
 {% endfor %}
         return $validator;
diff --git a/src/Template/Bake/Plugin/composer.json.twig b/src/Template/Bake/Plugin/composer.json.twig
index b243674d7..b8980ae54 100644
--- a/src/Template/Bake/Plugin/composer.json.twig
+++ b/src/Template/Bake/Plugin/composer.json.twig
@@ -27,12 +27,12 @@
     },
     "autoload": {
         "psr-4": {
-            "{{ namespace }}\\": "src"
+            "{{ namespace|raw }}\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "{{ namespace }}\\Test\\": "tests",
+            "{{ namespace|raw }}\\Test\\": "tests",
             "Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
         }
     }
diff --git a/src/View/Helper/BakeHelper.php b/src/View/Helper/BakeHelper.php
index 4df7ee9d6..77016c215 100644
--- a/src/View/Helper/BakeHelper.php
+++ b/src/View/Helper/BakeHelper.php
@@ -253,6 +253,26 @@ public function getValidationMethods($field, $rules)
         return $validationMethods;
     }
 
+    public function getFieldAccessibility($fields = null, $primaryKey = null)
+    {
+        $accessible = [];
+
+        if (!isset($fields) || $fields !== false) {
+            if (!empty($fields)) {
+                foreach ($fields as $field) {
+                    $accessible[$field] = 'true';
+                }
+            } elseif (!empty($primaryKey)) {
+                $accessible['*'] = 'true';
+                foreach ($primaryKey as $field) {
+                    $accessible[$field] = 'false';
+                }
+            }
+        }
+
+        return $accessible;
+    }
+
     /**
      * To be mocked elsewhere...
      *

From 696093338ebbb457b59a249258c56e5ce87f6a34 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 20:00:34 +0530
Subject: [PATCH 19/44] Fix tests.

---
 tests/TestCase/Shell/BakeShellTest.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/TestCase/Shell/BakeShellTest.php b/tests/TestCase/Shell/BakeShellTest.php
index 7301e8cbc..7fc6bffc0 100644
--- a/tests/TestCase/Shell/BakeShellTest.php
+++ b/tests/TestCase/Shell/BakeShellTest.php
@@ -149,10 +149,15 @@ public function testMain()
             '- task',
             '- template',
             '- test',
-            '- twig_template',
-            '',
-            'By using <info>`cake bake [name]`</info> you can invoke a specific bake task.',
         ];
+
+        if (Plugin::loaded('WyriHaximus/TwigView')) {
+            $expected[] = '- twig_template';
+        }
+
+        $expected[] = '';
+        $expected[] = 'By using <info>`cake bake [name]`</info> you can invoke a specific bake task.';
+
         $this->assertSame($expected, $output);
     }
 
@@ -205,8 +210,10 @@ public function testLoadTasksCoreAndApp()
             'Bake.Template',
             'Controller',
             'CustomController',
-            'WyriHaximus/TwigView.TwigTemplate',
         ];
+        if (Plugin::loaded('WyriHaximus/TwigView')) {
+            $expected[] = 'WyriHaximus/TwigView.TwigTemplate';
+        }
         sort($this->Shell->tasks);
         sort($expected);
         $this->assertEquals($expected, $this->Shell->tasks);

From b1d4e40036439bafc9dafa2ffd6856485f7fdb8c Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 20:21:10 +0530
Subject: [PATCH 20/44] Fix "since" tag.

---
 src/Template/Bake/Middleware/middleware.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Template/Bake/Middleware/middleware.twig b/src/Template/Bake/Middleware/middleware.twig
index 7ef906852..d7e80c6a3 100644
--- a/src/Template/Bake/Middleware/middleware.twig
+++ b/src/Template/Bake/Middleware/middleware.twig
@@ -9,7 +9,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         1.3.6
+ * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 #}

From 4757d90d7c5383c04402c459164212b04ec066ed Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 20:27:11 +0530
Subject: [PATCH 21/44] Add docblocks.

---
 src/View/Helper/BakeHelper.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/View/Helper/BakeHelper.php b/src/View/Helper/BakeHelper.php
index 77016c215..4658e1294 100644
--- a/src/View/Helper/BakeHelper.php
+++ b/src/View/Helper/BakeHelper.php
@@ -208,6 +208,13 @@ public function getAssociatedTableAlias($modelObj, $assoc)
         return $association->getTarget()->getAlias();
     }
 
+    /**
+     * Get validation methods data.
+     *
+     * @param string $field Field name.
+     * @param array $rules Validation rules list.
+     * @return array
+     */
     public function getValidationMethods($field, $rules)
     {
         $validationMethods = [];
@@ -253,6 +260,13 @@ public function getValidationMethods($field, $rules)
         return $validationMethods;
     }
 
+    /**
+     * Get field accessibility data.
+     *
+     * @param mixed $fields Fields list.
+     * @param mixed $primaryKey Primary key.
+     * @return array
+     */
     public function getFieldAccessibility($fields = null, $primaryKey = null)
     {
         $accessible = [];

From d2c3b1b439d2755417c41c4445a0beaa39fb0f3c Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 23:16:49 +0530
Subject: [PATCH 22/44] Rename method.

---
 src/Template/Bake/Element/form.twig | 4 ++--
 src/View/Helper/BakeHelper.php      | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Template/Bake/Element/form.twig b/src/Template/Bake/Element/form.twig
index 320072f35..bcc667a72 100644
--- a/src/Template/Bake/Element/form.twig
+++ b/src/Template/Bake/Element/form.twig
@@ -45,14 +45,14 @@
         <?php
 {% for field in fields if field in primaryKey %}
 {% if keyFields.field %}
-{% set fieldData = Bake.fieldData(field, schema) %}
+{% set fieldData = Bake.columnData(field, schema) %}
 {% if fieldData.null %}
             echo $this->Form->control('{{ field }}', ['options' => ${{ keyFields.field }}, 'empty' => true]);
 {% else %}
             echo $this->Form->control('{{ field }}', ['options' => ${{ keyFields.field }}]);
 {% endif %}
 {% elseif field in ['created', 'modified', 'updated'] %}
-{% set fieldData = Bake.fieldData(field, schema) %}
+{% set fieldData = Bake.columnData(field, schema) %}
 {% if fieldData.type|in_array(['date', 'datetime', 'time']) and fieldData.null %}
             echo $this->Form->control('{{ field }}', ['empty' => true]);
 {% else %}
diff --git a/src/View/Helper/BakeHelper.php b/src/View/Helper/BakeHelper.php
index 4658e1294..d46b59472 100644
--- a/src/View/Helper/BakeHelper.php
+++ b/src/View/Helper/BakeHelper.php
@@ -189,7 +189,14 @@ public function filterFields($fields, $schema, $takeFields = [], $filterTypes =
         return $fields;
     }
 
-    public function fieldData($field, $schema)
+    /**
+     * Get column data from schema.
+     *
+     * @param string $field Field name.
+     * @param Cake\Database\Schema\TableSchemaAwareInterface $schema Schema.
+     * @return array
+     */
+    public function columnData($field, $schema)
     {
         return $schema->column($field);
     }

From 39d0717ee0eb6520ceddd037b5723f6fa7d90283 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 23:35:42 +0530
Subject: [PATCH 23/44] Fix templates.

---
 src/Template/Bake/Model/table.twig          | 9 +++++----
 src/Template/Bake/Plugin/composer.json.twig | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Template/Bake/Model/table.twig b/src/Template/Bake/Model/table.twig
index e50355af0..ad365c561 100644
--- a/src/Template/Bake/Model/table.twig
+++ b/src/Template/Bake/Model/table.twig
@@ -58,10 +58,11 @@ class {{ name }}Table extends Table
 {% endif %}
 {% for type, assocs in associations %}
 {% for assoc in assocs %}
-{% set alias = assoc.alias %}
-{# https://www.drupal.org/node/1696912 #}
-{#{% set assoc = assoc|unset('alias') %}#}
-        $this->{{ type }}('{{ alias }}', [{{ Bake.stringifyList(assoc, {'indent': 3})|raw }}]);
+{% set assocData = [] %}
+{% for key, val in assoc if key is not same as('alias') %}
+{% set assocData = assocData|merge({(key): val}) %}
+{% endfor %}
+        $this->{{ type }}('{{ assoc.alias }}', [{{ Bake.stringifyList(assocData, {'indent': 3})|raw }}]);
 {% endfor %}
 {% endfor %}
     }
diff --git a/src/Template/Bake/Plugin/composer.json.twig b/src/Template/Bake/Plugin/composer.json.twig
index b8980ae54..a573d8394 100644
--- a/src/Template/Bake/Plugin/composer.json.twig
+++ b/src/Template/Bake/Plugin/composer.json.twig
@@ -13,7 +13,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 #}
-{% set namespace = namespace|replace('\\', '\\\\') %}
+{% set namespace = namespace|replace({'\\': '\\\\'}) %}
 {
     "name": "{{ package }}",
     "description": "{{ plugin }} plugin for CakePHP",
@@ -27,12 +27,12 @@
     },
     "autoload": {
         "psr-4": {
-            "{{ namespace|raw }}\\": "src"
+            "{{ namespace }}\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "{{ namespace|raw }}\\Test\\": "tests",
+            "{{ namespace }}\\Test\\": "tests",
             "Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
         }
     }

From d1d6bc834034d4e26eb83584ef28d0691409c0bd Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 23:38:00 +0530
Subject: [PATCH 24/44] Fix "since" tags.

---
 src/Template/Bake/Element/Controller/logout.twig | 2 +-
 src/Template/Bake/Element/Controller/view.twig   | 2 +-
 src/Template/Bake/Plugin/webroot/empty.twig      | 2 +-
 src/Template/Bake/Shell/shell.twig               | 2 +-
 src/Template/Bake/Template/edit.twig             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Template/Bake/Element/Controller/logout.twig b/src/Template/Bake/Element/Controller/logout.twig
index dd75231ad..facbd2fe6 100644
--- a/src/Template/Bake/Element/Controller/logout.twig
+++ b/src/Template/Bake/Element/Controller/logout.twig
@@ -9,7 +9,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         0.1.0
+ * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 #}
diff --git a/src/Template/Bake/Element/Controller/view.twig b/src/Template/Bake/Element/Controller/view.twig
index 5b48d8c3c..7374335b1 100644
--- a/src/Template/Bake/Element/Controller/view.twig
+++ b/src/Template/Bake/Element/Controller/view.twig
@@ -9,7 +9,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         0.1.0
+ * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 #}
diff --git a/src/Template/Bake/Plugin/webroot/empty.twig b/src/Template/Bake/Plugin/webroot/empty.twig
index 69fe6e5ba..e48dbb3c0 100644
--- a/src/Template/Bake/Plugin/webroot/empty.twig
+++ b/src/Template/Bake/Plugin/webroot/empty.twig
@@ -9,7 +9,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         0.1.0
+ * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 #}
\ No newline at end of file
diff --git a/src/Template/Bake/Shell/shell.twig b/src/Template/Bake/Shell/shell.twig
index 037428876..c0c16b8e9 100644
--- a/src/Template/Bake/Shell/shell.twig
+++ b/src/Template/Bake/Shell/shell.twig
@@ -9,7 +9,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         0.1.0
+ * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 #}
diff --git a/src/Template/Bake/Template/edit.twig b/src/Template/Bake/Template/edit.twig
index eab98d3fa..de628d0e9 100644
--- a/src/Template/Bake/Template/edit.twig
+++ b/src/Template/Bake/Template/edit.twig
@@ -9,7 +9,7 @@
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @since         0.1.0
+ * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 #}

From 753f7acb5c70a825002b642f3f08f48f4851ebaa Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 23:40:31 +0530
Subject: [PATCH 25/44] Add docblock.

---
 src/View/BakeTwigView.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/View/BakeTwigView.php b/src/View/BakeTwigView.php
index 885d4afae..0cbf57f9a 100644
--- a/src/View/BakeTwigView.php
+++ b/src/View/BakeTwigView.php
@@ -89,6 +89,12 @@ public function render($view = null, $layout = null)
         return $this->Blocks->get('content');
     }
 
+    /**
+     * Inflect string to variable name form.
+     *
+     * @param string $string Input string
+     * @return string
+     */
     public function variableName($string)
     {
         return $this->_variableName($string);

From 8bdaabd6625ba92e17a3a31e50afc0fa8183896b Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 23:47:33 +0530
Subject: [PATCH 26/44] Remove unneeded method.

---
 src/Template/Bake/Element/Controller/add.twig  |  2 +-
 src/Template/Bake/Element/Controller/edit.twig |  2 +-
 src/View/BakeTwigView.php                      | 13 -------------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/Template/Bake/Element/Controller/add.twig b/src/Template/Bake/Element/Controller/add.twig
index ddceaa9b8..c5d858b94 100644
--- a/src/Template/Bake/Element/Controller/add.twig
+++ b/src/Template/Bake/Element/Controller/add.twig
@@ -36,7 +36,7 @@
 {% set associations = associations|merge(Bake.aliasExtractor(modelObj, 'BelongsToMany')) %}
 {% for assoc in associations %}
 {% set otherName = Bake.getAssociatedTableAlias(modelObj, assoc) %}
-{% set otherPlural = _view.variableName(otherName) %}
+{% set otherPlural = otherName|variable %}
         ${{ otherPlural }} = $this->{{ currentModelName }}->{{ otherName }}->find('list', ['limit' => 200]);
 {% set compact = compact|merge(["'" ~ otherPlural ~ "'"]) %}
 {% endfor %}
diff --git a/src/Template/Bake/Element/Controller/edit.twig b/src/Template/Bake/Element/Controller/edit.twig
index 4b0db617f..9f60e1831 100644
--- a/src/Template/Bake/Element/Controller/edit.twig
+++ b/src/Template/Bake/Element/Controller/edit.twig
@@ -40,7 +40,7 @@
         }
 {% for assoc in belongsTo|merge(belongsToMany) %}
 {% set otherName = Bake.getAssociatedTableAlias(modelObj, assoc) %}
-{% set otherPlural = _view.variableName(otherName) %}
+{% set otherPlural = otherName|variable %}
         ${{ otherPlural }} = $this->{{ currentModelName }}->{{ otherName }}->find('list', ['limit' => 200]);
 {% set compact = compact|merge(["'" ~ otherPlural ~ "'"]) %}
 {% endfor %}
diff --git a/src/View/BakeTwigView.php b/src/View/BakeTwigView.php
index 0cbf57f9a..f7d44c8fa 100644
--- a/src/View/BakeTwigView.php
+++ b/src/View/BakeTwigView.php
@@ -15,12 +15,10 @@
 namespace Bake\View;
 
 use Cake\Core\Configure;
-use Cake\Core\ConventionsTrait;
 use WyriHaximus\TwigView\View\TwigView;
 
 class BakeTwigView extends TwigView
 {
-    use ConventionsTrait;
 
     /**
      * Initialize view
@@ -89,17 +87,6 @@ public function render($view = null, $layout = null)
         return $this->Blocks->get('content');
     }
 
-    /**
-     * Inflect string to variable name form.
-     *
-     * @param string $string Input string
-     * @return string
-     */
-    public function variableName($string)
-    {
-        return $this->_variableName($string);
-    }
-
     /**
      * Wrapper for creating and dispatching events.
      *

From e10eb28fc95b6682af6e7f973dd63329d5543ff9 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Sun, 22 Oct 2017 23:50:32 +0530
Subject: [PATCH 27/44] Use extension variable.

---
 src/View/BakeTwigView.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/View/BakeTwigView.php b/src/View/BakeTwigView.php
index f7d44c8fa..45a753245 100644
--- a/src/View/BakeTwigView.php
+++ b/src/View/BakeTwigView.php
@@ -65,7 +65,7 @@ public function render($view = null, $layout = null)
     {
         $viewFileName = $this->_getViewFileName($view);
         $templateEventName = str_replace(
-            ['.ctp', DS],
+            [$this->_ext, DS],
             ['', '.'],
             explode('Template' . DS . 'Bake' . DS, $viewFileName)[1]
         );

From 1ba9fe3810134c0caf95f653e43ee088ff32a040 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Mon, 23 Oct 2017 00:11:29 +0530
Subject: [PATCH 28/44] Fix error on PHP 7.2.

---
 src/Template/Bake/Model/table.ctp  | 2 +-
 src/Template/Bake/Model/table.twig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Template/Bake/Model/table.ctp b/src/Template/Bake/Model/table.ctp
index 2b1934ce8..8b73263e9 100644
--- a/src/Template/Bake/Model/table.ctp
+++ b/src/Template/Bake/Model/table.ctp
@@ -69,7 +69,7 @@ class <%= $name %>Table extends Table
         $this->setDisplayField('<%= $displayField %>');
 <% endif %>
 <% if (!empty($primaryKey)): %>
-<% if (count($primaryKey) > 1): %>
+<% if (is_array($primaryKey) && count($primaryKey) > 1): %>
         $this->setPrimaryKey([<%= $this->Bake->stringifyList((array)$primaryKey, ['indent' => false]) %>]);
 <% else: %>
         $this->setPrimaryKey('<%= current((array)$primaryKey) %>');
diff --git a/src/Template/Bake/Model/table.twig b/src/Template/Bake/Model/table.twig
index ad365c561..c0b3820a5 100644
--- a/src/Template/Bake/Model/table.twig
+++ b/src/Template/Bake/Model/table.twig
@@ -41,7 +41,7 @@ class {{ name }}Table extends Table
         $this->setDisplayField('{{ displayField }}');
 {% endif %}
 {% if primaryKey %}
-{% if primaryKey|count > 1 %}
+{% if primaryKey is iterable and primaryKey|count > 1 %}
         $this->setPrimaryKey([{{ Bake.stringifyList(primaryKey, {'indent': false})|raw }}]);
 {% else %}
         $this->setPrimaryKey('{{ primaryKey|as_array|first }}');

From 72973f4841f9fabaa3dd7e8b0e1d8cc2c641c589 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Mon, 23 Oct 2017 00:41:18 +0530
Subject: [PATCH 29/44] Update docblock.

---
 src/View/Helper/BakeHelper.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/View/Helper/BakeHelper.php b/src/View/Helper/BakeHelper.php
index d46b59472..87c613570 100644
--- a/src/View/Helper/BakeHelper.php
+++ b/src/View/Helper/BakeHelper.php
@@ -167,6 +167,8 @@ public function classInfo($class, $type, $suffix)
      *
      * @param array $fields Fields list.
      * @param \Cake\Datasource\SchemaInterface $schema Schema instance.
+     * @param array $takeFields Take fields.
+     * @param array $filterTypes Filter field types.
      * @return \Cake\Collection\CollectionInterface
      */
     public function filterFields($fields, $schema, $takeFields = [], $filterTypes = ['binary'])

From fc910c64d9d14f59a212d795d6d7a92556c385f1 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Mon, 23 Oct 2017 11:03:57 +0530
Subject: [PATCH 30/44] Use string interpolation.

---
 src/Template/Bake/Element/Controller/add.twig  | 4 ++--
 src/Template/Bake/Element/Controller/edit.twig | 4 ++--
 src/Template/Bake/Model/table.twig             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Template/Bake/Element/Controller/add.twig b/src/Template/Bake/Element/Controller/add.twig
index c5d858b94..969ada13c 100644
--- a/src/Template/Bake/Element/Controller/add.twig
+++ b/src/Template/Bake/Element/Controller/add.twig
@@ -13,7 +13,7 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 #}
-{% set compact = [("'" ~ singularName ~ "'")] %}
+{% set compact = ["'#{singularName}'"] %}
 
     /**
      * Add method
@@ -38,7 +38,7 @@
 {% set otherName = Bake.getAssociatedTableAlias(modelObj, assoc) %}
 {% set otherPlural = otherName|variable %}
         ${{ otherPlural }} = $this->{{ currentModelName }}->{{ otherName }}->find('list', ['limit' => 200]);
-{% set compact = compact|merge(["'" ~ otherPlural ~ "'"]) %}
+{% set compact = compact|merge(["'#{otherPlural}'"]) %}
 {% endfor %}
         $this->set(compact({{ compact|join(', ')|raw }}));
         $this->set('_serialize', ['{{ singularName }}']);
diff --git a/src/Template/Bake/Element/Controller/edit.twig b/src/Template/Bake/Element/Controller/edit.twig
index 9f60e1831..e64bb5bdd 100644
--- a/src/Template/Bake/Element/Controller/edit.twig
+++ b/src/Template/Bake/Element/Controller/edit.twig
@@ -15,7 +15,7 @@
 #}
 {% set belongsTo = Bake.aliasExtractor(modelObj, 'BelongsTo') %}
 {% set belongsToMany = Bake.aliasExtractor(modelObj, 'belongsToMany') %}
-{% set compact = ["'" ~ singularName ~ "'"] %}
+{% set compact = ["'#{singularName}'"] %}
 
     /**
      * Edit method
@@ -42,7 +42,7 @@
 {% set otherName = Bake.getAssociatedTableAlias(modelObj, assoc) %}
 {% set otherPlural = otherName|variable %}
         ${{ otherPlural }} = $this->{{ currentModelName }}->{{ otherName }}->find('list', ['limit' => 200]);
-{% set compact = compact|merge(["'" ~ otherPlural ~ "'"]) %}
+{% set compact = compact|merge(["'#{otherPlural}'"]) %}
 {% endfor %}
         $this->set(compact({{ compact|join(', ')|raw }}));
         $this->set('_serialize', ['{{ singularName }}']);
diff --git a/src/Template/Bake/Model/table.twig b/src/Template/Bake/Model/table.twig
index c0b3820a5..a6879a5b7 100644
--- a/src/Template/Bake/Model/table.twig
+++ b/src/Template/Bake/Model/table.twig
@@ -104,7 +104,7 @@ class {{ name }}Table extends Table
     public function buildRules(RulesChecker $rules)
     {
 {% for field, rule in rulesChecker %}
-        $rules->add($rules->{{ rule.name }}(['{{ field }}']{{ (rule.extra ? (", '" ~ rule.extra ~ "'") : '')|raw }}));
+        $rules->add($rules->{{ rule.name }}(['{{ field }}']{{ (rule.extra ? (", '#{rule.extra}'") : '')|raw }}));
 {% endfor %}
 
         return $rules;

From 9ece322d305fb7ce537a758c35b8a8c4392eff1c Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Mon, 23 Oct 2017 19:47:01 +0530
Subject: [PATCH 31/44] Remove duplicate helper loading.

---
 src/View/BakeTwigView.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/View/BakeTwigView.php b/src/View/BakeTwigView.php
index 45a753245..502daa3e2 100644
--- a/src/View/BakeTwigView.php
+++ b/src/View/BakeTwigView.php
@@ -35,9 +35,6 @@ public function initialize()
             Configure::write('App.paths.templates', $paths);
         }
 
-        $this->loadHelper('Bake.Bake');
-        $this->loadHelper('Bake.DocBlock');
-
         parent::initialize();
     }
 

From 830d36e06eae86ca98518e3716c777761b0b1afc Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Tue, 24 Oct 2017 19:11:59 +0530
Subject: [PATCH 32/44] Use "merge" instead of "push".

---
 src/Template/Bake/Element/form.twig   | 2 +-
 src/Template/Bake/Template/index.twig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Template/Bake/Element/form.twig b/src/Template/Bake/Element/form.twig
index bcc667a72..379646f6a 100644
--- a/src/Template/Bake/Element/form.twig
+++ b/src/Template/Bake/Element/form.twig
@@ -32,7 +32,7 @@
 {% if details.controller != _view.name && done not in details.controller %}
         <li><?= $this->Html->link(__('List {{ _view._pluralHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'index']) ?></li>
         <li><?= $this->Html->link(__('New {{ _view._singularHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'add']) ?></li>
-{% done|push(details.controller) %}
+{% set done = done|merge([details.controller]) %}
 {% endif %}
 {% endfor %}
 {% endfor %}
diff --git a/src/Template/Bake/Template/index.twig b/src/Template/Bake/Template/index.twig
index b1edbc22d..8b03dd13a 100644
--- a/src/Template/Bake/Template/index.twig
+++ b/src/Template/Bake/Template/index.twig
@@ -30,7 +30,7 @@
 {% if details.navLink and details.controller != _view.name and details.controller not in done %}
         <li><?= $this->Html->link(__('List {{ _view._pluralHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'index']) ?></li>
         <li><?= $this->Html->link(__('New {{ _view._singularHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'add']) ?></li>
-{% done|push(details.controller) %}
+{% set done = done|merge([details.controller]) %}
 {% endif %}
 {% endfor %}
 {% endfor %}

From b21381518f633e8d4e7073cd76eb944a3ac57b49 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Tue, 24 Oct 2017 19:20:02 +0530
Subject: [PATCH 33/44] Fix logic operators

---
 src/Template/Bake/Element/form.twig   | 2 +-
 src/Template/Bake/Template/index.twig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Template/Bake/Element/form.twig b/src/Template/Bake/Element/form.twig
index 379646f6a..27d6ed832 100644
--- a/src/Template/Bake/Element/form.twig
+++ b/src/Template/Bake/Element/form.twig
@@ -29,7 +29,7 @@
 {% set done = [] %}
 {% for type, data in associations %}
 {% for alias, details in data %}
-{% if details.controller != _view.name && done not in details.controller %}
+{% if details.controller is not same as(_view.name) and details.controller not in done %}
         <li><?= $this->Html->link(__('List {{ _view._pluralHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'index']) ?></li>
         <li><?= $this->Html->link(__('New {{ _view._singularHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'add']) ?></li>
 {% set done = done|merge([details.controller]) %}
diff --git a/src/Template/Bake/Template/index.twig b/src/Template/Bake/Template/index.twig
index 8b03dd13a..08cbbd439 100644
--- a/src/Template/Bake/Template/index.twig
+++ b/src/Template/Bake/Template/index.twig
@@ -27,7 +27,7 @@
 {% set done = [] %}
 {% for type, data in associations %}
 {% for alias, details in data %}
-{% if details.navLink and details.controller != _view.name and details.controller not in done %}
+{% if details.navLink and details.controller is not same as(_view.name) and details.controller not in done %}
         <li><?= $this->Html->link(__('List {{ _view._pluralHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'index']) ?></li>
         <li><?= $this->Html->link(__('New {{ _view._singularHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'add']) ?></li>
 {% set done = done|merge([details.controller]) %}

From b99c5b861d134afca93a69c18bde7a0914863464 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Tue, 24 Oct 2017 23:15:41 +0530
Subject: [PATCH 34/44] Add / fix templates for template generation.

---
 src/Template/Bake/Element/form.twig           |  26 ++--
 src/Template/Bake/Template/add.twig           |   2 +-
 src/Template/Bake/Template/edit.twig          |   2 +-
 src/Template/Bake/Template/index.twig         |  44 ++----
 src/Template/Bake/Template/view.twig          | 137 ++++++++++++++++++
 src/View/Helper/BakeHelper.php                |  71 ++++++++-
 .../TestCase/Shell/Task/TemplateTaskTest.php  |   1 +
 7 files changed, 236 insertions(+), 47 deletions(-)
 create mode 100644 src/Template/Bake/Template/view.twig

diff --git a/src/Template/Bake/Element/form.twig b/src/Template/Bake/Element/form.twig
index 27d6ed832..a789362fb 100644
--- a/src/Template/Bake/Element/form.twig
+++ b/src/Template/Bake/Element/form.twig
@@ -13,25 +13,25 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 #}
-{% set fields = Bake.filterFields(fields, schema) %}
+{% set fields = Bake.filterFields(fields, schema, modelObject) %}
 <nav class="large-3 medium-4 columns" id="actions-sidebar">
     <ul class="side-nav">
         <li class="heading"><?= __('Actions') ?></li>
-{% if action|strpos('add') is false) }}
+{% if action matches '/^((?!add).)*$/' %}
         <li><?= $this->Form->postLink(
                 __('Delete'),
-                ['action' => 'delete', ${{ singularVar }}->{{ primaryKey.0 }}],
-                ['confirm' => __('Are you sure you want to delete # {0}?', ${{ singularVar }}->{{ primaryKey.0 }})]
+                ['action' => 'delete', ${{ singularVar }}->{{ primaryKey[0] }}],
+                ['confirm' => __('Are you sure you want to delete # {0}?', ${{ singularVar }}->{{ primaryKey[0] }})]
             )
         ?></li>
-{{ endif }}
+{% endif %}
         <li><?= $this->Html->link(__('List {{ pluralHumanName }}'), ['action' => 'index']) ?></li>
 {% set done = [] %}
 {% for type, data in associations %}
 {% for alias, details in data %}
 {% if details.controller is not same as(_view.name) and details.controller not in done %}
-        <li><?= $this->Html->link(__('List {{ _view._pluralHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'index']) ?></li>
-        <li><?= $this->Html->link(__('New {{ _view._singularHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'add']) ?></li>
+        <li><?= $this->Html->link(__('List {{ alias|underscore|humanize }}'), ['controller' => '{{ details.controller }}', 'action' => 'index']) ?></li>
+        <li><?= $this->Html->link(__('New {{ alias|singularize|underscore|humanize }}'), ['controller' => '{{ details.controller }}', 'action' => 'add']) ?></li>
 {% set done = done|merge([details.controller]) %}
 {% endif %}
 {% endfor %}
@@ -43,17 +43,17 @@
     <fieldset>
         <legend><?= __('{{ action|humanize }} {{ singularHumanName }}') ?></legend>
         <?php
-{% for field in fields if field in primaryKey %}
-{% if keyFields.field %}
+{% for field in fields if field not in primaryKey %}
+{% if keyFields[field] %}
 {% set fieldData = Bake.columnData(field, schema) %}
 {% if fieldData.null %}
-            echo $this->Form->control('{{ field }}', ['options' => ${{ keyFields.field }}, 'empty' => true]);
+            echo $this->Form->control('{{ field }}', ['options' => ${{ keyFields[field] }}, 'empty' => true]);
 {% else %}
-            echo $this->Form->control('{{ field }}', ['options' => ${{ keyFields.field }}]);
+            echo $this->Form->control('{{ field }}', ['options' => ${{ keyFields[field] }}]);
 {% endif %}
-{% elseif field in ['created', 'modified', 'updated'] %}
+{% elseif field not in ['created', 'modified', 'updated'] %}
 {% set fieldData = Bake.columnData(field, schema) %}
-{% if fieldData.type|in_array(['date', 'datetime', 'time']) and fieldData.null %}
+{% if fieldData.type in ['date', 'datetime', 'time'] and fieldData.null %}
             echo $this->Form->control('{{ field }}', ['empty' => true]);
 {% else %}
             echo $this->Form->control('{{ field }}');
diff --git a/src/Template/Bake/Template/add.twig b/src/Template/Bake/Template/add.twig
index de628d0e9..cde0d3567 100644
--- a/src/Template/Bake/Template/add.twig
+++ b/src/Template/Bake/Template/add.twig
@@ -19,4 +19,4 @@
  * @var \{{ entityClass }} ${{ singularVar }}
  */
 ?>
-{{ element 'form' }}
+{% element 'form' %}
diff --git a/src/Template/Bake/Template/edit.twig b/src/Template/Bake/Template/edit.twig
index de628d0e9..cde0d3567 100644
--- a/src/Template/Bake/Template/edit.twig
+++ b/src/Template/Bake/Template/edit.twig
@@ -19,4 +19,4 @@
  * @var \{{ entityClass }} ${{ singularVar }}
  */
 ?>
-{{ element 'form' }}
+{% element 'form' %}
diff --git a/src/Template/Bake/Template/index.twig b/src/Template/Bake/Template/index.twig
index 08cbbd439..79050ef67 100644
--- a/src/Template/Bake/Template/index.twig
+++ b/src/Template/Bake/Template/index.twig
@@ -19,7 +19,7 @@
  * @var \{{ entityClass }}[]|\Cake\Collection\CollectionInterface ${{ pluralVar }}
  */
 ?>
-{% set fields = Bake.filterFields(fields, schema, indexColumns, ['binary', 'text']) %}
+{% set fields = Bake.filterFields(fields, schema, modelObject, indexColumns, ['binary', 'text']) %}
 <nav class="large-3 medium-4 columns" id="actions-sidebar">
     <ul class="side-nav">
         <li class="heading"><?= __('Actions') ?></li>
@@ -28,8 +28,8 @@
 {% for type, data in associations %}
 {% for alias, details in data %}
 {% if details.navLink and details.controller is not same as(_view.name) and details.controller not in done %}
-        <li><?= $this->Html->link(__('List {{ _view._pluralHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'index']) ?></li>
-        <li><?= $this->Html->link(__('New {{ _view._singularHumanName(alias) }}'), ['controller' => '{{ details.controller }}', 'action' => 'add']) ?></li>
+        <li><?= $this->Html->link(__('List {{ alias|underscore|humanize }}'), ['controller' => '{{ details.controller }}', 'action' => 'index']) ?></li>
+        <li><?= $this->Html->link(__('New {{ alias|singularize|underscore|humanize }}'), ['controller' => '{{ details.controller }}', 'action' => 'add']) ?></li>
 {% set done = done|merge([details.controller]) %}
 {% endif %}
 {% endfor %}
@@ -53,37 +53,25 @@
 {% for field in fields %}
 {% set isKey = false %}
 {% if associations.BelongsTo %}
-{% for alias, details in associations.BelongsTo %}
-<%
-                    if ($field === $details['foreignKey']) {
-                        $isKey = true;
-%>
-                <td><?= ${{ singularVar }}->has('<%= $details['property'] %>') ? $this->Html->link(${{ singularVar }}-><%= $details['property'] %>->{{ details.displayField }}, ['controller' => '{{ details.controller }}', 'action' => 'view', ${{ singularVar }}-><%= $details['property'] %>-><%= $details['primaryKey'][0] %>]) : '' ?></td>
-<%
-                        break;
-                    }
-%>
+{% for alias, details in associations.BelongsTo if field == details.foreignKey %}
+{% set isKey = true %}
+                <td><?= ${{ singularVar }}->has('{{ details.property }}') ? $this->Html->link(${{ singularVar }}->{{ details.property }}->{{ details.displayField }}, ['controller' => '{{ details.controller }}', 'action' => 'view', ${{ singularVar }}->{{ details.property }}->{{ details.primaryKey[0] }}]) : '' ?></td>
 {% endfor %}
 {% endif %}
-{% if isKey is not true %}
-<%
-                if (!in_array($schema->columnType($field), ['integer', 'float', 'decimal', 'biginteger', 'smallinteger', 'tinyinteger'])) {
-%>
+{% if isKey is not same as(true) %}
+{% set columnData = Bake.columnData(field, schema) %}
+{% if columnData.type not in ['integer', 'float', 'decimal', 'biginteger', 'smallinteger', 'tinyinteger'] %}
                 <td><?= h(${{ singularVar }}->{{ field }}) ?></td>
-<%
-                } else {
-%>
+{% else %}
                 <td><?= $this->Number->format(${{ singularVar }}->{{ field }}) ?></td>
-<%
-                }
-%>
+{% endif %}
 {% endif %}
 {% endfor %}
-{% set pk '$' ~ singularVar ~ '->' ~ primaryKey.0 %}
+{% set pk = '$' ~ singularVar ~ '->' ~ primaryKey[0] %}
                 <td class="actions">
-                    <?= $this->Html->link(__('View'), ['action' => 'view', {{ pk }}]) ?>
-                    <?= $this->Html->link(__('Edit'), ['action' => 'edit', {{ pk }}]) ?>
-                    <?= $this->Form->postLink(__('Delete'), ['action' => 'delete', {{ pk }}], ['confirm' => __('Are you sure you want to delete # {0}?', {{ pk }})]) ?>
+                    <?= $this->Html->link(__('View'), ['action' => 'view', {{ pk|raw }}]) ?>
+                    <?= $this->Html->link(__('Edit'), ['action' => 'edit', {{ pk|raw }}]) ?>
+                    <?= $this->Form->postLink(__('Delete'), ['action' => 'delete', {{ pk|raw }}], ['confirm' => __('Are you sure you want to delete # {0}?', {{ pk|raw }})]) ?>
                 </td>
             </tr>
             <?php endforeach; ?>
@@ -97,6 +85,6 @@
             <?= $this->Paginator->next(__('next') . ' >') ?>
             <?= $this->Paginator->last(__('last') . ' >>') ?>
         </ul>
-        <p><?= $this->Paginator->counter(['format' => __('Page {{page}} of {{pages}}, showing {{current}} record(s) out of {{count}} total')]) ?></p>
+        <p><?= $this->Paginator->counter(['format' => __('Page {{ '{{' }}page{{ '}}' }} of {{ '{{' }}pages{{ '}}' }}, showing {{ '{{' }}current{{ '}}' }} record(s) out of {{ '{{' }}count{{ '}}' }} total')]) ?></p>
     </div>
 </div>
diff --git a/src/Template/Bake/Template/view.twig b/src/Template/Bake/Template/view.twig
new file mode 100644
index 000000000..200a2f869
--- /dev/null
+++ b/src/Template/Bake/Template/view.twig
@@ -0,0 +1,137 @@
+{#
+/**
+ * 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         2.0.0
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+#}
+<?php
+/**
+ * @var \{{ namespace }}\View\AppView $this
+ * @var \{{ entityClass }} ${{ singularVar }}
+ */
+?>
+{% set associations = {'BelongsTo': [], 'HasOne': [], 'HasMany': [], 'BelongsToMany': []}|merge(associations) %}
+{% set fieldsData = Bake.getViewFieldsData(fields, schema, associations) %}
+{% set associationFields = fieldsData.associationFields %}
+{% set groupedFields = fieldsData.groupedFields %}
+{% set pK = '$' ~ singularVar ~ '->' ~ primaryKey[0] %}
+<nav class="large-3 medium-4 columns" id="actions-sidebar">
+    <ul class="side-nav">
+        <li class="heading"><?= __('Actions') ?></li>
+        <li><?= $this->Html->link(__('Edit {{ singularHumanName }}'), ['action' => 'edit', {{ pK|raw }}]) ?> </li>
+        <li><?= $this->Form->postLink(__('Delete {{ singularHumanName }}'), ['action' => 'delete', {{ pK|raw }}], ['confirm' => __('Are you sure you want to delete # {0}?', {{ pK|raw }})]) ?> </li>
+        <li><?= $this->Html->link(__('List {{ pluralHumanName }}'), ['action' => 'index']) ?> </li>
+        <li><?= $this->Html->link(__('New {{ singularHumanName }}'), ['action' => 'add']) ?> </li>
+{% set done = [] %}
+{% for type, data in associations %}
+{% for alias, details in data %}
+{% if details.controller is not same as(_view.name) and details.controller not in done %}
+        <li><?= $this->Html->link(__('List {{ alias|underscore|humanize }}'), ['controller' => '{{ details.controller }}', 'action' => 'index']) ?> </li>
+        <li><?= $this->Html->link(__('New {{ alias|underscore|singularize|humanize }}'), ['controller' => '{{ details.controller }}', 'action' => 'add']) ?> </li>
+{% set done = done|merge(['controller']) %}
+{% endif %}
+{% endfor %}
+{% endfor %}
+    </ul>
+</nav>
+<div class="{{ pluralVar }} view large-9 medium-8 columns content">
+    <h3><?= h(${{ singularVar }}->{{ displayField }}) ?></h3>
+    <table class="vertical-table">
+{% if groupedFields['string'] %}
+{% for field in groupedFields['string'] %}
+{% if associationFields[field] %}
+{% set details = associationFields[field] %}
+        <tr>
+            <th scope="row"><?= __('{{ details.property|humanize }}') ?></th>
+            <td><?= ${{ singularVar }}->has('{{ details.property }}') ? $this->Html->link(${{ singularVar }}->{{ details.property }}->{{ details.displayField }}, ['controller' => '{{ details.controller }}', 'action' => 'view', ${{ singularVar }}->{{ details.property }}->{{ details.primaryKey[0] }}]) : '' ?></td>
+        </tr>
+{% else %}
+        <tr>
+            <th scope="row"><?= __('{{ field|humanize }}') ?></th>
+            <td><?= h(${{ singularVar }}->{{ field }}) ?></td>
+        </tr>
+{% endif %}
+{% endfor %}
+{% endif %}
+{% if associations.HasOne %}
+{% for alias, details in associations.HasOne %}
+        <tr>
+            <th scope="row"><?= __('{{ alias|underscore|singularize|humanize }}') ?></th>
+            <td><?= ${{ singularVar }}->has('{{ details.property }}') ? $this->Html->link(${{ singularVar }}->{{ details.property }}->{{ details.displayField }}, ['controller' => '{{ details.controller }}', 'action' => 'view', ${{ singularVar }}->{{ details.property }}->{{ details.primaryKey[0] }}]) : '' ?></td>
+        </tr>
+{% endfor %}
+{% endif %}
+{% if groupedFields.number %}
+{% for field in groupedFields.number %}
+        <tr>
+            <th scope="row"><?= __('{{ field|humanize }}') ?></th>
+            <td><?= $this->Number->format(${{ singularVar }}->{{ field }}) ?></td>
+        </tr>
+{% endfor %}
+{% endif %}
+{% if groupedFields.date %}
+{% for field in groupedFields.date %}
+        <tr>
+            <th scope="row"><?= __('{{ field|humanize }}') ?></th>
+            <td><?= h(${{ singularVar }}->{{ field }}) ?></td>
+        </tr>
+{% endfor %}
+{% endif %}
+{% if groupedFields.boolean %}
+{% for field in groupedFields.boolean %}
+        <tr>
+            <th scope="row"><?= __('{{ field|humanize }}') ?></th>
+            <td><?= ${{ singularVar }}->{{ field }} ? __('Yes') : __('No'); ?></td>
+        </tr>
+{% endfor %}
+{% endif %}
+    </table>
+{% if groupedFields.text %}
+{% for field in groupedFields.text %}
+    <div class="row">
+        <h4><?= __('{{ field|humanize }}') ?></h4>
+        <?= $this->Text->autoParagraph(h(${{ singularVar }}->{{ field }})); ?>
+    </div>
+{% endfor %}
+{% endif %}
+{% set relations = associations.BelongsToMany|merge(associations.HasMany) %}
+{% for alias, details in relations %}
+{% set otherSingularVar = alias|variable %}
+{% set otherPluralHumanName = details.controller|underscore|humanize %}
+    <div class="related">
+        <h4><?= __('Related {{ otherPluralHumanName }}') ?></h4>
+        <?php if (!empty(${{ singularVar }}->{{ details.property }})): ?>
+        <table cellpadding="0" cellspacing="0">
+            <tr>
+{% for field in details.fields %}
+                <th scope="col"><?= __('{{ field|humanize }}') ?></th>
+{% endfor %}
+                <th scope="col" class="actions"><?= __('Actions') ?></th>
+            </tr>
+            <?php foreach (${{ singularVar }}->{{ details.property }} as ${{ otherSingularVar }}): ?>
+            <tr>
+{% for field in details.fields %}
+                <td><?= h(${{ otherSingularVar }}->{{ field }}) ?></td>
+{% endfor %}
+{% set otherPk = '$' ~ otherSingularVar ~ '->' ~ details.primaryKey[0] %}
+                <td class="actions">
+                    <?= $this->Html->link(__('View'), ['controller' => '{{ details.controller }}', 'action' => 'view', {{ otherPk|raw }}]) ?>
+                    <?= $this->Html->link(__('Edit'), ['controller' => '{{ details.controller }}', 'action' => 'edit', {{ otherPk|raw }}]) ?>
+                    <?= $this->Form->postLink(__('Delete'), ['controller' => '{{ details.controller }}', 'action' => 'delete', {{ otherPk|raw }}], ['confirm' => __('Are you sure you want to delete # {0}?', {{ otherPk|raw }})]) ?>
+                </td>
+            </tr>
+            <?php endforeach; ?>
+        </table>
+        <?php endif; ?>
+    </div>
+{% endfor %}
+</div>
diff --git a/src/View/Helper/BakeHelper.php b/src/View/Helper/BakeHelper.php
index 87c613570..29c828d3a 100644
--- a/src/View/Helper/BakeHelper.php
+++ b/src/View/Helper/BakeHelper.php
@@ -167,15 +167,16 @@ public function classInfo($class, $type, $suffix)
      *
      * @param array $fields Fields list.
      * @param \Cake\Datasource\SchemaInterface $schema Schema instance.
+     * @param \Cake\Datasource\RepositoryInterface|null $modelObject Model object.
      * @param array $takeFields Take fields.
      * @param array $filterTypes Filter field types.
      * @return \Cake\Collection\CollectionInterface
      */
-    public function filterFields($fields, $schema, $takeFields = [], $filterTypes = ['binary'])
+    public function filterFields($fields, $schema, $modelObject = null, $takeFields = [], $filterTypes = ['binary'])
     {
         $fields = collection($fields)
-            ->filter(function ($field) use ($schema) {
-                return !in_array($schema->columnType($field), ['binary', 'text']);
+            ->filter(function ($field) use ($schema, $filterTypes) {
+                return !in_array($schema->columnType($field), $filterTypes);
             });
 
         if (isset($modelObject) && $modelObject->hasBehavior('Tree')) {
@@ -188,7 +189,69 @@ public function filterFields($fields, $schema, $takeFields = [], $filterTypes =
             $fields = $fields->take($takeFields);
         }
 
-        return $fields;
+        return $fields->toArray();
+    }
+
+    /**
+     * Get fields data for view template.
+     *
+     * @param array $fields Fields list.
+     * @param \Cake\Datasource\SchemaInterface $schema Schema instance.
+     * @param array $associations Associations data.
+     * @return array
+     */
+    public function getViewFieldsData($fields, $schema, $associations)
+    {
+        $immediateAssociations = $associations['BelongsTo'];
+        $associationFields = collection($fields)
+            ->map(function ($field) use ($immediateAssociations) {
+                foreach ($immediateAssociations as $alias => $details) {
+                    if ($field === $details['foreignKey']) {
+                        return [$field => $details];
+                    }
+                }
+            })
+            ->filter()
+            ->reduce(function ($fields, $value) {
+                return $fields + $value;
+            }, []);
+
+        $groupedFields = collection($fields)
+            ->filter(function ($field) use ($schema) {
+                return $schema->columnType($field) !== 'binary';
+            })
+            ->groupBy(function ($field) use ($schema, $associationFields) {
+                $type = $schema->columnType($field);
+                if (isset($associationFields[$field])) {
+                    return 'string';
+                }
+                if (in_array($type, [
+                    'decimal',
+                    'biginteger',
+                    'integer',
+                    'float',
+                    'smallinteger',
+                    'tinyinteger',
+                ])) {
+                    return 'number';
+                }
+                if (in_array($type, ['date', 'time', 'datetime', 'timestamp'])) {
+                    return 'date';
+                }
+
+                return in_array($type, ['text', 'boolean']) ? $type : 'string';
+            })
+            ->toArray();
+
+        $groupedFields += [
+            'number' => [],
+            'string' => [],
+            'boolean' => [],
+            'date' => [],
+            'text' => [],
+        ];
+
+        return compact('associationFields', 'groupedFields');
     }
 
     /**
diff --git a/tests/TestCase/Shell/Task/TemplateTaskTest.php b/tests/TestCase/Shell/Task/TemplateTaskTest.php
index 65760d7d7..be854722f 100644
--- a/tests/TestCase/Shell/Task/TemplateTaskTest.php
+++ b/tests/TestCase/Shell/Task/TemplateTaskTest.php
@@ -81,6 +81,7 @@ protected function _setupTask($methods)
             ->getMock();
 
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
+        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
         $this->Task->Model = $this->getMockBuilder('Bake\Shell\Task\ModelTask')
             ->setConstructorArgs([$io])
             ->getMock();

From 6dccdd8026b70428cd5aa3f9ed87d273b4e5433c Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Tue, 24 Oct 2017 23:20:23 +0530
Subject: [PATCH 35/44] Use stropos instead of regex matching.

---
 src/Template/Bake/Element/form.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Template/Bake/Element/form.twig b/src/Template/Bake/Element/form.twig
index a789362fb..91f09e2e2 100644
--- a/src/Template/Bake/Element/form.twig
+++ b/src/Template/Bake/Element/form.twig
@@ -17,7 +17,7 @@
 <nav class="large-3 medium-4 columns" id="actions-sidebar">
     <ul class="side-nav">
         <li class="heading"><?= __('Actions') ?></li>
-{% if action matches '/^((?!add).)*$/' %}
+{% if strpos(action, 'add') is same as(false) %}
         <li><?= $this->Form->postLink(
                 __('Delete'),
                 ['action' => 'delete', ${{ singularVar }}->{{ primaryKey[0] }}],

From 48cbdf061fa9a9921b89e7c6e4944b5c369d6880 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Fri, 27 Oct 2017 01:07:09 +0530
Subject: [PATCH 36/44] Update dependencies versions.

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 439519e1c..a5283defc 100644
--- a/composer.json
+++ b/composer.json
@@ -19,13 +19,13 @@
     },
     "require": {
         "php": ">=5.6.0",
-        "cakephp/cakephp": ">=3.5.0,<4.0.0",
-        "cakephp/plugin-installer": "~1.0"
+        "cakephp/cakephp": "^3.5",
+        "cakephp/plugin-installer": "^1.0"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^3.0",
-        "phpunit/phpunit": "~5.7 | ~6.0",
-        "wyrihaximus/twig-view": "4.x-dev as 4.1"
+        "phpunit/phpunit": "^5.7 | ^6.0",
+        "wyrihaximus/twig-view": "^4.1"
     },
     "autoload": {
         "psr-4": {

From a10aa957f679b9eebb491acaff93eb2b39cd3e5c Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Fri, 27 Oct 2017 12:01:25 +0530
Subject: [PATCH 37/44] Make BakeView extend TwigView.

This allows having fallback behavior where first existence of .twig
template is checked and if not found corresponding .ctp file is used.
---
 src/View/BakeView.php       | 43 ++++++++++++++++++++-----------------
 tests/TestCase/TestCase.php |  8 +++----
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/View/BakeView.php b/src/View/BakeView.php
index 11cde7ab7..f23305e86 100644
--- a/src/View/BakeView.php
+++ b/src/View/BakeView.php
@@ -17,13 +17,10 @@
 use Cake\Core\Configure;
 use Cake\Core\ConventionsTrait;
 use Cake\Core\InstanceConfigTrait;
-use Cake\Event\EventManager;
-use Cake\Network\Request;
-use Cake\Network\Response;
 use Cake\Utility\Text;
-use Cake\View\View;
+use WyriHaximus\TwigView\View\TwigView;
 
-class BakeView extends View
+class BakeView extends TwigView
 {
     use ConventionsTrait;
     use InstanceConfigTrait;
@@ -75,22 +72,22 @@ class BakeView extends View
     protected $_tmpLocation;
 
     /**
-     * Upon construction, append the plugin's template paths to the paths to check
+     * Templates extensions to search for.
      *
-     * @param \Cake\Network\Request|null $request Request instance.
-     * @param \Cake\Network\Response|null $response Response instance.
-     * @param \Cake\Event\EventManager|null $eventManager Event manager instance.
-     * @param array $viewOptions View options. See View::$_passedVars for list of
-     *   options which get set as class properties.
+     * @var array
      */
-    public function __construct(
-        Request $request = null,
-        Response $response = null,
-        EventManager $eventManager = null,
-        array $viewOptions = []
-    ) {
-        parent::__construct($request, $response, $eventManager, $viewOptions);
+    protected $extensions = [
+        '.twig',
+        '.ctp',
+    ];
 
+    /**
+     * Initialize view
+     *
+     * @return void
+     */
+    public function initialize()
+    {
         $bakeTemplates = dirname(dirname(__FILE__)) . DS . 'Template' . DS;
         $paths = (array)Configure::read('App.paths.templates');
 
@@ -103,6 +100,8 @@ public function __construct(
         if (!file_exists($this->_tmpLocation)) {
             mkdir($this->_tmpLocation);
         }
+
+        parent::initialize();
     }
 
     /**
@@ -129,8 +128,8 @@ public function render($view = null, $layout = null)
     {
         $viewFileName = $this->_getViewFileName($view);
         $templateEventName = str_replace(
-            ['.ctp', DS],
-            ['', '.'],
+            ['.ctp', '.twig', DS],
+            ['', '', '.'],
             explode('Template' . DS . 'Bake' . DS, $viewFileName)[1]
         );
 
@@ -182,6 +181,10 @@ public function dispatchEvent($name, $data = null, $subject = null)
      */
     protected function _evaluate($viewFile, $dataForView)
     {
+        if (substr($viewFile, -4) === 'twig') {
+            return parent::_evaluate($viewFile, $dataForView);
+        }
+
         $viewString = $this->_getViewFileContents($viewFile);
 
         $replacements = array_merge($this->getConfig('phpTagReplacements') + $this->getConfig('replacements'));
diff --git a/tests/TestCase/TestCase.php b/tests/TestCase/TestCase.php
index 1e94c5535..8162d4d0d 100644
--- a/tests/TestCase/TestCase.php
+++ b/tests/TestCase/TestCase.php
@@ -27,11 +27,9 @@ public function setUp()
     {
         parent::setUp();
 
-        if (Configure::read('Bake.viewClass') === 'Bake.BakeTwig') {
-            Plugin::load('WyriHaximus/TwigView', [
-                'bootstrap' => true,
-            ]);
-        }
+        Plugin::load('WyriHaximus/TwigView', [
+            'bootstrap' => true,
+        ]);
     }
 
     /**

From b3054e05031a6a7d243390a20156745dfc1d918c Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Fri, 27 Oct 2017 12:08:24 +0530
Subject: [PATCH 38/44] Remove unneeded view class config.

---
 .travis.yml                                                | 1 -
 src/Shell/Task/BakeTemplateTask.php                        | 7 ++-----
 src/Utility/CommonOptionsTrait.php                         | 5 -----
 tests/TestCase/Shell/Task/BakeTemplateTaskTest.php         | 2 --
 tests/TestCase/Shell/Task/CellTaskTest.php                 | 1 -
 tests/TestCase/Shell/Task/ControllerTaskTest.php           | 1 -
 tests/TestCase/Shell/Task/FixtureTaskTest.php              | 1 -
 tests/TestCase/Shell/Task/MailerTaskTest.php               | 1 -
 tests/TestCase/Shell/Task/MiddlewareTaskTest.php           | 1 -
 .../Shell/Task/ModelTaskAssociationDetectionTest.php       | 1 -
 tests/TestCase/Shell/Task/ModelTaskTest.php                | 1 -
 tests/TestCase/Shell/Task/PluginTaskTest.php               | 1 -
 tests/TestCase/Shell/Task/SimpleBakeTaskTest.php           | 1 -
 tests/TestCase/Shell/Task/TaskTaskTest.php                 | 1 -
 tests/TestCase/Shell/Task/TemplateTaskTest.php             | 1 -
 tests/TestCase/Shell/Task/TestTaskTest.php                 | 1 -
 tests/bootstrap.php                                        | 1 -
 17 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 159d90ceb..e1df9c1b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ env:
     - DB=mysql db_dsn='mysql://root@127.0.0.1/cakephp_test'
     - DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
     - DB=sqlite db_dsn='sqlite:///:memory:'
-    - bake_class='Bake.BakeTwig'
   global:
     - RUN_TESTS=1
 
diff --git a/src/Shell/Task/BakeTemplateTask.php b/src/Shell/Task/BakeTemplateTask.php
index 3843e2c8e..629a4240c 100644
--- a/src/Shell/Task/BakeTemplateTask.php
+++ b/src/Shell/Task/BakeTemplateTask.php
@@ -14,8 +14,8 @@
  */
 namespace Bake\Shell\Task;
 
+use Bake\View\BakeView;
 use Cake\Console\Shell;
-use Cake\Core\App;
 use Cake\Core\ConventionsTrait;
 use Cake\Event\Event;
 use Cake\Event\EventManager;
@@ -62,10 +62,7 @@ public function getView()
             'theme' => $theme
         ];
 
-        $viewClass = isset($this->params['view-class']) ? $this->params['view-class'] : 'Bake.Bake';
-        $viewClass = App::className($viewClass, 'View', 'View');
-
-        $view = new $viewClass(new Request(), new Response(), null, $viewOptions);
+        $view = new BakeView(new Request(), new Response(), null, $viewOptions);
         $event = new Event('Bake.initialize', $view);
         EventManager::instance()->dispatch($event);
         $this->View = $event->subject;
diff --git a/src/Utility/CommonOptionsTrait.php b/src/Utility/CommonOptionsTrait.php
index 41d3bd809..739d5ad15 100644
--- a/src/Utility/CommonOptionsTrait.php
+++ b/src/Utility/CommonOptionsTrait.php
@@ -52,11 +52,6 @@ protected function _setCommonOptions($parser)
             'help' => 'The theme to use when baking code.',
             'default' => Configure::read('Bake.theme'),
             'choices' => $bakeThemes
-        ])->addOption('view-class', [
-            'short' => 'v',
-            'help' => 'The view class to use baking code.',
-            'default' => Configure::read('Bake.viewClass') ?: 'Bake.Bake',
-            'choices' => ['Bake.Bake', 'Bake.BakeTwig'],
         ]);
 
         return $parser;
diff --git a/tests/TestCase/Shell/Task/BakeTemplateTaskTest.php b/tests/TestCase/Shell/Task/BakeTemplateTaskTest.php
index efd3d5a6d..75ac96447 100644
--- a/tests/TestCase/Shell/Task/BakeTemplateTaskTest.php
+++ b/tests/TestCase/Shell/Task/BakeTemplateTaskTest.php
@@ -46,8 +46,6 @@ public function setUp()
             ->setConstructorArgs([$io])
             ->getMock();
         ;
-
-        $this->Task->params['view-class'] = Configure::read('Bake.viewClass');
     }
 
     /**
diff --git a/tests/TestCase/Shell/Task/CellTaskTest.php b/tests/TestCase/Shell/Task/CellTaskTest.php
index 358b07aaa..1cd931d07 100644
--- a/tests/TestCase/Shell/Task/CellTaskTest.php
+++ b/tests/TestCase/Shell/Task/CellTaskTest.php
@@ -54,7 +54,6 @@ public function setUp()
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->initialize();
         $this->Task->BakeTemplate->interactive = false;
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
     }
 
     /**
diff --git a/tests/TestCase/Shell/Task/ControllerTaskTest.php b/tests/TestCase/Shell/Task/ControllerTaskTest.php
index ed72960a7..75b26b2b5 100644
--- a/tests/TestCase/Shell/Task/ControllerTaskTest.php
+++ b/tests/TestCase/Shell/Task/ControllerTaskTest.php
@@ -65,7 +65,6 @@ public function setUp()
         $this->Task->connection = 'test';
 
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
 
         $this->Task->Model = $this->getMockBuilder('Bake\Shell\Task\ModelTask')
             ->setMethods(['in', 'out', 'err', 'createFile', '_stop'])
diff --git a/tests/TestCase/Shell/Task/FixtureTaskTest.php b/tests/TestCase/Shell/Task/FixtureTaskTest.php
index 19d251206..ed3d659f7 100644
--- a/tests/TestCase/Shell/Task/FixtureTaskTest.php
+++ b/tests/TestCase/Shell/Task/FixtureTaskTest.php
@@ -68,7 +68,6 @@ public function setUp()
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->interactive = false;
         $this->Task->BakeTemplate->initialize();
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
 
         $this->_compareBasePath = Plugin::path('Bake') . 'tests' . DS . 'comparisons' . DS . 'Fixture' . DS;
     }
diff --git a/tests/TestCase/Shell/Task/MailerTaskTest.php b/tests/TestCase/Shell/Task/MailerTaskTest.php
index e9a52e9f1..ad3aa9e5c 100644
--- a/tests/TestCase/Shell/Task/MailerTaskTest.php
+++ b/tests/TestCase/Shell/Task/MailerTaskTest.php
@@ -54,7 +54,6 @@ public function setUp()
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->initialize();
         $this->Task->BakeTemplate->interactive = false;
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
     }
 
     /**
diff --git a/tests/TestCase/Shell/Task/MiddlewareTaskTest.php b/tests/TestCase/Shell/Task/MiddlewareTaskTest.php
index 3180ac2bb..9972d2515 100644
--- a/tests/TestCase/Shell/Task/MiddlewareTaskTest.php
+++ b/tests/TestCase/Shell/Task/MiddlewareTaskTest.php
@@ -54,7 +54,6 @@ public function setUp()
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->initialize();
         $this->Task->BakeTemplate->interactive = false;
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
     }
 
     /**
diff --git a/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php b/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php
index ccced4ceb..ed2ae8b42 100644
--- a/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php
+++ b/tests/TestCase/Shell/Task/ModelTaskAssociationDetectionTest.php
@@ -108,7 +108,6 @@ protected function _setupOtherMocks()
             ->getMock();
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->interactive = false;
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
 
         $this->Task->name = 'Model';
     }
diff --git a/tests/TestCase/Shell/Task/ModelTaskTest.php b/tests/TestCase/Shell/Task/ModelTaskTest.php
index f090f2e9b..1610cf535 100644
--- a/tests/TestCase/Shell/Task/ModelTaskTest.php
+++ b/tests/TestCase/Shell/Task/ModelTaskTest.php
@@ -122,7 +122,6 @@ protected function _setupOtherMocks()
             ->getMock();
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->interactive = false;
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
 
         $this->Task->name = 'Model';
     }
diff --git a/tests/TestCase/Shell/Task/PluginTaskTest.php b/tests/TestCase/Shell/Task/PluginTaskTest.php
index 9dd553b04..c79d64f1c 100644
--- a/tests/TestCase/Shell/Task/PluginTaskTest.php
+++ b/tests/TestCase/Shell/Task/PluginTaskTest.php
@@ -59,7 +59,6 @@ public function setUp()
 
         $this->Task->BakeTemplate = new BakeTemplateTask($this->io);
         $this->Task->BakeTemplate->interactive = false;
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
 
         $this->Task->path = TMP . 'tests' . DS . 'BakedPlugins' . DS;
         new Folder($this->Task->path, true);
diff --git a/tests/TestCase/Shell/Task/SimpleBakeTaskTest.php b/tests/TestCase/Shell/Task/SimpleBakeTaskTest.php
index bd3bbb311..229dbb963 100644
--- a/tests/TestCase/Shell/Task/SimpleBakeTaskTest.php
+++ b/tests/TestCase/Shell/Task/SimpleBakeTaskTest.php
@@ -54,7 +54,6 @@ public function setUp()
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->initialize();
         $this->Task->BakeTemplate->interactive = false;
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
 
         $this->Task->pathFragment = 'Model/Behavior/';
 
diff --git a/tests/TestCase/Shell/Task/TaskTaskTest.php b/tests/TestCase/Shell/Task/TaskTaskTest.php
index 25e10fc10..ffbc587eb 100644
--- a/tests/TestCase/Shell/Task/TaskTaskTest.php
+++ b/tests/TestCase/Shell/Task/TaskTaskTest.php
@@ -54,7 +54,6 @@ public function setUp()
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
         $this->Task->BakeTemplate->initialize();
         $this->Task->BakeTemplate->interactive = false;
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
     }
 
     /**
diff --git a/tests/TestCase/Shell/Task/TemplateTaskTest.php b/tests/TestCase/Shell/Task/TemplateTaskTest.php
index be854722f..65760d7d7 100644
--- a/tests/TestCase/Shell/Task/TemplateTaskTest.php
+++ b/tests/TestCase/Shell/Task/TemplateTaskTest.php
@@ -81,7 +81,6 @@ protected function _setupTask($methods)
             ->getMock();
 
         $this->Task->BakeTemplate = new BakeTemplateTask($io);
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
         $this->Task->Model = $this->getMockBuilder('Bake\Shell\Task\ModelTask')
             ->setConstructorArgs([$io])
             ->getMock();
diff --git a/tests/TestCase/Shell/Task/TestTaskTest.php b/tests/TestCase/Shell/Task/TestTaskTest.php
index a0808fd69..b08a71a4c 100644
--- a/tests/TestCase/Shell/Task/TestTaskTest.php
+++ b/tests/TestCase/Shell/Task/TestTaskTest.php
@@ -75,7 +75,6 @@ public function setUp()
         $this->Task->name = 'Test';
         $this->Task->BakeTemplate = new BakeTemplateTask($this->io);
         $this->Task->BakeTemplate->interactive = false;
-        $this->Task->BakeTemplate->params['view-class'] = Configure::read('Bake.viewClass');
     }
 
     /**
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index a29e0268c..6892be7d8 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -50,7 +50,6 @@
     ],
     'encoding' => 'UTF-8'
 ]);
-Configure::write('Bake.viewClass', getenv('bake_class') ?: 'Bake.Bake');
 
 if (!getenv('db_dsn')) {
     putenv('db_dsn=sqlite:///:memory:');

From d9e494a1b036449a4f0bee83a651e328c7a28f1e Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Fri, 27 Oct 2017 12:13:19 +0530
Subject: [PATCH 39/44] Remove unneeded "use" statements.

---
 tests/TestCase/Shell/Task/BakeTemplateTaskTest.php | 1 -
 tests/TestCase/Shell/Task/ControllerTaskTest.php   | 2 --
 tests/TestCase/Shell/Task/FixtureTaskTest.php      | 1 -
 3 files changed, 4 deletions(-)

diff --git a/tests/TestCase/Shell/Task/BakeTemplateTaskTest.php b/tests/TestCase/Shell/Task/BakeTemplateTaskTest.php
index 75ac96447..96a2e4511 100644
--- a/tests/TestCase/Shell/Task/BakeTemplateTaskTest.php
+++ b/tests/TestCase/Shell/Task/BakeTemplateTaskTest.php
@@ -15,7 +15,6 @@
 namespace Bake\Test\TestCase\Shell\Task;
 
 use Bake\Test\TestCase\TestCase;
-use Cake\Core\Configure;
 use Cake\Core\Plugin;
 
 /**
diff --git a/tests/TestCase/Shell/Task/ControllerTaskTest.php b/tests/TestCase/Shell/Task/ControllerTaskTest.php
index 75b26b2b5..e69448fff 100644
--- a/tests/TestCase/Shell/Task/ControllerTaskTest.php
+++ b/tests/TestCase/Shell/Task/ControllerTaskTest.php
@@ -16,10 +16,8 @@
 
 use Bake\Shell\Task\BakeTemplateTask;
 use Bake\Test\TestCase\TestCase;
-use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\ORM\TableRegistry;
-use Cake\View\Helper;
 
 /**
  * ControllerTaskTest class
diff --git a/tests/TestCase/Shell/Task/FixtureTaskTest.php b/tests/TestCase/Shell/Task/FixtureTaskTest.php
index ed3d659f7..c993cf809 100644
--- a/tests/TestCase/Shell/Task/FixtureTaskTest.php
+++ b/tests/TestCase/Shell/Task/FixtureTaskTest.php
@@ -16,7 +16,6 @@
 
 use Bake\Shell\Task\BakeTemplateTask;
 use Bake\Test\TestCase\TestCase;
-use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\ORM\TableRegistry;
 

From 5f27df401012190aac57c7d018aeed8bd5fc484c Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Fri, 27 Oct 2017 12:23:54 +0530
Subject: [PATCH 40/44] Remove unneeded BakeTwig view class.

---
 src/View/BakeTwigView.php | 124 --------------------------------------
 1 file changed, 124 deletions(-)
 delete mode 100644 src/View/BakeTwigView.php

diff --git a/src/View/BakeTwigView.php b/src/View/BakeTwigView.php
deleted file mode 100644
index 502daa3e2..000000000
--- a/src/View/BakeTwigView.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?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         2.0.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-namespace Bake\View;
-
-use Cake\Core\Configure;
-use WyriHaximus\TwigView\View\TwigView;
-
-class BakeTwigView extends TwigView
-{
-
-    /**
-     * Initialize view
-     *
-     * @return void
-     */
-    public function initialize()
-    {
-        $bakeTemplates = dirname(dirname(__FILE__)) . DS . 'Template' . DS;
-        $paths = (array)Configure::read('App.paths.templates');
-
-        if (!in_array($bakeTemplates, $paths)) {
-            $paths[] = $bakeTemplates;
-            Configure::write('App.paths.templates', $paths);
-        }
-
-        parent::initialize();
-    }
-
-    /**
-     * Renders view for given view file and layout.
-     *
-     * Render triggers helper callbacks, which are fired before and after the view are rendered,
-     * as well as before and after the layout. The helper callbacks are called:
-     *
-     * - `beforeRender`
-     * - `afterRender`
-     *
-     * View names can point to plugin views/layouts. Using the `Plugin.view` syntax
-     * a plugin view/layout can be used instead of the app ones. If the chosen plugin is not found
-     * the view will be located along the regular view path cascade.
-     *
-     * View can also be a template string, rather than the name of a view file
-     *
-     * @param string|null $view Name of view file to use, or a template string to render
-     * @param string|null $layout Layout to use. Not used, for consistency with other views only
-     * @return string|null Rendered content.
-     * @throws \Cake\Core\Exception\Exception If there is an error in the view.
-     */
-    public function render($view = null, $layout = null)
-    {
-        $viewFileName = $this->_getViewFileName($view);
-        $templateEventName = str_replace(
-            [$this->_ext, DS],
-            ['', '.'],
-            explode('Template' . DS . 'Bake' . DS, $viewFileName)[1]
-        );
-
-        $this->_currentType = static::TYPE_TEMPLATE;
-        $this->dispatchEvent('View.beforeRender', [$viewFileName]);
-        $this->dispatchEvent('View.beforeRender.' . $templateEventName, [$viewFileName]);
-        $this->Blocks->set('content', $this->_render($viewFileName));
-        $this->dispatchEvent('View.afterRender', [$viewFileName]);
-        $this->dispatchEvent('View.afterRender.' . $templateEventName, [$viewFileName]);
-
-        if ($layout === null) {
-            $layout = $this->layout;
-        }
-        if ($layout && $this->autoLayout) {
-            $this->Blocks->set('content', $this->renderLayout('', $layout));
-        }
-
-        return $this->Blocks->get('content');
-    }
-
-    /**
-     * Wrapper for creating and dispatching events.
-     *
-     * Use the Bake prefix for bake related view events
-     *
-     * @param string $name Name of the event.
-     * @param array|null $data Any value you wish to be transported with this event to
-     * it can be read by listeners.
-     *
-     * @param object|null $subject The object that this event applies to
-     * ($this by default).
-     *
-     * @return \Cake\Event\Event
-     */
-    public function dispatchEvent($name, $data = null, $subject = null)
-    {
-        $name = preg_replace('/^View\./', 'Bake.', $name);
-
-        return parent::dispatchEvent($name, $data, $subject);
-    }
-
-    /**
-     * Return all possible paths to find view files in order
-     *
-     * @param string $plugin Optional plugin name to scan for view files.
-     * @param bool $cached Set to false to force a refresh of view paths. Default true.
-     * @return array paths
-     */
-    protected function _paths($plugin = null, $cached = true)
-    {
-        $paths = parent::_paths($plugin, false);
-        foreach ($paths as &$path) {
-            $path .= 'Bake' . DS;
-        }
-
-        return $paths;
-    }
-}

From 771e6c4eacb1dccabac67f9714d351e642c35632 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Fri, 27 Oct 2017 12:36:57 +0530
Subject: [PATCH 41/44] Update PluginTask to check for twig files too.

Removed .ctp files for plugin task. routes.ctp has been kept in
test app's TestBakeTheme plugin to show fallback to ctp works as expected.
---
 src/Shell/Task/PluginTask.php                 |  3 +-
 src/Template/Bake/Plugin/README.md.ctp        | 26 ---------
 src/Template/Bake/Plugin/composer.json.ctp    | 39 --------------
 .../Bake/Plugin/config/routes.php.ctp         | 27 ----------
 src/Template/Bake/Plugin/phpunit.xml.dist.ctp | 53 -------------------
 .../src/Controller/AppController.php.ctp      | 25 ---------
 .../Bake/Plugin/tests/bootstrap.php.ctp       | 47 ----------------
 src/Template/Bake/Plugin/webroot/empty.ctp    | 15 ------
 .../src/Template/Bake/config/routes.twig      |  9 ----
 9 files changed, 2 insertions(+), 242 deletions(-)
 delete mode 100644 src/Template/Bake/Plugin/README.md.ctp
 delete mode 100644 src/Template/Bake/Plugin/composer.json.ctp
 delete mode 100644 src/Template/Bake/Plugin/config/routes.php.ctp
 delete mode 100644 src/Template/Bake/Plugin/phpunit.xml.dist.ctp
 delete mode 100644 src/Template/Bake/Plugin/src/Controller/AppController.php.ctp
 delete mode 100644 src/Template/Bake/Plugin/tests/bootstrap.php.ctp
 delete mode 100644 src/Template/Bake/Plugin/webroot/empty.ctp
 delete mode 100644 tests/test_app/Plugin/TestBakeTheme/src/Template/Bake/config/routes.twig

diff --git a/src/Shell/Task/PluginTask.php b/src/Shell/Task/PluginTask.php
index 182a11389..cc01ebd3c 100644
--- a/src/Shell/Task/PluginTask.php
+++ b/src/Shell/Task/PluginTask.php
@@ -193,12 +193,13 @@ protected function _generateFiles($pluginName, $path)
         do {
             $templatesPath = array_shift($paths) . 'Bake/Plugin';
             $templatesDir = new Folder($templatesPath);
-            $templates = $templatesDir->findRecursive('.*\.ctp');
+            $templates = $templatesDir->findRecursive('.*\.(twig|ctp)');
         } while (!$templates);
 
         sort($templates);
         foreach ($templates as $template) {
             $template = substr($template, strrpos($template, 'Plugin') + 7, -4);
+            $template = rtrim($template, '.');
             $this->_generateFile($template, $root);
         }
     }
diff --git a/src/Template/Bake/Plugin/README.md.ctp b/src/Template/Bake/Plugin/README.md.ctp
deleted file mode 100644
index cb4c73fbe..000000000
--- a/src/Template/Bake/Plugin/README.md.ctp
+++ /dev/null
@@ -1,26 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-# <%= $plugin %> plugin for CakePHP
-
-## Installation
-
-You can install this plugin into your CakePHP application using [composer](http://getcomposer.org).
-
-The recommended way to install composer packages is:
-
-```
-composer require <%= $package %>
-```
diff --git a/src/Template/Bake/Plugin/composer.json.ctp b/src/Template/Bake/Plugin/composer.json.ctp
deleted file mode 100644
index 0566041fb..000000000
--- a/src/Template/Bake/Plugin/composer.json.ctp
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-$namespace = str_replace('\\', '\\\\', $namespace);
-%>
-{
-    "name": "<%= $package %>",
-    "description": "<%= $plugin %> plugin for CakePHP",
-    "type": "cakephp-plugin",
-    "license": "MIT",
-    "require": {
-        "cakephp/cakephp": "^3.4"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^5.7|^6.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "<%= $namespace %>\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "<%= $namespace %>\\Test\\": "tests",
-            "Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
-        }
-    }
-}
diff --git a/src/Template/Bake/Plugin/config/routes.php.ctp b/src/Template/Bake/Plugin/config/routes.php.ctp
deleted file mode 100644
index be6ab6406..000000000
--- a/src/Template/Bake/Plugin/config/routes.php.ctp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-use Cake\Routing\RouteBuilder;
-use Cake\Routing\Router;
-use Cake\Routing\Route\DashedRoute;
-
-Router::plugin(
-    '<%= $plugin %>',
-    ['path' => '/<%= $routePath %>'],
-    function (RouteBuilder $routes) {
-        $routes->fallbacks(DashedRoute::class);
-    }
-);
diff --git a/src/Template/Bake/Plugin/phpunit.xml.dist.ctp b/src/Template/Bake/Plugin/phpunit.xml.dist.ctp
deleted file mode 100644
index 1bb9ec07a..000000000
--- a/src/Template/Bake/Plugin/phpunit.xml.dist.ctp
+++ /dev/null
@@ -1,53 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    colors="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    syntaxCheck="false"
-    bootstrap="./tests/bootstrap.php"
-    >
-    <php>
-        <ini name="memory_limit" value="-1"/>
-        <ini name="apc.enable_cli" value="1"/>
-    </php>
-
-    <!-- Add any additional test suites you want to run here -->
-    <testsuites>
-        <testsuite name="<%= $plugin %> Test Suite">
-            <directory>./tests/TestCase</directory>
-        </testsuite>
-    </testsuites>
-
-    <!-- Setup a listener for fixtures -->
-    <listeners>
-        <listener
-        class="\Cake\TestSuite\Fixture\FixtureInjector"
-        file="./vendor/cakephp/cakephp/src/TestSuite/Fixture/FixtureInjector.php">
-            <arguments>
-                <object class="\Cake\TestSuite\Fixture\FixtureManager" />
-            </arguments>
-        </listener>
-    </listeners>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
-
-</phpunit>
diff --git a/src/Template/Bake/Plugin/src/Controller/AppController.php.ctp b/src/Template/Bake/Plugin/src/Controller/AppController.php.ctp
deleted file mode 100644
index 32654acd5..000000000
--- a/src/Template/Bake/Plugin/src/Controller/AppController.php.ctp
+++ /dev/null
@@ -1,25 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-
-namespace <%= $namespace %>\Controller;
-
-use <%= $baseNamespace %>\Controller\AppController as BaseController;
-
-class AppController extends BaseController
-{
-
-}
diff --git a/src/Template/Bake/Plugin/tests/bootstrap.php.ctp b/src/Template/Bake/Plugin/tests/bootstrap.php.ctp
deleted file mode 100644
index 3ec178444..000000000
--- a/src/Template/Bake/Plugin/tests/bootstrap.php.ctp
+++ /dev/null
@@ -1,47 +0,0 @@
-<%
-/**
- * Tests bootstrap file
- *
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-/**
- * Test suite bootstrap for <%= $plugin %>.
- *
- * This function is used to find the location of CakePHP whether CakePHP
- * has been installed as a dependency of the plugin, or the plugin is itself
- * installed as a dependency of an application.
- */
-$findRoot = function ($root) {
-    do {
-        $lastRoot = $root;
-        $root = dirname($root);
-        if (is_dir($root . '/vendor/cakephp/cakephp')) {
-            return $root;
-        }
-    } while ($root !== $lastRoot);
-
-    throw new Exception("Cannot find the root of the application, unable to run tests");
-};
-$root = $findRoot(__FILE__);
-unset($findRoot);
-
-chdir($root);
-
-if (file_exists($root . '/config/bootstrap.php')) {
-    require $root . '/config/bootstrap.php';
-
-    return;
-}
-require $root . '/vendor/cakephp/cakephp/tests/bootstrap.php';
diff --git a/src/Template/Bake/Plugin/webroot/empty.ctp b/src/Template/Bake/Plugin/webroot/empty.ctp
deleted file mode 100644
index 0cb280500..000000000
--- a/src/Template/Bake/Plugin/webroot/empty.ctp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
diff --git a/tests/test_app/Plugin/TestBakeTheme/src/Template/Bake/config/routes.twig b/tests/test_app/Plugin/TestBakeTheme/src/Template/Bake/config/routes.twig
deleted file mode 100644
index 4def19ad0..000000000
--- a/tests/test_app/Plugin/TestBakeTheme/src/Template/Bake/config/routes.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * These are my routes. There are many like them but these are my own.
- */
-use Cake\Routing\Router;
-
-Router::plugin('{{ plugin }}', function ($routes) {
-    $routes->fallbacks();
-});

From 44a500f57a0f52075a9fa1c7630e76d5f3855c40 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Fri, 27 Oct 2017 12:39:01 +0530
Subject: [PATCH 42/44] Removed .ctp files.

---
 src/Template/Bake/Controller/component.ctp    |  34 ---
 src/Template/Bake/Controller/controller.ctp   |  52 -----
 src/Template/Bake/Element/Controller/add.ctp  |  52 -----
 .../Bake/Element/Controller/delete.ctp        |  35 ----
 src/Template/Bake/Element/Controller/edit.ctp |  55 -----
 .../Bake/Element/Controller/index.ctp         |  34 ---
 .../Bake/Element/Controller/login.ctp         |  33 ---
 .../Bake/Element/Controller/logout.ctp        |  25 ---
 src/Template/Bake/Element/Controller/view.ctp |  38 ----
 src/Template/Bake/Element/array_property.ctp  |  10 -
 src/Template/Bake/Element/form.ctp            | 104 ----------
 src/Template/Bake/Form/form.ctp               |  60 ------
 src/Template/Bake/Layout/default.ctp          |  16 --
 src/Template/Bake/Mailer/mailer.ctp           |  33 ---
 src/Template/Bake/Middleware/middleware.ctp   |  40 ----
 src/Template/Bake/Model/behavior.ctp          |  34 ---
 src/Template/Bake/Model/entity.ctp            |  72 -------
 src/Template/Bake/Model/table.ctp             | 193 ------------------
 src/Template/Bake/Shell/helper.ctp            |  37 ----
 src/Template/Bake/Shell/shell.ctp             |  50 -----
 src/Template/Bake/Shell/task.ctp              |  34 ---
 src/Template/Bake/Template/add.ctp            |  22 --
 src/Template/Bake/Template/edit.ctp           |  22 --
 src/Template/Bake/Template/index.ctp          | 122 -----------
 src/Template/Bake/Template/login.ctp          |  31 ---
 src/Template/Bake/Template/view.ctp           | 179 ----------------
 src/Template/Bake/View/cell.ctp               |  43 ----
 src/Template/Bake/View/helper.ctp             |  35 ----
 src/Template/Bake/tests/fixture.ctp           |  69 -------
 src/Template/Bake/tests/test_case.ctp         | 120 -----------
 tests/test_app/App/Template/Bake/example.twig |   2 -
 31 files changed, 1686 deletions(-)
 delete mode 100644 src/Template/Bake/Controller/component.ctp
 delete mode 100644 src/Template/Bake/Controller/controller.ctp
 delete mode 100644 src/Template/Bake/Element/Controller/add.ctp
 delete mode 100644 src/Template/Bake/Element/Controller/delete.ctp
 delete mode 100644 src/Template/Bake/Element/Controller/edit.ctp
 delete mode 100644 src/Template/Bake/Element/Controller/index.ctp
 delete mode 100644 src/Template/Bake/Element/Controller/login.ctp
 delete mode 100644 src/Template/Bake/Element/Controller/logout.ctp
 delete mode 100644 src/Template/Bake/Element/Controller/view.ctp
 delete mode 100644 src/Template/Bake/Element/array_property.ctp
 delete mode 100644 src/Template/Bake/Element/form.ctp
 delete mode 100644 src/Template/Bake/Form/form.ctp
 delete mode 100644 src/Template/Bake/Layout/default.ctp
 delete mode 100644 src/Template/Bake/Mailer/mailer.ctp
 delete mode 100644 src/Template/Bake/Middleware/middleware.ctp
 delete mode 100644 src/Template/Bake/Model/behavior.ctp
 delete mode 100644 src/Template/Bake/Model/entity.ctp
 delete mode 100644 src/Template/Bake/Model/table.ctp
 delete mode 100644 src/Template/Bake/Shell/helper.ctp
 delete mode 100644 src/Template/Bake/Shell/shell.ctp
 delete mode 100644 src/Template/Bake/Shell/task.ctp
 delete mode 100644 src/Template/Bake/Template/add.ctp
 delete mode 100644 src/Template/Bake/Template/edit.ctp
 delete mode 100644 src/Template/Bake/Template/index.ctp
 delete mode 100644 src/Template/Bake/Template/login.ctp
 delete mode 100644 src/Template/Bake/Template/view.ctp
 delete mode 100644 src/Template/Bake/View/cell.ctp
 delete mode 100644 src/Template/Bake/View/helper.ctp
 delete mode 100644 src/Template/Bake/tests/fixture.ctp
 delete mode 100644 src/Template/Bake/tests/test_case.ctp
 delete mode 100644 tests/test_app/App/Template/Bake/example.twig

diff --git a/src/Template/Bake/Controller/component.ctp b/src/Template/Bake/Controller/component.ctp
deleted file mode 100644
index f1bd268e6..000000000
--- a/src/Template/Bake/Controller/component.ctp
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-namespace <%= $namespace %>\Controller\Component;
-
-use Cake\Controller\Component;
-use Cake\Controller\ComponentRegistry;
-
-/**
- * <%= $name %> component
- */
-class <%= $name %>Component extends Component
-{
-
-    /**
-     * Default configuration.
-     *
-     * @var array
-     */
-    protected $_defaultConfig = [];
-}
diff --git a/src/Template/Bake/Controller/controller.ctp b/src/Template/Bake/Controller/controller.ctp
deleted file mode 100644
index 039662152..000000000
--- a/src/Template/Bake/Controller/controller.ctp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%
-/**
- * Controller bake template file
- *
- * Allows templating of Controllers generated from bake.
- *
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-use Cake\Utility\Inflector;
-%>
-<?php
-namespace <%= $namespace %>\Controller<%= $prefix %>;
-
-use <%= $namespace %>\Controller\AppController;
-
-/**
- * <%= $name %> Controller
- *
-<% if ($defaultModel): %>
- * @property \<%= $defaultModel %> $<%= $name %>
-<% endif; %>
-<%
-foreach ($components as $component):
-    $classInfo = $this->Bake->classInfo($component, 'Controller/Component', 'Component');
-%>
- * @property <%= $classInfo['fqn'] %> $<%= $classInfo['name'] %>
-<% endforeach; %>
-<% if (in_array('index', $actions)): %>
- *
- * @method \<%= $namespace %>\Model\Entity\<%= $entityClassName %>[] paginate($object = null, array $settings = [])
-<% endif; %>
- */
-class <%= $name %>Controller extends AppController
-{
-<%
-echo $this->Bake->arrayProperty('helpers', $helpers, ['indent' => false]);
-echo $this->Bake->arrayProperty('components', $components, ['indent' => false]);
-foreach($actions as $action) {
-    echo $this->element('Controller/' . $action);
-}
-%>
-}
diff --git a/src/Template/Bake/Element/Controller/add.ctp b/src/Template/Bake/Element/Controller/add.ctp
deleted file mode 100644
index 6332e2bb6..000000000
--- a/src/Template/Bake/Element/Controller/add.ctp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-$compact = ["'" . $singularName . "'"];
-%>
-
-    /**
-     * Add method
-     *
-     * @return \Cake\Http\Response|null Redirects on successful add, renders view otherwise.
-     */
-    public function add()
-    {
-        $<%= $singularName %> = $this-><%= $currentModelName %>->newEntity();
-        if ($this->request->is('post')) {
-            $<%= $singularName %> = $this-><%= $currentModelName %>->patchEntity($<%= $singularName %>, $this->request->getData());
-            if ($this-><%= $currentModelName; %>->save($<%= $singularName %>)) {
-                $this->Flash->success(__('The <%= strtolower($singularHumanName) %> has been saved.'));
-
-                return $this->redirect(['action' => 'index']);
-            }
-            $this->Flash->error(__('The <%= strtolower($singularHumanName) %> could not be saved. Please, try again.'));
-        }
-<%
-        $associations = array_merge(
-            $this->Bake->aliasExtractor($modelObj, 'BelongsTo'),
-            $this->Bake->aliasExtractor($modelObj, 'BelongsToMany')
-        );
-        foreach ($associations as $assoc):
-            $association = $modelObj->association($assoc);
-            $otherName = $association->getTarget()->getAlias();
-            $otherPlural = $this->_variableName($otherName);
-%>
-        $<%= $otherPlural %> = $this-><%= $currentModelName %>-><%= $otherName %>->find('list', ['limit' => 200]);
-<%
-            $compact[] = "'$otherPlural'";
-        endforeach;
-%>
-        $this->set(compact(<%= join(', ', $compact) %>));
-        $this->set('_serialize', ['<%=$singularName%>']);
-    }
diff --git a/src/Template/Bake/Element/Controller/delete.ctp b/src/Template/Bake/Element/Controller/delete.ctp
deleted file mode 100644
index 9c519e397..000000000
--- a/src/Template/Bake/Element/Controller/delete.ctp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-
-    /**
-     * Delete method
-     *
-     * @param string|null $id <%= $singularHumanName %> id.
-     * @return \Cake\Http\Response|null Redirects to index.
-     * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
-     */
-    public function delete($id = null)
-    {
-        $this->request->allowMethod(['post', 'delete']);
-        $<%= $singularName %> = $this-><%= $currentModelName %>->get($id);
-        if ($this-><%= $currentModelName; %>->delete($<%= $singularName %>)) {
-            $this->Flash->success(__('The <%= strtolower($singularHumanName) %> has been deleted.'));
-        } else {
-            $this->Flash->error(__('The <%= strtolower($singularHumanName) %> could not be deleted. Please, try again.'));
-        }
-
-        return $this->redirect(['action' => 'index']);
-    }
diff --git a/src/Template/Bake/Element/Controller/edit.ctp b/src/Template/Bake/Element/Controller/edit.ctp
deleted file mode 100644
index b90c1c84a..000000000
--- a/src/Template/Bake/Element/Controller/edit.ctp
+++ /dev/null
@@ -1,55 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-
-$belongsTo = $this->Bake->aliasExtractor($modelObj, 'BelongsTo');
-$belongsToMany = $this->Bake->aliasExtractor($modelObj, 'BelongsToMany');
-$compact = ["'" . $singularName . "'"];
-%>
-
-    /**
-     * Edit method
-     *
-     * @param string|null $id <%= $singularHumanName %> id.
-     * @return \Cake\Http\Response|null Redirects on successful edit, renders view otherwise.
-     * @throws \Cake\Network\Exception\NotFoundException When record not found.
-     */
-    public function edit($id = null)
-    {
-        $<%= $singularName %> = $this-><%= $currentModelName %>->get($id, [
-            'contain' => [<%= $this->Bake->stringifyList($belongsToMany, ['indent' => false]) %>]
-        ]);
-        if ($this->request->is(['patch', 'post', 'put'])) {
-            $<%= $singularName %> = $this-><%= $currentModelName %>->patchEntity($<%= $singularName %>, $this->request->getData());
-            if ($this-><%= $currentModelName; %>->save($<%= $singularName %>)) {
-                $this->Flash->success(__('The <%= strtolower($singularHumanName) %> has been saved.'));
-
-                return $this->redirect(['action' => 'index']);
-            }
-            $this->Flash->error(__('The <%= strtolower($singularHumanName) %> could not be saved. Please, try again.'));
-        }
-<%
-        foreach (array_merge($belongsTo, $belongsToMany) as $assoc):
-            $association = $modelObj->association($assoc);
-            $otherName = $association->getTarget()->getAlias();
-            $otherPlural = $this->_variableName($otherName);
-%>
-        $<%= $otherPlural %> = $this-><%= $currentModelName %>-><%= $otherName %>->find('list', ['limit' => 200]);
-<%
-            $compact[] = "'$otherPlural'";
-        endforeach;
-%>
-        $this->set(compact(<%= join(', ', $compact) %>));
-        $this->set('_serialize', ['<%=$singularName%>']);
-    }
diff --git a/src/Template/Bake/Element/Controller/index.ctp b/src/Template/Bake/Element/Controller/index.ctp
deleted file mode 100644
index 8f29ac458..000000000
--- a/src/Template/Bake/Element/Controller/index.ctp
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-
-    /**
-     * Index method
-     *
-     * @return \Cake\Http\Response|void
-     */
-    public function index()
-    {
-<% $belongsTo = $this->Bake->aliasExtractor($modelObj, 'BelongsTo'); %>
-<% if ($belongsTo): %>
-        $this->paginate = [
-            'contain' => [<%= $this->Bake->stringifyList($belongsTo, ['indent' => false]) %>]
-        ];
-<% endif; %>
-        $<%= $pluralName %> = $this->paginate($this-><%= $currentModelName %>);
-
-        $this->set(compact('<%= $pluralName %>'));
-        $this->set('_serialize', ['<%= $pluralName %>']);
-    }
diff --git a/src/Template/Bake/Element/Controller/login.ctp b/src/Template/Bake/Element/Controller/login.ctp
deleted file mode 100644
index 8458b5ded..000000000
--- a/src/Template/Bake/Element/Controller/login.ctp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-
-    /**
-     * Login method
-     *
-     * @return \Cake\Http\Response|null
-     */
-    public function login()
-    {
-        if ($this->request->is('post')) {
-            $user = $this->Auth->identify();
-            if ($user) {
-                $this->Auth->setUser($user);
-
-                return $this->redirect($this->Auth->redirectUrl());
-            }
-            $this->Flash->error(__('Invalid credentials, try again'));
-        }
-    }
diff --git a/src/Template/Bake/Element/Controller/logout.ctp b/src/Template/Bake/Element/Controller/logout.ctp
deleted file mode 100644
index 8d87256cd..000000000
--- a/src/Template/Bake/Element/Controller/logout.ctp
+++ /dev/null
@@ -1,25 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-
-    /**
-     * Logout method
-     *
-     * @return \Cake\Http\Response
-     */
-    public function logout()
-    {
-        return $this->redirect($this->Auth->logout());
-    }
diff --git a/src/Template/Bake/Element/Controller/view.ctp b/src/Template/Bake/Element/Controller/view.ctp
deleted file mode 100644
index 311ede0cb..000000000
--- a/src/Template/Bake/Element/Controller/view.ctp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-$allAssociations = array_merge(
-    $this->Bake->aliasExtractor($modelObj, 'BelongsTo'),
-    $this->Bake->aliasExtractor($modelObj, 'BelongsToMany'),
-    $this->Bake->aliasExtractor($modelObj, 'HasOne'),
-    $this->Bake->aliasExtractor($modelObj, 'HasMany')
-);
-%>
-
-    /**
-     * View method
-     *
-     * @param string|null $id <%= $singularHumanName %> id.
-     * @return \Cake\Http\Response|void
-     * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
-     */
-    public function view($id = null)
-    {
-        $<%= $singularName%> = $this-><%= $currentModelName %>->get($id, [
-            'contain' => [<%= $this->Bake->stringifyList($allAssociations, ['indent' => false]) %>]
-        ]);
-
-        $this->set('<%= $singularName %>', $<%= $singularName %>);
-        $this->set('_serialize', ['<%= $singularName %>']);
-    }
diff --git a/src/Template/Bake/Element/array_property.ctp b/src/Template/Bake/Element/array_property.ctp
deleted file mode 100644
index 5b2265313..000000000
--- a/src/Template/Bake/Element/array_property.ctp
+++ /dev/null
@@ -1,10 +0,0 @@
-<%
-use Cake\Utility\Inflector;
-%>
-
-    /**
-     * <%= Inflector::humanize($name) %>
-     *
-     * @var array
-     */
-    public $<%= $name %> = [<%= $this->Bake->stringifyList($value, ['indent' => false]) %>];
diff --git a/src/Template/Bake/Element/form.ctp b/src/Template/Bake/Element/form.ctp
deleted file mode 100644
index 2f0a7d12c..000000000
--- a/src/Template/Bake/Element/form.ctp
+++ /dev/null
@@ -1,104 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-use Cake\Utility\Inflector;
-
-$fields = collection($fields)
-    ->filter(function($field) use ($schema) {
-        return $schema->columnType($field) !== 'binary';
-    });
-
-if (isset($modelObject) && $modelObject->hasBehavior('Tree')) {
-    $fields = $fields->reject(function ($field) {
-        return $field === 'lft' || $field === 'rght';
-    });
-}
-%>
-<nav class="large-3 medium-4 columns" id="actions-sidebar">
-    <ul class="side-nav">
-        <li class="heading"><?= __('Actions') ?></li>
-<% if (strpos($action, 'add') === false): %>
-        <li><?= $this->Form->postLink(
-                __('Delete'),
-                ['action' => 'delete', $<%= $singularVar %>-><%= $primaryKey[0] %>],
-                ['confirm' => __('Are you sure you want to delete # {0}?', $<%= $singularVar %>-><%= $primaryKey[0] %>)]
-            )
-        ?></li>
-<% endif; %>
-        <li><?= $this->Html->link(__('List <%= $pluralHumanName %>'), ['action' => 'index']) ?></li>
-<%
-        $done = [];
-        foreach ($associations as $type => $data) {
-            foreach ($data as $alias => $details) {
-                if ($details['controller'] !== $this->name && !in_array($details['controller'], $done)) {
-%>
-        <li><?= $this->Html->link(__('List <%= $this->_pluralHumanName($alias) %>'), ['controller' => '<%= $details['controller'] %>', 'action' => 'index']) ?></li>
-        <li><?= $this->Html->link(__('New <%= $this->_singularHumanName($alias) %>'), ['controller' => '<%= $details['controller'] %>', 'action' => 'add']) ?></li>
-<%
-                    $done[] = $details['controller'];
-                }
-            }
-        }
-%>
-    </ul>
-</nav>
-<div class="<%= $pluralVar %> form large-9 medium-8 columns content">
-    <?= $this->Form->create($<%= $singularVar %>) ?>
-    <fieldset>
-        <legend><?= __('<%= Inflector::humanize($action) %> <%= $singularHumanName %>') ?></legend>
-        <?php
-<%
-        foreach ($fields as $field) {
-            if (in_array($field, $primaryKey)) {
-                continue;
-            }
-            if (isset($keyFields[$field])) {
-                $fieldData = $schema->column($field);
-                if (!empty($fieldData['null'])) {
-%>
-            echo $this->Form->control('<%= $field %>', ['options' => $<%= $keyFields[$field] %>, 'empty' => true]);
-<%
-                } else {
-%>
-            echo $this->Form->control('<%= $field %>', ['options' => $<%= $keyFields[$field] %>]);
-<%
-                }
-                continue;
-            }
-            if (!in_array($field, ['created', 'modified', 'updated'])) {
-                $fieldData = $schema->column($field);
-                if (in_array($fieldData['type'], ['date', 'datetime', 'time']) && (!empty($fieldData['null']))) {
-%>
-            echo $this->Form->control('<%= $field %>', ['empty' => true]);
-<%
-                } else {
-%>
-            echo $this->Form->control('<%= $field %>');
-<%
-                }
-            }
-        }
-        if (!empty($associations['BelongsToMany'])) {
-            foreach ($associations['BelongsToMany'] as $assocName => $assocData) {
-%>
-            echo $this->Form->control('<%= $assocData['property'] %>._ids', ['options' => $<%= $assocData['variable'] %>]);
-<%
-            }
-        }
-%>
-        ?>
-    </fieldset>
-    <?= $this->Form->button(__('Submit')) ?>
-    <?= $this->Form->end() ?>
-</div>
diff --git a/src/Template/Bake/Form/form.ctp b/src/Template/Bake/Form/form.ctp
deleted file mode 100644
index 93bc2d25f..000000000
--- a/src/Template/Bake/Form/form.ctp
+++ /dev/null
@@ -1,60 +0,0 @@
-<%
-/**
-* 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 modelless form
-     *
-     * @param \Cake\Form\Schema $schema From schema
-     * @return \Cake\Form\Schema
-     */
-    protected function _buildSchema(Schema $schema)
-    {
-        return $schema;
-    }
-
-    /**
-     * Form validation builder
-     *
-     * @param \Cake\Validation\Validator $validator to use against the form
-     * @return \Cake\Validation\Validator
-     */
-    protected function _buildValidator(Validator $validator)
-    {
-        return $validator;
-    }
-
-    /**
-     * Defines what to execute once the From is being processed
-     *
-     * @param array $data Form data.
-     * @return bool
-     */
-    protected function _execute(array $data)
-    {
-        return true;
-    }
-}
diff --git a/src/Template/Bake/Layout/default.ctp b/src/Template/Bake/Layout/default.ctp
deleted file mode 100644
index 7d8bda836..000000000
--- a/src/Template/Bake/Layout/default.ctp
+++ /dev/null
@@ -1,16 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<%= $this->fetch('content');
diff --git a/src/Template/Bake/Mailer/mailer.ctp b/src/Template/Bake/Mailer/mailer.ctp
deleted file mode 100644
index 822d38945..000000000
--- a/src/Template/Bake/Mailer/mailer.ctp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-namespace <%= $namespace %>\Mailer;
-
-use Cake\Mailer\Mailer;
-
-/**
- * <%= $name %> mailer.
- */
-class <%= $name %>Mailer extends Mailer
-{
-
-    /**
-     * Mailer's name.
-     *
-     * @var string
-     */
-    static public $name = '<%= $name %>';
-}
diff --git a/src/Template/Bake/Middleware/middleware.ctp b/src/Template/Bake/Middleware/middleware.ctp
deleted file mode 100644
index dd0ef7847..000000000
--- a/src/Template/Bake/Middleware/middleware.ctp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%
-/**
- * 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.3.6
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-namespace <%= $namespace %>\Middleware;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * <%= $name %> middleware
- */
-class <%= $name %>Middleware
-{
-
-    /**
-     * Invoke method.
-     *
-     * @param \Psr\Http\Message\ServerRequestInterface $request The request.
-     * @param \Psr\Http\Message\ResponseInterface $response The response.
-     * @param callable $next Callback to invoke the next middleware.
-     * @return \Psr\Http\Message\ResponseInterface A response
-     */
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, $next)
-    {
-        return $next($request, $response);
-    }
-}
diff --git a/src/Template/Bake/Model/behavior.ctp b/src/Template/Bake/Model/behavior.ctp
deleted file mode 100644
index e5340cf28..000000000
--- a/src/Template/Bake/Model/behavior.ctp
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-namespace <%= $namespace %>\Model\Behavior;
-
-use Cake\ORM\Behavior;
-use Cake\ORM\Table;
-
-/**
- * <%= $name %> behavior
- */
-class <%= $name %>Behavior extends Behavior
-{
-
-    /**
-     * Default configuration.
-     *
-     * @var array
-     */
-    protected $_defaultConfig = [];
-}
diff --git a/src/Template/Bake/Model/entity.ctp b/src/Template/Bake/Model/entity.ctp
deleted file mode 100644
index cba49d4ab..000000000
--- a/src/Template/Bake/Model/entity.ctp
+++ /dev/null
@@ -1,72 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-
-$propertyHintMap = $this->DocBlock->buildEntityPropertyHintTypeMap(isset($propertySchema) ? $propertySchema : []);
-$associationHintMap = $this->DocBlock->buildEntityAssociationHintTypeMap(isset($propertySchema) ? $propertySchema : []);
-
-$annotations = $this->DocBlock->propertyHints($propertyHintMap);
-if(!empty($associationHintMap)) {
-    $annotations[] = "";
-    $annotations = array_merge($annotations, $this->DocBlock->propertyHints($associationHintMap));
-}
-
-$accessible = [];
-if (!isset($fields) || $fields !== false) {
-    if (!empty($fields)) {
-        foreach ($fields as $field) {
-            $accessible[$field] = 'true';
-        }
-    } elseif (!empty($primaryKey)) {
-        $accessible['*'] = 'true';
-        foreach ($primaryKey as $field) {
-            $accessible[$field] = 'false';
-        }
-    }
-}
-%>
-<?php
-namespace <%= $namespace %>\Model\Entity;
-
-use Cake\ORM\Entity;
-
-<%= $this->DocBlock->classDescription($name, 'Entity', $annotations) %>
-class <%= $name %> extends Entity
-{
-<% if (!empty($accessible)): %>
-
-    /**
-     * Fields that can be mass assigned using newEntity() or patchEntity().
-     *
-     * Note that when '*' is set to true, this allows all unspecified fields to
-     * be mass assigned. For security purposes, it is advised to set '*' to false
-     * (or remove it), and explicitly make individual fields accessible as needed.
-     *
-     * @var array
-     */
-    protected $_accessible = [<%= $this->Bake->stringifyList($accessible, ['quotes' => false]) %>];
-<% endif %>
-<% if (!empty($hidden)): %>
-
-    /**
-     * Fields that are excluded from JSON versions of the entity.
-     *
-     * @var array
-     */
-    protected $_hidden = [<%= $this->Bake->stringifyList($hidden) %>];
-<% endif %>
-<% if (empty($accessible) && empty($hidden)): %>
-
-<% endif %>
-}
diff --git a/src/Template/Bake/Model/table.ctp b/src/Template/Bake/Model/table.ctp
deleted file mode 100644
index 8b73263e9..000000000
--- a/src/Template/Bake/Model/table.ctp
+++ /dev/null
@@ -1,193 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-use Cake\Utility\Inflector;
-
-$annotations = [];
-foreach ($associations as $type => $assocs) {
-    foreach ($assocs as $assoc) {
-        $typeStr = Inflector::camelize($type);
-        $tableFqn = $associationInfo[$assoc['alias']]['targetFqn'];
-        $annotations[] = "@property {$tableFqn}|\Cake\ORM\Association\\{$typeStr} \${$assoc['alias']}";
-    }
-}
-$annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity} get(\$primaryKey, \$options = [])";
-$annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity} newEntity(\$data = null, array \$options = [])";
-$annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity}[] newEntities(array \$data, array \$options = [])";
-$annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity}|bool save(\\Cake\\Datasource\\EntityInterface \$entity, \$options = [])";
-$annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity} patchEntity(\\Cake\\Datasource\\EntityInterface \$entity, array \$data, array \$options = [])";
-$annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity}[] patchEntities(\$entities, array \$data, array \$options = [])";
-$annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity} findOrCreate(\$search, callable \$callback = null, \$options = [])";
-foreach ($behaviors as $behavior => $behaviorData) {
-    $annotations[] = "@mixin \Cake\ORM\Behavior\\{$behavior}Behavior";
-}
-%>
-<?php
-namespace <%= $namespace %>\Model\Table;
-
-<%
-$uses = [
-    'use Cake\ORM\Query;',
-    'use Cake\ORM\RulesChecker;',
-    'use Cake\ORM\Table;',
-    'use Cake\Validation\Validator;'
-];
-sort($uses);
-echo implode("\n", $uses);
-%>
-
-
-<%= $this->DocBlock->classDescription($name, 'Model', $annotations) %>
-class <%= $name %>Table extends Table
-{
-
-    /**
-     * Initialize method
-     *
-     * @param array $config The configuration for the Table.
-     * @return void
-     */
-    public function initialize(array $config)
-    {
-        parent::initialize($config);
-
-<% if (!empty($table)): %>
-        $this->setTable('<%= $table %>');
-<% endif %>
-<% if (!empty($displayField)): %>
-        $this->setDisplayField('<%= $displayField %>');
-<% endif %>
-<% if (!empty($primaryKey)): %>
-<% if (is_array($primaryKey) && count($primaryKey) > 1): %>
-        $this->setPrimaryKey([<%= $this->Bake->stringifyList((array)$primaryKey, ['indent' => false]) %>]);
-<% else: %>
-        $this->setPrimaryKey('<%= current((array)$primaryKey) %>');
-<% endif %>
-<% endif %>
-<% if (!empty($behaviors)): %>
-
-<% endif; %>
-<% foreach ($behaviors as $behavior => $behaviorData): %>
-        $this->addBehavior('<%= $behavior %>'<%= $behaviorData ? ", [" . implode(', ', $behaviorData) . ']' : '' %>);
-<% endforeach %>
-<% if (!empty($associations['belongsTo']) || !empty($associations['hasMany']) || !empty($associations['belongsToMany'])): %>
-
-<% endif; %>
-<% foreach ($associations as $type => $assocs): %>
-<% foreach ($assocs as $assoc):
-	$alias = $assoc['alias'];
-	unset($assoc['alias']);
-%>
-        $this-><%= $type %>('<%= $alias %>', [<%= $this->Bake->stringifyList($assoc, ['indent' => 3]) %>]);
-<% endforeach %>
-<% endforeach %>
-    }
-<% if (!empty($validation)): %>
-
-    /**
-     * Default validation rules.
-     *
-     * @param \Cake\Validation\Validator $validator Validator instance.
-     * @return \Cake\Validation\Validator
-     */
-    public function validationDefault(Validator $validator)
-    {
-<%
-foreach ($validation as $field => $rules):
-    $validationMethods = [];
-    foreach ($rules as $ruleName => $rule):
-        if ($rule['rule'] && !isset($rule['provider'])):
-            $validationMethods[] = sprintf("->%s('%s')", $rule['rule'], $field);
-        elseif ($rule['rule'] && isset($rule['provider'])):
-            $validationMethods[] = sprintf(
-                "->add('%s', '%s', ['rule' => '%s', 'provider' => '%s'])",
-                $field,
-                $ruleName,
-                $rule['rule'],
-                $rule['provider']
-            );
-        endif;
-
-        if (isset($rule['allowEmpty'])):
-            if (is_string($rule['allowEmpty'])):
-                $validationMethods[] = sprintf(
-                    "->allowEmpty('%s', '%s')",
-                    $field,
-                    $rule['allowEmpty']
-                );
-            elseif ($rule['allowEmpty']):
-                $validationMethods[] = sprintf(
-                    "->allowEmpty('%s')",
-                    $field
-                );
-            else:
-                $validationMethods[] = sprintf(
-                    "->requirePresence('%s', 'create')",
-                    $field
-                );
-                $validationMethods[] = sprintf(
-                    "->notEmpty('%s')",
-                    $field
-                );
-            endif;
-        endif;
-    endforeach;
-
-    if (!empty($validationMethods)):
-        $lastIndex = count($validationMethods) - 1;
-        $validationMethods[$lastIndex] .= ';';
-        %>
-        $validator
-        <%- foreach ($validationMethods as $validationMethod): %>
-            <%= $validationMethod %>
-        <%- endforeach; %>
-
-<%
-    endif;
-endforeach;
-%>
-        return $validator;
-    }
-<% endif %>
-<% if (!empty($rulesChecker)): %>
-
-    /**
-     * Returns a rules checker object that will be used for validating
-     * application integrity.
-     *
-     * @param \Cake\ORM\RulesChecker $rules The rules object to be modified.
-     * @return \Cake\ORM\RulesChecker
-     */
-    public function buildRules(RulesChecker $rules)
-    {
-    <%- foreach ($rulesChecker as $field => $rule): %>
-        $rules->add($rules-><%= $rule['name'] %>(['<%= $field %>']<%= !empty($rule['extra']) ? ", '$rule[extra]'" : '' %>));
-    <%- endforeach; %>
-
-        return $rules;
-    }
-<% endif; %>
-<% if ($connection !== 'default'): %>
-
-    /**
-     * Returns the database connection name to use by default.
-     *
-     * @return string
-     */
-    public static function defaultConnectionName()
-    {
-        return '<%= $connection %>';
-    }
-<% endif; %>
-}
diff --git a/src/Template/Bake/Shell/helper.ctp b/src/Template/Bake/Shell/helper.ctp
deleted file mode 100644
index e26ee3acc..000000000
--- a/src/Template/Bake/Shell/helper.ctp
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
-/**
- * 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.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-namespace <%= $namespace %>\Shell\Helper;
-
-use Cake\Console\Helper;
-
-/**
- * <%= $name %> shell helper.
- */
-class <%= $name %>Helper extends Helper
-{
-
-    /**
-     * Output method.
-     *
-     * Generate the output for this shell helper.
-     *
-     * @return void
-     */
-    public function output($args)
-    {
-    }
-}
diff --git a/src/Template/Bake/Shell/shell.ctp b/src/Template/Bake/Shell/shell.ctp
deleted file mode 100644
index c9ff25362..000000000
--- a/src/Template/Bake/Shell/shell.ctp
+++ /dev/null
@@ -1,50 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-namespace <%= $namespace %>\Shell;
-
-use Cake\Console\Shell;
-
-/**
- * <%= $name %> shell command.
- */
-class <%= $name %>Shell extends Shell
-{
-
-    /**
-     * Manage the available sub-commands along with their arguments and help
-     *
-     * @see http://book.cakephp.org/3.0/en/console-and-shells.html#configuring-options-and-generating-help
-     *
-     * @return \Cake\Console\ConsoleOptionParser
-     */
-    public function getOptionParser()
-    {
-        $parser = parent::getOptionParser();
-
-        return $parser;
-    }
-
-    /**
-     * main() method.
-     *
-     * @return bool|int|null Success or error code.
-     */
-    public function main()
-    {
-        $this->out($this->OptionParser->help());
-    }
-}
diff --git a/src/Template/Bake/Shell/task.ctp b/src/Template/Bake/Shell/task.ctp
deleted file mode 100644
index 28175e9f3..000000000
--- a/src/Template/Bake/Shell/task.ctp
+++ /dev/null
@@ -1,34 +0,0 @@
-<%
-/**
- * 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
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-namespace <%= $namespace %>\Shell\Task;
-
-use Cake\Console\Shell;
-
-/**
- * <%= $name %> shell task.
- */
-class <%= $name %>Task extends Shell
-{
-
-    /**
-     * main() method.
-     *
-     * @return bool|int|null Success or error code.
-     */
-    public function main()
-    {
-    }
-}
diff --git a/src/Template/Bake/Template/add.ctp b/src/Template/Bake/Template/add.ctp
deleted file mode 100644
index ad270c8f7..000000000
--- a/src/Template/Bake/Template/add.ctp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-/**
- * @var \<%= $namespace %>\View\AppView $this
- * @var \<%= $entityClass %> $<%= $singularVar %>
- */
-?>
-<%= $this->element('form');
diff --git a/src/Template/Bake/Template/edit.ctp b/src/Template/Bake/Template/edit.ctp
deleted file mode 100644
index ad270c8f7..000000000
--- a/src/Template/Bake/Template/edit.ctp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-/**
- * @var \<%= $namespace %>\View\AppView $this
- * @var \<%= $entityClass %> $<%= $singularVar %>
- */
-?>
-<%= $this->element('form');
diff --git a/src/Template/Bake/Template/index.ctp b/src/Template/Bake/Template/index.ctp
deleted file mode 100644
index c7a73e3be..000000000
--- a/src/Template/Bake/Template/index.ctp
+++ /dev/null
@@ -1,122 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-/**
- * @var \<%= $namespace %>\View\AppView $this
- * @var \<%= $entityClass %>[]|\Cake\Collection\CollectionInterface $<%= $pluralVar %>
- */
-?>
-<%
-use Cake\Utility\Inflector;
-
-$fields = collection($fields)
-    ->filter(function($field) use ($schema) {
-        return !in_array($schema->columnType($field), ['binary', 'text']);
-    });
-
-if (isset($modelObject) && $modelObject->behaviors()->has('Tree')) {
-    $fields = $fields->reject(function ($field) {
-        return $field === 'lft' || $field === 'rght';
-    });
-}
-
-if (!empty($indexColumns)) {
-    $fields = $fields->take($indexColumns);
-}
-
-%>
-<nav class="large-3 medium-4 columns" id="actions-sidebar">
-    <ul class="side-nav">
-        <li class="heading"><?= __('Actions') ?></li>
-        <li><?= $this->Html->link(__('New <%= $singularHumanName %>'), ['action' => 'add']) ?></li>
-<%
-    $done = [];
-    foreach ($associations as $type => $data):
-        foreach ($data as $alias => $details):
-            if (!empty($details['navLink']) && $details['controller'] !== $this->name && !in_array($details['controller'], $done)):
-%>
-        <li><?= $this->Html->link(__('List <%= $this->_pluralHumanName($alias) %>'), ['controller' => '<%= $details['controller'] %>', 'action' => 'index']) ?></li>
-        <li><?= $this->Html->link(__('New <%= $this->_singularHumanName($alias) %>'), ['controller' => '<%= $details['controller'] %>', 'action' => 'add']) ?></li>
-<%
-                $done[] = $details['controller'];
-            endif;
-        endforeach;
-    endforeach;
-%>
-    </ul>
-</nav>
-<div class="<%= $pluralVar %> index large-9 medium-8 columns content">
-    <h3><?= __('<%= $pluralHumanName %>') ?></h3>
-    <table cellpadding="0" cellspacing="0">
-        <thead>
-            <tr>
-<% foreach ($fields as $field): %>
-                <th scope="col"><?= $this->Paginator->sort('<%= $field %>') ?></th>
-<% endforeach; %>
-                <th scope="col" class="actions"><?= __('Actions') ?></th>
-            </tr>
-        </thead>
-        <tbody>
-            <?php foreach ($<%= $pluralVar %> as $<%= $singularVar %>): ?>
-            <tr>
-<%        foreach ($fields as $field) {
-            $isKey = false;
-            if (!empty($associations['BelongsTo'])) {
-                foreach ($associations['BelongsTo'] as $alias => $details) {
-                    if ($field === $details['foreignKey']) {
-                        $isKey = true;
-%>
-                <td><?= $<%= $singularVar %>->has('<%= $details['property'] %>') ? $this->Html->link($<%= $singularVar %>-><%= $details['property'] %>-><%= $details['displayField'] %>, ['controller' => '<%= $details['controller'] %>', 'action' => 'view', $<%= $singularVar %>-><%= $details['property'] %>-><%= $details['primaryKey'][0] %>]) : '' ?></td>
-<%
-                        break;
-                    }
-                }
-            }
-            if ($isKey !== true) {
-                if (!in_array($schema->columnType($field), ['integer', 'float', 'decimal', 'biginteger', 'smallinteger', 'tinyinteger'])) {
-%>
-                <td><?= h($<%= $singularVar %>-><%= $field %>) ?></td>
-<%
-                } else {
-%>
-                <td><?= $this->Number->format($<%= $singularVar %>-><%= $field %>) ?></td>
-<%
-                }
-            }
-        }
-
-        $pk = '$' . $singularVar . '->' . $primaryKey[0];
-%>
-                <td class="actions">
-                    <?= $this->Html->link(__('View'), ['action' => 'view', <%= $pk %>]) ?>
-                    <?= $this->Html->link(__('Edit'), ['action' => 'edit', <%= $pk %>]) ?>
-                    <?= $this->Form->postLink(__('Delete'), ['action' => 'delete', <%= $pk %>], ['confirm' => __('Are you sure you want to delete # {0}?', <%= $pk %>)]) ?>
-                </td>
-            </tr>
-            <?php endforeach; ?>
-        </tbody>
-    </table>
-    <div class="paginator">
-        <ul class="pagination">
-            <?= $this->Paginator->first('<< ' . __('first')) ?>
-            <?= $this->Paginator->prev('< ' . __('previous')) ?>
-            <?= $this->Paginator->numbers() ?>
-            <?= $this->Paginator->next(__('next') . ' >') ?>
-            <?= $this->Paginator->last(__('last') . ' >>') ?>
-        </ul>
-        <p><?= $this->Paginator->counter(['format' => __('Page {{page}} of {{pages}}, showing {{current}} record(s) out of {{count}} total')]) ?></p>
-    </div>
-</div>
diff --git a/src/Template/Bake/Template/login.ctp b/src/Template/Bake/Template/login.ctp
deleted file mode 100644
index 0ac157a4d..000000000
--- a/src/Template/Bake/Template/login.ctp
+++ /dev/null
@@ -1,31 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-/**
- * @var \<%= $namespace %>\View\AppView $this
- */
-?>
-<div class="<%= $pluralVar %> form">
-<?= $this->Flash->render('auth') ?>
-    <?= $this->Form->create() ?>
-    <fieldset>
-        <legend><?= __('Please enter your username and password') ?></legend>
-        <?= $this->Form->control('username') ?>
-        <?= $this->Form->control('password') ?>
-    </fieldset>
-    <?= $this->Form->button(__('Login')); ?>
-    <?= $this->Form->end() ?>
-</div>
diff --git a/src/Template/Bake/Template/view.ctp b/src/Template/Bake/Template/view.ctp
deleted file mode 100644
index af2eab33b..000000000
--- a/src/Template/Bake/Template/view.ctp
+++ /dev/null
@@ -1,179 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-/**
- * @var \<%= $namespace %>\View\AppView $this
- * @var \<%= $entityClass %> $<%= $singularVar %>
- */
-?>
-<%
-use Cake\Utility\Inflector;
-
-$associations += ['BelongsTo' => [], 'HasOne' => [], 'HasMany' => [], 'BelongsToMany' => []];
-$immediateAssociations = $associations['BelongsTo'];
-$associationFields = collection($fields)
-    ->map(function($field) use ($immediateAssociations) {
-        foreach ($immediateAssociations as $alias => $details) {
-            if ($field === $details['foreignKey']) {
-                return [$field => $details];
-            }
-        }
-    })
-    ->filter()
-    ->reduce(function($fields, $value) {
-        return $fields + $value;
-    }, []);
-
-$groupedFields = collection($fields)
-    ->filter(function($field) use ($schema) {
-        return $schema->columnType($field) !== 'binary';
-    })
-    ->groupBy(function($field) use ($schema, $associationFields) {
-        $type = $schema->columnType($field);
-        if (isset($associationFields[$field])) {
-            return 'string';
-        }
-        if (in_array($type, ['decimal', 'biginteger', 'integer', 'float', 'smallinteger', 'tinyinteger'])) {
-            return 'number';
-        }
-        if (in_array($type, ['date', 'time', 'datetime', 'timestamp'])) {
-            return 'date';
-        }
-        return in_array($type, ['text', 'boolean']) ? $type : 'string';
-    })
-    ->toArray();
-
-$groupedFields += ['number' => [], 'string' => [], 'boolean' => [], 'date' => [], 'text' => []];
-$pk = "\$$singularVar->{$primaryKey[0]}";
-%>
-<nav class="large-3 medium-4 columns" id="actions-sidebar">
-    <ul class="side-nav">
-        <li class="heading"><?= __('Actions') ?></li>
-        <li><?= $this->Html->link(__('Edit <%= $singularHumanName %>'), ['action' => 'edit', <%= $pk %>]) ?> </li>
-        <li><?= $this->Form->postLink(__('Delete <%= $singularHumanName %>'), ['action' => 'delete', <%= $pk %>], ['confirm' => __('Are you sure you want to delete # {0}?', <%= $pk %>)]) ?> </li>
-        <li><?= $this->Html->link(__('List <%= $pluralHumanName %>'), ['action' => 'index']) ?> </li>
-        <li><?= $this->Html->link(__('New <%= $singularHumanName %>'), ['action' => 'add']) ?> </li>
-<%
-    $done = [];
-    foreach ($associations as $type => $data) {
-        foreach ($data as $alias => $details) {
-            if ($details['controller'] !== $this->name && !in_array($details['controller'], $done)) {
-%>
-        <li><?= $this->Html->link(__('List <%= $this->_pluralHumanName($alias) %>'), ['controller' => '<%= $details['controller'] %>', 'action' => 'index']) ?> </li>
-        <li><?= $this->Html->link(__('New <%= Inflector::humanize(Inflector::singularize(Inflector::underscore($alias))) %>'), ['controller' => '<%= $details['controller'] %>', 'action' => 'add']) ?> </li>
-<%
-                $done[] = $details['controller'];
-            }
-        }
-    }
-%>
-    </ul>
-</nav>
-<div class="<%= $pluralVar %> view large-9 medium-8 columns content">
-    <h3><?= h($<%= $singularVar %>-><%= $displayField %>) ?></h3>
-    <table class="vertical-table">
-<% if ($groupedFields['string']) : %>
-<% foreach ($groupedFields['string'] as $field) : %>
-<% if (isset($associationFields[$field])) :
-            $details = $associationFields[$field];
-%>
-        <tr>
-            <th scope="row"><?= __('<%= Inflector::humanize($details['property']) %>') ?></th>
-            <td><?= $<%= $singularVar %>->has('<%= $details['property'] %>') ? $this->Html->link($<%= $singularVar %>-><%= $details['property'] %>-><%= $details['displayField'] %>, ['controller' => '<%= $details['controller'] %>', 'action' => 'view', $<%= $singularVar %>-><%= $details['property'] %>-><%= $details['primaryKey'][0] %>]) : '' ?></td>
-        </tr>
-<% else : %>
-        <tr>
-            <th scope="row"><?= __('<%= Inflector::humanize($field) %>') ?></th>
-            <td><?= h($<%= $singularVar %>-><%= $field %>) ?></td>
-        </tr>
-<% endif; %>
-<% endforeach; %>
-<% endif; %>
-<% if ($associations['HasOne']) : %>
-    <%- foreach ($associations['HasOne'] as $alias => $details) : %>
-        <tr>
-            <th scope="row"><?= __('<%= Inflector::humanize(Inflector::singularize(Inflector::underscore($alias))) %>') ?></th>
-            <td><?= $<%= $singularVar %>->has('<%= $details['property'] %>') ? $this->Html->link($<%= $singularVar %>-><%= $details['property'] %>-><%= $details['displayField'] %>, ['controller' => '<%= $details['controller'] %>', 'action' => 'view', $<%= $singularVar %>-><%= $details['property'] %>-><%= $details['primaryKey'][0] %>]) : '' ?></td>
-        </tr>
-    <%- endforeach; %>
-<% endif; %>
-<% if ($groupedFields['number']) : %>
-<% foreach ($groupedFields['number'] as $field) : %>
-        <tr>
-            <th scope="row"><?= __('<%= Inflector::humanize($field) %>') ?></th>
-            <td><?= $this->Number->format($<%= $singularVar %>-><%= $field %>) ?></td>
-        </tr>
-<% endforeach; %>
-<% endif; %>
-<% if ($groupedFields['date']) : %>
-<% foreach ($groupedFields['date'] as $field) : %>
-        <tr>
-            <th scope="row"><%= "<%= __('" . Inflector::humanize($field) . "') %>" %></th>
-            <td><?= h($<%= $singularVar %>-><%= $field %>) ?></td>
-        </tr>
-<% endforeach; %>
-<% endif; %>
-<% if ($groupedFields['boolean']) : %>
-<% foreach ($groupedFields['boolean'] as $field) : %>
-        <tr>
-            <th scope="row"><?= __('<%= Inflector::humanize($field) %>') ?></th>
-            <td><?= $<%= $singularVar %>-><%= $field %> ? __('Yes') : __('No'); ?></td>
-        </tr>
-<% endforeach; %>
-<% endif; %>
-    </table>
-<% if ($groupedFields['text']) : %>
-<% foreach ($groupedFields['text'] as $field) : %>
-    <div class="row">
-        <h4><?= __('<%= Inflector::humanize($field) %>') ?></h4>
-        <?= $this->Text->autoParagraph(h($<%= $singularVar %>-><%= $field %>)); ?>
-    </div>
-<% endforeach; %>
-<% endif; %>
-<%
-$relations = $associations['HasMany'] + $associations['BelongsToMany'];
-foreach ($relations as $alias => $details):
-    $otherSingularVar = Inflector::variable($alias);
-    $otherPluralHumanName = Inflector::humanize(Inflector::underscore($details['controller']));
-    %>
-    <div class="related">
-        <h4><?= __('Related <%= $otherPluralHumanName %>') ?></h4>
-        <?php if (!empty($<%= $singularVar %>-><%= $details['property'] %>)): ?>
-        <table cellpadding="0" cellspacing="0">
-            <tr>
-<% foreach ($details['fields'] as $field): %>
-                <th scope="col"><?= __('<%= Inflector::humanize($field) %>') ?></th>
-<% endforeach; %>
-                <th scope="col" class="actions"><?= __('Actions') ?></th>
-            </tr>
-            <?php foreach ($<%= $singularVar %>-><%= $details['property'] %> as $<%= $otherSingularVar %>): ?>
-            <tr>
-            <%- foreach ($details['fields'] as $field): %>
-                <td><?= h($<%= $otherSingularVar %>-><%= $field %>) ?></td>
-            <%- endforeach; %>
-            <%- $otherPk = "\${$otherSingularVar}->{$details['primaryKey'][0]}"; %>
-                <td class="actions">
-                    <?= $this->Html->link(__('View'), ['controller' => '<%= $details['controller'] %>', 'action' => 'view', <%= $otherPk %>]) ?>
-                    <?= $this->Html->link(__('Edit'), ['controller' => '<%= $details['controller'] %>', 'action' => 'edit', <%= $otherPk %>]) ?>
-                    <?= $this->Form->postLink(__('Delete'), ['controller' => '<%= $details['controller'] %>', 'action' => 'delete', <%= $otherPk %>], ['confirm' => __('Are you sure you want to delete # {0}?', <%= $otherPk %>)]) ?>
-                </td>
-            </tr>
-            <?php endforeach; ?>
-        </table>
-        <?php endif; ?>
-    </div>
-<% endforeach; %>
-</div>
diff --git a/src/Template/Bake/View/cell.ctp b/src/Template/Bake/View/cell.ctp
deleted file mode 100644
index 9f19517ab..000000000
--- a/src/Template/Bake/View/cell.ctp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-namespace <%= $namespace %>\View\Cell;
-
-use Cake\View\Cell;
-
-/**
- * <%= $name %> cell
- */
-class <%= $name %>Cell extends Cell
-{
-
-    /**
-     * List of valid options that can be passed into this
-     * cell's constructor.
-     *
-     * @var array
-     */
-    protected $_validCellOptions = [];
-
-    /**
-     * Default display method.
-     *
-     * @return void
-     */
-    public function display()
-    {
-    }
-}
diff --git a/src/Template/Bake/View/helper.ctp b/src/Template/Bake/View/helper.ctp
deleted file mode 100644
index e498a7028..000000000
--- a/src/Template/Bake/View/helper.ctp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%
-/**
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-namespace <%= $namespace %>\View\Helper;
-
-use Cake\View\Helper;
-use Cake\View\View;
-
-/**
- * <%= $name %> helper
- */
-class <%= $name %>Helper extends Helper
-{
-
-    /**
-     * Default configuration.
-     *
-     * @var array
-     */
-    protected $_defaultConfig = [];
-
-}
diff --git a/src/Template/Bake/tests/fixture.ctp b/src/Template/Bake/tests/fixture.ctp
deleted file mode 100644
index fb8adb52e..000000000
--- a/src/Template/Bake/tests/fixture.ctp
+++ /dev/null
@@ -1,69 +0,0 @@
-<%
-/**
- * Fixture Template file
- *
- * Fixture Template used when baking fixtures with bake
- *
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-%>
-<?php
-namespace <%= $namespace %>\Test\Fixture;
-
-use Cake\TestSuite\Fixture\TestFixture;
-
-/**
- * <%= $name %>Fixture
- *
- */
-class <%= $name %>Fixture extends TestFixture
-{
-<% if ($table): %>
-
-    /**
-     * Table name
-     *
-     * @var string
-     */
-    public $table = '<%= $table %>';
-<% endif; %>
-<% if ($import): %>
-
-    /**
-     * Import
-     *
-     * @var array
-     */
-    public $import = <%= $import %>;
-<% endif; %>
-<% if ($schema): %>
-
-    /**
-     * Fields
-     *
-     * @var array
-     */
-    // @codingStandardsIgnoreStart
-    public $fields = <%= $schema %>;
-    // @codingStandardsIgnoreEnd
-<% endif; %>
-<% if ($records): %>
-
-    /**
-     * Records
-     *
-     * @var array
-     */
-    public $records = <%= $records %>;
-<% endif; %>
-}
diff --git a/src/Template/Bake/tests/test_case.ctp b/src/Template/Bake/tests/test_case.ctp
deleted file mode 100644
index 8f9a0a147..000000000
--- a/src/Template/Bake/tests/test_case.ctp
+++ /dev/null
@@ -1,120 +0,0 @@
-<%
-/**
- * Test Case bake template
- *
- * 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         0.1.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-use Cake\Utility\Inflector;
-
-$isController = strtolower($type) === 'controller';
-
-if ($isController) {
-    $uses[] = 'Cake\TestSuite\IntegrationTestCase';
-} else {
-    $uses[] = 'Cake\TestSuite\TestCase';
-}
-sort($uses);
-%>
-<?php
-namespace <%= $baseNamespace; %>\Test\TestCase\<%= $subNamespace %>;
-
-<% foreach ($uses as $dependency): %>
-use <%= $dependency; %>;
-<% endforeach; %>
-
-/**
- * <%= $fullClassName %> Test Case
- */
-<% if ($isController): %>
-class <%= $className %>Test extends IntegrationTestCase
-{
-<% else: %>
-class <%= $className %>Test extends TestCase
-{
-<% endif; %>
-<% if (!empty($properties)): %>
-<% foreach ($properties as $propertyInfo): %>
-
-    /**
-     * <%= $propertyInfo['description'] %>
-     *
-     * @var <%= $propertyInfo['type'] %>
-     */
-    public $<%= $propertyInfo['name'] %><% if (isset($propertyInfo['value'])): %> = <%= $propertyInfo['value'] %><% endif; %>;
-<% endforeach; %>
-<% endif; %>
-<% if (!empty($fixtures)): %>
-
-    /**
-     * Fixtures
-     *
-     * @var array
-     */
-    public $fixtures = [<%= $this->Bake->stringifyList(array_values($fixtures)) %>];
-<% endif; %>
-<% if (!empty($construction)): %>
-
-    /**
-     * setUp method
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        parent::setUp();
-    <%- if ($preConstruct): %>
-        <%= $preConstruct %>
-    <%- endif; %>
-        $this-><%= $subject . ' = ' . $construction %>
-    <%- if ($postConstruct): %>
-        <%= $postConstruct %>
-    <%- endif; %>
-    }
-
-    /**
-     * tearDown method
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        unset($this-><%= $subject %>);
-
-        parent::tearDown();
-    }
-<% endif; %>
-<% foreach ($methods as $method): %>
-
-    /**
-     * Test <%= $method %> method
-     *
-     * @return void
-     */
-    public function test<%= Inflector::camelize($method) %>()
-    {
-        $this->markTestIncomplete('Not implemented yet.');
-    }
-<% endforeach; %>
-<% if (empty($methods)): %>
-
-    /**
-     * Test initial setup
-     *
-     * @return void
-     */
-    public function testInitialization()
-    {
-        $this->markTestIncomplete('Not implemented yet.');
-    }
-<% endif; %>
-}
diff --git a/tests/test_app/App/Template/Bake/example.twig b/tests/test_app/App/Template/Bake/example.twig
deleted file mode 100644
index e3ca219ba..000000000
--- a/tests/test_app/App/Template/Bake/example.twig
+++ /dev/null
@@ -1,2 +0,0 @@
-I got rendered
-{{ test }}
\ No newline at end of file

From c21e0e07b8d9e02df08aedfbeb3a3048cc18b93d Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Fri, 27 Oct 2017 13:38:57 +0530
Subject: [PATCH 43/44] Indent twig tags for improved readability.

---
 src/Template/Bake/Controller/controller.twig  | 18 ++++---
 src/Template/Bake/Element/Controller/add.twig | 10 ++--
 .../Bake/Element/Controller/edit.twig         |  7 +--
 src/Template/Bake/Element/form.twig           | 50 +++++++++++--------
 src/Template/Bake/Model/entity.twig           | 10 ++--
 src/Template/Bake/Model/table.twig            | 49 +++++++++++-------
 src/Template/Bake/tests/fixture.twig          |  9 ++--
 src/Template/Bake/tests/test_case.twig        | 22 +++++---
 8 files changed, 107 insertions(+), 68 deletions(-)

diff --git a/src/Template/Bake/Controller/controller.twig b/src/Template/Bake/Controller/controller.twig
index e80459356..1b877f747 100644
--- a/src/Template/Bake/Controller/controller.twig
+++ b/src/Template/Bake/Controller/controller.twig
@@ -28,11 +28,13 @@ use {{ namespace }}\Controller\AppController;
 {% if defaultModel %}
  * @property \{{ defaultModel }} ${{ name }}
 {% endif %}
-{% for component in components %}
+
+{%- for component in components %}
 {% set classInfo = Bake.classInfo(component, 'Controller/Component', 'Component') %}
  * @property {{ classInfo.fqn }} ${{ classInfo.name }}
 {% endfor %}
-{% if 'index' in actions %}
+
+{%- if 'index' in actions %}
  *
  * @method \{{ namespace }}\Model\Entity\{{ entityClassName }}[] paginate($object = null, array $settings = [])
 {% endif %}
@@ -41,13 +43,15 @@ class {{ name }}Controller extends AppController
 {
 {% set helpers = Bake.arrayProperty('helpers', helpers, {'indent': false})|raw %}
 {% if helpers|trim %}
-{{ helpers|raw }}
+    {{- helpers|raw }}
 {% endif %}
-{% set components = Bake.arrayProperty('components', components, {'indent': false})|raw %}
+
+{%- set components = Bake.arrayProperty('components', components, {'indent': false})|raw %}
 {% if components|trim %}
-{{ components|raw }}
+    {{- components|raw }}
 {% endif %}
-{% for action in actions %}
-{% element 'Controller/' ~ action %}
+
+{%- for action in actions %}
+    {%- element 'Controller/' ~ action %}
 {% endfor %}
 }
diff --git a/src/Template/Bake/Element/Controller/add.twig b/src/Template/Bake/Element/Controller/add.twig
index 969ada13c..9583f80c7 100644
--- a/src/Template/Bake/Element/Controller/add.twig
+++ b/src/Template/Bake/Element/Controller/add.twig
@@ -34,11 +34,13 @@
         }
 {% set associations = Bake.aliasExtractor(modelObj, 'BelongsTo') %}
 {% set associations = associations|merge(Bake.aliasExtractor(modelObj, 'BelongsToMany')) %}
-{% for assoc in associations %}
-{% set otherName = Bake.getAssociatedTableAlias(modelObj, assoc) %}
-{% set otherPlural = otherName|variable %}
+
+{%- for assoc in associations %}
+    {%- set otherName = Bake.getAssociatedTableAlias(modelObj, assoc) %}
+    {%- set otherPlural = otherName|variable %}
         ${{ otherPlural }} = $this->{{ currentModelName }}->{{ otherName }}->find('list', ['limit' => 200]);
-{% set compact = compact|merge(["'#{otherPlural}'"]) %}
+        {{- "\n" }}
+    {%- set compact = compact|merge(["'#{otherPlural}'"]) %}
 {% endfor %}
         $this->set(compact({{ compact|join(', ')|raw }}));
         $this->set('_serialize', ['{{ singularName }}']);
diff --git a/src/Template/Bake/Element/Controller/edit.twig b/src/Template/Bake/Element/Controller/edit.twig
index e64bb5bdd..a4fc28573 100644
--- a/src/Template/Bake/Element/Controller/edit.twig
+++ b/src/Template/Bake/Element/Controller/edit.twig
@@ -39,10 +39,11 @@
             $this->Flash->error(__('The {{ singularHumanName|lower }} could not be saved. Please, try again.'));
         }
 {% for assoc in belongsTo|merge(belongsToMany) %}
-{% set otherName = Bake.getAssociatedTableAlias(modelObj, assoc) %}
-{% set otherPlural = otherName|variable %}
+    {%- set otherName = Bake.getAssociatedTableAlias(modelObj, assoc) %}
+    {%- set otherPlural = otherName|variable %}
         ${{ otherPlural }} = $this->{{ currentModelName }}->{{ otherName }}->find('list', ['limit' => 200]);
-{% set compact = compact|merge(["'#{otherPlural}'"]) %}
+        {{- "\n" }}
+    {%- set compact = compact|merge(["'#{otherPlural}'"]) %}
 {% endfor %}
         $this->set(compact({{ compact|join(', ')|raw }}));
         $this->set('_serialize', ['{{ singularName }}']);
diff --git a/src/Template/Bake/Element/form.twig b/src/Template/Bake/Element/form.twig
index 91f09e2e2..b2d9e5005 100644
--- a/src/Template/Bake/Element/form.twig
+++ b/src/Template/Bake/Element/form.twig
@@ -26,15 +26,17 @@
         ?></li>
 {% endif %}
         <li><?= $this->Html->link(__('List {{ pluralHumanName }}'), ['action' => 'index']) ?></li>
-{% set done = [] %}
+        {{- "\n" }}
+{%- set done = [] %}
 {% for type, data in associations %}
-{% for alias, details in data %}
-{% if details.controller is not same as(_view.name) and details.controller not in done %}
+    {%- for alias, details in data %}
+        {%- if details.controller is not same as(_view.name) and details.controller not in done %}
         <li><?= $this->Html->link(__('List {{ alias|underscore|humanize }}'), ['controller' => '{{ details.controller }}', 'action' => 'index']) ?></li>
         <li><?= $this->Html->link(__('New {{ alias|singularize|underscore|humanize }}'), ['controller' => '{{ details.controller }}', 'action' => 'add']) ?></li>
-{% set done = done|merge([details.controller]) %}
-{% endif %}
-{% endfor %}
+        {{- "\n" }}
+        {%- set done = done|merge([details.controller]) %}
+        {%- endif %}
+    {%- endfor %}
 {% endfor %}
     </ul>
 </nav>
@@ -44,26 +46,32 @@
         <legend><?= __('{{ action|humanize }} {{ singularHumanName }}') ?></legend>
         <?php
 {% for field in fields if field not in primaryKey %}
-{% if keyFields[field] %}
-{% set fieldData = Bake.columnData(field, schema) %}
-{% if fieldData.null %}
+    {%- if keyFields[field] %}
+        {%- set fieldData = Bake.columnData(field, schema) %}
+        {%- if fieldData.null %}
             echo $this->Form->control('{{ field }}', ['options' => ${{ keyFields[field] }}, 'empty' => true]);
-{% else %}
+            {{- "\n" }}
+        {%- else %}
             echo $this->Form->control('{{ field }}', ['options' => ${{ keyFields[field] }}]);
-{% endif %}
-{% elseif field not in ['created', 'modified', 'updated'] %}
-{% set fieldData = Bake.columnData(field, schema) %}
-{% if fieldData.type in ['date', 'datetime', 'time'] and fieldData.null %}
+            {{- "\n" }}
+        {%- endif %}
+    {%- elseif field not in ['created', 'modified', 'updated'] %}
+        {%- set fieldData = Bake.columnData(field, schema) %}
+        {%- if fieldData.type in ['date', 'datetime', 'time'] and fieldData.null %}
             echo $this->Form->control('{{ field }}', ['empty' => true]);
-{% else %}
+            {{- "\n" }}
+        {%- else %}
             echo $this->Form->control('{{ field }}');
-{% endif %}
-{% endif %}
-{% endfor %}
-{% if associations.BelongsToMany %}
-{% for assocName, assocData in associations.BelongsToMany %}
+    {{- "\n" }}
+        {%- endif %}
+    {%- endif %}
+{%- endfor %}
+
+{%- if associations.BelongsToMany %}
+    {%- for assocName, assocData in associations.BelongsToMany %}
             echo $this->Form->control('{{ assocData.property }}._ids', ['options' => ${{ assocData.variable }}]);
-{% endfor %}
+    {{- "\n" }}
+    {%- endfor %}
 {% endif %}
         ?>
     </fieldset>
diff --git a/src/Template/Bake/Model/entity.twig b/src/Template/Bake/Model/entity.twig
index 79589e4e6..e09794a3d 100644
--- a/src/Template/Bake/Model/entity.twig
+++ b/src/Template/Bake/Model/entity.twig
@@ -18,8 +18,8 @@
 {% set annotations = DocBlock.propertyHints(propertyHintMap) %}
 
 {%- if associationHintMap %}
-{% set annotations = annotations|merge(['']) %}
-{% set annotations = annotations|merge(DocBlock.propertyHints(associationHintMap)) %}
+    {%- set annotations = annotations|merge(['']) %}
+    {%- set annotations = annotations|merge(DocBlock.propertyHints(associationHintMap)) %}
 {% endif %}
 
 {%- set accessible = Bake.getFieldAccessibility(fields, primaryKey) %}
@@ -44,7 +44,8 @@ class {{ name }} extends Entity
      */
     protected $_accessible = [{{ Bake.stringifyList(accessible, {'quotes': false})|raw }}];
 {% endif %}
-{% if hidden %}
+
+{%- if hidden %}
 
     /**
      * Fields that are excluded from JSON versions of the entity.
@@ -53,7 +54,8 @@ class {{ name }} extends Entity
      */
     protected $_hidden = [{{ Bake.stringifyList(hidden)|raw }}];
 {% endif %}
-{% if not accessible and not hidden %}
+
+{%- if not accessible and not hidden %}
 
 {% endif %}
 }
diff --git a/src/Template/Bake/Model/table.twig b/src/Template/Bake/Model/table.twig
index a6879a5b7..439715d86 100644
--- a/src/Template/Bake/Model/table.twig
+++ b/src/Template/Bake/Model/table.twig
@@ -37,36 +37,47 @@ class {{ name }}Table extends Table
 {% if table %}
         $this->setTable('{{ table }}');
 {% endif %}
-{% if displayField %}
+
+{%- if displayField %}
         $this->setDisplayField('{{ displayField }}');
 {% endif %}
-{% if primaryKey %}
-{% if primaryKey is iterable and primaryKey|count > 1 %}
+
+{%- if primaryKey %}
+    {%- if primaryKey is iterable and primaryKey|count > 1 %}
         $this->setPrimaryKey([{{ Bake.stringifyList(primaryKey, {'indent': false})|raw }}]);
-{% else %}
+        {{- "\n" }}
+    {%- else %}
         $this->setPrimaryKey('{{ primaryKey|as_array|first }}');
+        {{- "\n" }}
+    {%- endif %}
 {% endif %}
-{% endif %}
-{% if behaviors %}
+
+{%- if behaviors %}
 
 {% endif %}
-{% for behavior, behaviorData in behaviors %}
+
+{%- for behavior, behaviorData in behaviors %}
         $this->addBehavior('{{ behavior }}'{{ (behaviorData ? (", [" ~ behaviorData|join(', ') ~ ']') : '')|raw }});
 {% endfor %}
-{% if associations.belongsTo or associations.hasMany or associations.belongsToMany %}
+
+{%- if associations.belongsTo or associations.hasMany or associations.belongsToMany %}
 
 {% endif %}
-{% for type, assocs in associations %}
-{% for assoc in assocs %}
-{% set assocData = [] %}
-{% for key, val in assoc if key is not same as('alias') %}
-{% set assocData = assocData|merge({(key): val}) %}
-{% endfor %}
+
+{%- for type, assocs in associations %}
+    {%- for assoc in assocs %}
+        {%- set assocData = [] %}
+        {%- for key, val in assoc if key is not same as('alias') %}
+            {%- set assocData = assocData|merge({(key): val}) %}
+        {%- endfor %}
         $this->{{ type }}('{{ assoc.alias }}', [{{ Bake.stringifyList(assocData, {'indent': 3})|raw }}]);
-{% endfor %}
+        {{- "\n" }}
+    {%- endfor %}
 {% endfor %}
     }
-{% if validation %}
+{{- "\n" }}
+
+{%- if validation %}
 
     /**
      * Default validation rules.
@@ -92,7 +103,8 @@ class {{ name }}Table extends Table
         return $validator;
     }
 {% endif %}
-{% if rulesChecker %}
+
+{%- if rulesChecker %}
 
     /**
      * Returns a rules checker object that will be used for validating
@@ -110,7 +122,8 @@ class {{ name }}Table extends Table
         return $rules;
     }
 {% endif %}
-{% if connection is not same as('default') %}
+
+{%- if connection is not same as('default') %}
 
     /**
      * Returns the database connection name to use by default.
diff --git a/src/Template/Bake/tests/fixture.twig b/src/Template/Bake/tests/fixture.twig
index 7bce9bebd..2e8dee155 100644
--- a/src/Template/Bake/tests/fixture.twig
+++ b/src/Template/Bake/tests/fixture.twig
@@ -37,7 +37,8 @@ class {{ name }}Fixture extends TestFixture
      */
     public $table = '{{ table|raw }}';
 {% endif %}
-{% if import %}
+
+{%- if import %}
 
     /**
      * Import
@@ -46,7 +47,8 @@ class {{ name }}Fixture extends TestFixture
      */
     public $import = {{ import|raw }};
 {% endif %}
-{% if schema %}
+
+{%- if schema %}
 
     /**
      * Fields
@@ -57,7 +59,8 @@ class {{ name }}Fixture extends TestFixture
     public $fields = {{ schema|raw }};
     // @codingStandardsIgnoreEnd
 {% endif %}
-{% if records %}
+
+{%- if records %}
 
     /**
      * Records
diff --git a/src/Template/Bake/tests/test_case.twig b/src/Template/Bake/tests/test_case.twig
index e4aa40368..b5600db2a 100644
--- a/src/Template/Bake/tests/test_case.twig
+++ b/src/Template/Bake/tests/test_case.twig
@@ -17,11 +17,12 @@
 #}
 {% set isController = type|lower == 'controller' %}
 {% if isController %}
-{% set uses = uses|merge(['Cake\\TestSuite\\IntegrationTestCase']) %}
+    {%- set uses = uses|merge(['Cake\\TestSuite\\IntegrationTestCase']) %}
 {% else %}
-{% set uses = uses|merge(['Cake\\TestSuite\\TestCase']) %}
+    {%- set uses = uses|merge(['Cake\\TestSuite\\TestCase']) %}
 {% endif %}
-{% set uses = uses|sort %}
+
+{%- set uses = uses|sort %}
 <?php
 namespace {{ baseNamespace }}\Test\TestCase\{{ subNamespace }};
 
@@ -39,7 +40,8 @@ class {{ className }}Test extends IntegrationTestCase
 class {{ className }}Test extends TestCase
 {
 {% endif %}
-{% if properties %}
+
+{%- if properties %}
 {% for propertyInfo in properties %}
 
     /**
@@ -50,7 +52,8 @@ class {{ className }}Test extends TestCase
     public ${{ propertyInfo.name }}{% if propertyInfo.value %} = {{ propertyInfo.value }}{% endif %};
 {% endfor %}
 {% endif %}
-{% if fixtures %}
+
+{%- if fixtures %}
 
     /**
      * Fixtures
@@ -59,7 +62,8 @@ class {{ className }}Test extends TestCase
      */
     public $fixtures = [{{ Bake.stringifyList(fixtures|values)|raw }}];
 {% endif %}
-{% if construction %}
+
+{%- if construction %}
 
     /**
      * setUp method
@@ -90,7 +94,8 @@ class {{ className }}Test extends TestCase
         parent::tearDown();
     }
 {% endif %}
-{% for method in methods %}
+
+{%- for method in methods %}
 
     /**
      * Test {{ method }} method
@@ -102,7 +107,8 @@ class {{ className }}Test extends TestCase
         $this->markTestIncomplete('Not implemented yet.');
     }
 {% endfor %}
-{% if not methods %}
+
+{%- if not methods %}
 
     /**
      * Test initial setup

From 12bb04b00e67f7013dff8f18c94077f62fb329f2 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Fri, 27 Oct 2017 13:40:03 +0530
Subject: [PATCH 44/44] Fix template extension.

---
 src/Template/Bake/Plugin/{.gitignore => .gitignore.twig} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Template/Bake/Plugin/{.gitignore => .gitignore.twig} (100%)

diff --git a/src/Template/Bake/Plugin/.gitignore b/src/Template/Bake/Plugin/.gitignore.twig
similarity index 100%
rename from src/Template/Bake/Plugin/.gitignore
rename to src/Template/Bake/Plugin/.gitignore.twig