From 1ba3ac21d68ef3efda9049d93635ae46cad1253b Mon Sep 17 00:00:00 2001
From: Marc Mautz <m.mautz@herzogkommunikation.de>
Date: Thu, 26 Sep 2024 11:09:19 +0200
Subject: [PATCH 1/2] fixed html_entity_decode(): Passing null to parameter #1
 ($string) of type string is deprecated

---
 src/generators/crud/callbacks/yii/Html.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/generators/crud/callbacks/yii/Html.php b/src/generators/crud/callbacks/yii/Html.php
index 2b0ad187..5cd41ae3 100644
--- a/src/generators/crud/callbacks/yii/Html.php
+++ b/src/generators/crud/callbacks/yii/Html.php
@@ -13,7 +13,7 @@ public static function column()
     'format' => 'html',
     'attribute' => '{$attribute}',
     'value'=> function(\$model){
-        return html_entity_decode(\$model->{$attribute});
+        return is_string(\$model->{$attribute}) ? html_entity_decode(\$model->{$attribute}) : \$model->{$attribute};
     }
 ]
 FORMAT;
@@ -28,7 +28,9 @@ public static function attribute()
 [
     'format' => 'html',
     'attribute' => '{$attribute}',
-    'value' => html_entity_decode(\$model->{$attribute})
+    'value'=> function(\$model){
+        return is_string(\$model->{$attribute}) ? html_entity_decode(\$model->{$attribute}) : \$model->{$attribute};
+    }
 ]
 FORMAT;
         };

From 93ae702da45199266a46e4a4f07bacc8553bbc7a Mon Sep 17 00:00:00 2001
From: Tobias Munk <schmunk@usrbin.de>
Date: Mon, 30 Sep 2024 09:29:45 +0200
Subject: [PATCH 2/2] fix github build

---
 tests/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Makefile b/tests/Makefile
index ed964919..232eb107 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,6 +1,6 @@
 .PHONY: open bash test
 
-DOCKER_COMPOSE  ?= docker-compose
+DOCKER_COMPOSE  ?= docker compose
 
 PHP				?= phpfpm
 WEB				?= phpfpm