From 061efd9c975328d2200db383646d4ecf9b485541 Mon Sep 17 00:00:00 2001
From: Bob den Otter <bob@twokings.nl>
Date: Wed, 12 Aug 2020 15:07:48 +0200
Subject: [PATCH 1/2] Output Fields correctly, when using the Fields Block

---
 src/Twig/FieldExtension.php    | 2 +-
 templates/helpers/_fields.twig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Twig/FieldExtension.php b/src/Twig/FieldExtension.php
index 4046d9d6b..a78c35595 100644
--- a/src/Twig/FieldExtension.php
+++ b/src/Twig/FieldExtension.php
@@ -78,7 +78,7 @@ public function getLabel(Field $field): string
 
     public function getType(Field $field): string
     {
-        return $field->getDefinition()->get('type');
+        return $field->getType() ?? $field->getDefinition()->get('type');
     }
 
     /**
diff --git a/templates/helpers/_fields.twig b/templates/helpers/_fields.twig
index b110c19eb..f7eed0d7c 100644
--- a/templates/helpers/_fields.twig
+++ b/templates/helpers/_fields.twig
@@ -27,7 +27,7 @@
         {% set omittedkeys = ['id', 'slug', 'datecreated', 'datechanged', 'datepublish',
             'datedepublish', 'username', 'status', 'ownerid', 'templatefields'] %}
         {% set commonfields = ['html', 'markdown', 'textarea', 'text', 'image', 'file', 'video'] %}
-        {% set extendedfields = ['select', 'checkbox', 'embed', 'date', 'number'] %}
+        {% set extendedfields = ['select', 'checkbox', 'embed', 'date', 'number', 'hidden', 'data'] %}
         {% set compoundfields = ['collection', 'filelist', 'imagelist', 'set'] %}
         {% set allfields = commonfields|merge(extendedfields)|merge(compoundfields) %}
 

From b97483d152663717b0200f325a8c3cad679b0ff2 Mon Sep 17 00:00:00 2001
From: Bob den Otter <bob@twokings.nl>
Date: Thu, 13 Aug 2020 09:28:42 +0200
Subject: [PATCH 2/2] Temporarily fixate symplify/easy-coding-standard on
 8.2.1, until we fix it properly

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a6930a450..34e97234e 100644
--- a/composer.json
+++ b/composer.json
@@ -104,7 +104,7 @@
         "se/selenium-server-standalone": "^3.141",
         "symfony/browser-kit": "^4.4 | ^5.1",
         "symfony/css-selector": "^4.4 | ^5.1",
-        "symplify/easy-coding-standard": "^8.1.10",
+        "symplify/easy-coding-standard": "8.2.1",
         "vaimo/binary-chromedriver": "^5.0"
     },
     "config": {