Merge pull request #631 from cakephp/twigview-5

Update templates for Twig 3 compatibility.
cakephp · Dec 30, 2019 · 09a9b3e · 09a9b3e
2 parents 91b20e2 + 5ee43ff
commit 09a9b3e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -21,11 +21,11 @@
         "php": ">=7.2",
         "cakephp/cakephp": "^4.0",
         "cakephp/plugin-installer": "^1.0",
-        "wyrihaximus/twig-view": "dev-master"
+        "wyrihaximus/twig-view": "^5.0.1"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^4.0",
-        "phpunit/phpunit": "^8.0"
+        "phpunit/phpunit": "~8.5.0"
     },
     "autoload": {
         "psr-4": {
@@ -52,7 +52,5 @@
         "phpstan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan-shim:^0.11 && mv composer.backup composer.json",
         "test": "phpunit",
         "test-coverage": "phpunit --coverage-clover=clover.xml"
-    },
-    "prefer-stable": true,
-    "minimum-stability": "dev"
+    }
 }
diff --git a/templates/bake/Model/table.twig b/templates/bake/Model/table.twig
@@ -68,8 +68,10 @@ class {{ name }}Table extends Table
 {%- 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}) %}
+        {%- for key, val in assoc %}
+            {%- if key is not same as('alias') %}
+                {%- set assocData = assocData|merge({(key): val}) %}
+            {%- endif %}
         {%- endfor %}
         $this->{{ type }}('{{ assoc.alias }}', [{{ Bake.stringifyList(assocData, {'indent': 3})|raw }}]);
         {{- "\n" }}

diff --git a/templates/bake/Template/index.twig b/templates/bake/Template/index.twig
@@ -40,9 +40,11 @@
 {% for field in fields %}
 {% set isKey = false %}
 {% if associations.BelongsTo %}
-{% for alias, details in associations.BelongsTo if field == details.foreignKey %}
+{% 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>
+{% endif %}
 {% endfor %}
 {% endif %}
 {% if isKey is not same as(true) %}

diff --git a/templates/bake/element/form.twig b/templates/bake/element/form.twig
@@ -36,25 +36,27 @@
             <fieldset>
                 <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 %}
+{% 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]);
                     {{- "\n" }}
-{%- else %}
+        {%- else %}
                     echo $this->Form->control('{{ field }}', ['options' => ${{ keyFields[field] }}]);
                     {{- "\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 %}
+        {%- 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]);
                     {{- "\n" }}
-{%- else %}
+        {%- else %}
                     echo $this->Form->control('{{ field }}');
-            {{- "\n" }}
-{%- endif %}
+                    {{- "\n" }}
+        {%- endif %}
+    {%- endif %}
 {%- endif %}
 {%- endfor %}