From 2aa9188fbc980c9ae1506a04230efb10e503a7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 13 Mar 2020 16:27:39 +0100
Subject: [PATCH] do not throw an exception when null element are passed to
 `chill_entity_render_box` and `chill_entity_render_string`

---
 CHANGELOG.md                                     |  5 +++--
 Templating/Entity/ChillEntityRenderExtension.php | 10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9f72b469..591f807fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -106,7 +106,8 @@ Version 1.5.15
 - [phonenumber validation] allow to validate against mobile **or** landline/voip phonenumbers;
 - [phonenumber validation & format] format and validation does not make the app fail when network is not available;
 
-Master branch
-=============
+Version 1.5.16
+==============
 
 - [translation] in french, replace "Modifier" by "Enregistrer" in the edit form
+- [entity render] do not throw an exception when null element are passed to `chill_entity_render_box` and `chill_entity_render_string`
diff --git a/Templating/Entity/ChillEntityRenderExtension.php b/Templating/Entity/ChillEntityRenderExtension.php
index 98cb90ee5..b642ab2b3 100644
--- a/Templating/Entity/ChillEntityRenderExtension.php
+++ b/Templating/Entity/ChillEntityRenderExtension.php
@@ -55,12 +55,20 @@ class ChillEntityRenderExtension extends AbstractExtension
     
     public function renderString($entity, array $options = []): string
     {
+        if ($entity === NULL) {
+            return '';
+        }
+        
         return $this->getRender($entity, $options)
             ->renderString($entity, $options);
     }
     
     public function renderBox($entity, array $options = []): string
     {
+        if ($entity === null) {
+            return '';
+        }
+        
         return $this->getRender($entity, $options)
             ->renderBox($entity, $options);
     }
@@ -70,7 +78,7 @@ class ChillEntityRenderExtension extends AbstractExtension
         $this->renders[] = $render;
     }
     
-    protected function getRender($entity, $options): ChillEntityRenderInterface
+    protected function getRender($entity, $options): ?ChillEntityRenderInterface
     {
         foreach ($this->renders as $render) {
             if ($render->supports($entity, $options)) {