From c0a0b39bd89da5b1d57946b42c16766932d125df Mon Sep 17 00:00:00 2001 From: smarcet Date: Wed, 8 May 2019 09:54:54 -0300 Subject: [PATCH] Fixed null pointer exception on SpeakerEditPermissionRequest Serializer Change-Id: I1b716dc498afdd116fd449c924c70b3cac647d24 --- Libs/ModelSerializers/AbstractSerializer.php | 2 +- .../Summit/Speakers/SpeakerEditPermissionRequest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Libs/ModelSerializers/AbstractSerializer.php b/Libs/ModelSerializers/AbstractSerializer.php index 872cecfb..33d160c2 100644 --- a/Libs/ModelSerializers/AbstractSerializer.php +++ b/Libs/ModelSerializers/AbstractSerializer.php @@ -144,7 +144,7 @@ abstract class AbstractSerializer implements IModelSerializer foreach ($mappings as $attribute => $mapping) { $mapping = preg_split('/:/', $mapping); if(count($fields) > 0 && !in_array($mapping[0], $fields)) continue; - + $value = null; foreach($method_prefix as $prefix){ if(method_exists($this->object, $prefix.$attribute)){ $value = call_user_func([$this->object, $prefix.$attribute ]); diff --git a/app/Models/Foundation/Summit/Speakers/SpeakerEditPermissionRequest.php b/app/Models/Foundation/Summit/Speakers/SpeakerEditPermissionRequest.php index d338ee86..1ff6740a 100644 --- a/app/Models/Foundation/Summit/Speakers/SpeakerEditPermissionRequest.php +++ b/app/Models/Foundation/Summit/Speakers/SpeakerEditPermissionRequest.php @@ -112,9 +112,9 @@ class SpeakerEditPermissionRequest extends SilverstripeBaseModel } /** - * @return DateTime + * @return ?DateTime */ - public function getApprovedDate():DateTime + public function getApprovedDate():?DateTime { return $this->approved_date; }