MDL-75358 blog: Make attachment callback parameter nullable

moodle · Oct 31, 2022 · 4caae7c · 4caae7c
1 parent aaca32f
commit 4caae7c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/blog/classes/reportbuilder/local/entities/blog.php b/blog/classes/reportbuilder/local/entities/blog.php
@@ -140,7 +140,7 @@ protected function get_all_columns(): array {
             ->add_joins($this->get_joins())
             ->set_type(column::TYPE_BOOLEAN)
             ->add_fields("{$postalias}.attachment, {$postalias}.id")
-            ->add_callback(static function(bool $attachment, stdClass $post): string {
+            ->add_callback(static function(?bool $attachment, stdClass $post): string {
                 global $CFG, $PAGE;
                 require_once("{$CFG->dirroot}/blog/locallib.php");
 
@@ -172,14 +172,14 @@ protected function get_all_columns(): array {
             ->set_type(column::TYPE_TEXT)
             ->add_fields("{$postalias}.publishstate")
             ->set_is_sortable(true)
-            ->add_callback(static function(string $publishstate): string {
+            ->add_callback(static function(?string $publishstate): string {
                 $states = [
                     'draft' => new lang_string('publishtonoone', 'core_blog'),
                     'site' => new lang_string('publishtosite', 'core_blog'),
                     'public' => new lang_string('publishtoworld', 'core_blog'),
                 ];
 
-                return (string) ($states[$publishstate] ?? $publishstate);
+                return (string) ($states[$publishstate] ?? $publishstate ?? '');
             });
 
         // Time created.