Merge pull request #303 from schmunk42/marc7000-marc7000-patch-1

Marc7000 marc7000 patch 1
schmunk42 · Oct 2, 2024 · 054d8cd · 054d8cd
2 parents c24c2c0 + 93ae702
commit 054d8cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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;
         };

diff --git 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