Merge pull request #386 from cakephp/ADmad-patch-1

Use twig's inbuilt filter instead of custom one.
cakephp · Dec 1, 2017 · de561b9 · de561b9
2 parents fd7b991 + a3c1b8b
commit de561b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "php": ">=5.6.0",
         "cakephp/cakephp": "^3.5",
         "cakephp/plugin-installer": "^1.0",
-        "wyrihaximus/twig-view": "^4.1"
+        "wyrihaximus/twig-view": "^4.2"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^3.0",

diff --git a/src/Template/Bake/Model/table.twig b/src/Template/Bake/Model/table.twig
@@ -43,7 +43,7 @@ class {{ name }}Table extends Table
 {% endif %}
 
 {%- if primaryKey %}
-    {%- if primaryKey is iterable and primaryKey|count > 1 %}
+    {%- if primaryKey is iterable and primaryKey|length > 1 %}
         $this->setPrimaryKey([{{ Bake.stringifyList(primaryKey, {'indent': false})|raw }}]);
         {{- "\n" }}
     {%- else %}