Merge commit '054d8cd8d6ee10309a6a5fc696b3ff4bc898a79b' into feature/el

eluhr · eluhr · commit dddc35c70573 · 2024-11-15T14:10:15.000+01:00
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

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public static function column()`
`13`	`13`	`'format' => 'html',`
`14`	`14`	`'attribute' => '{$attribute}',`
`15`	`15`	`'value'=> function(\$model){`
`16`		`- return html_entity_decode(\$model->{$attribute});`
	`16`	`+ return is_string(\$model->{$attribute}) ? html_entity_decode(\$model->{$attribute}) : \$model->{$attribute};`
`17`	`17`	`}`
`18`	`18`	`]`
`19`	`19`	`FORMAT;`
`@@ -28,7 +28,9 @@ public static function attribute()`
`28`	`28`	`[`
`29`	`29`	`'format' => 'html',`
`30`	`30`	`'attribute' => '{$attribute}',`
`31`		`- 'value' => html_entity_decode(\$model->{$attribute})`
	`31`	`+ 'value'=> function(\$model){`
	`32`	`+ return is_string(\$model->{$attribute}) ? html_entity_decode(\$model->{$attribute}) : \$model->{$attribute};`
	`33`	`+ }`
`32`	`34`	`]`
`33`	`35`	`FORMAT;`
`34`	`36`	`};`