diff options
| author | winter | 2024-12-17 21:38:23 +0000 |
|---|---|---|
| committer | winter | 2024-12-17 21:40:32 +0000 |
| commit | 801778a295df2b026391483faa390cf87e68b1ad (patch) | |
| tree | ab2c7bb691470694b5e1eb3b817b47a377d601bc /Digitigrade | |
| parent | d1bfd5b7289362656ba2199a01421bb8c9215f6d (diff) | |
bugfixes 3
Diffstat (limited to 'Digitigrade')
| -rw-r--r-- | Digitigrade/Model/FetchableModel.php | 4 | ||||
| -rw-r--r-- | Digitigrade/Model/Note.php | 4 | ||||
| -rw-r--r-- | Digitigrade/Model/PushableModel.php | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/Digitigrade/Model/FetchableModel.php b/Digitigrade/Model/FetchableModel.php index 07d7e32..33e1151 100644 --- a/Digitigrade/Model/FetchableModel.php +++ b/Digitigrade/Model/FetchableModel.php @@ -13,7 +13,7 @@ abstract class FetchableModel extends Model implements RemoteFetchable { self::$mapper->bStrictObjectTypeChecking = false; } - protected static function createFromJson(\stdClass $data): static { + protected static function createFromJson(\stdClass $data, bool $autoSave): static { // default everything nullable to null $obj = new static(); $reflProps = (new \ReflectionClass(static::class))->getProperties(); @@ -62,7 +62,7 @@ abstract class FetchableModel extends Model implements RemoteFetchable { if ($data === null) return null; - $obj = static::createFromJson($data); + $obj = static::createFromJson($data, $autoSave); $obj->finaliseAfterFetch($uri); if ($autoSave) { diff --git a/Digitigrade/Model/Note.php b/Digitigrade/Model/Note.php index e80d972..dd66c85 100644 --- a/Digitigrade/Model/Note.php +++ b/Digitigrade/Model/Note.php @@ -11,9 +11,7 @@ class Note extends PushableModel { public Actor $author; public ?string $summary; public string $plainContent; - /** - * @var array<string, string> - */ + // associative array mapping strings to strings - mimetypes to content public array $formattedContent = []; public string $language; /** diff --git a/Digitigrade/Model/PushableModel.php b/Digitigrade/Model/PushableModel.php index 2e47bd6..21415f7 100644 --- a/Digitigrade/Model/PushableModel.php +++ b/Digitigrade/Model/PushableModel.php @@ -3,7 +3,7 @@ namespace Digitigrade\Model; abstract class PushableModel extends FetchableModel implements \JsonSerializable { public static function importFromReceivedObject(\stdClass $data, bool $autoSave = true): static { - $obj = static::createFromJson($data); + $obj = static::createFromJson($data, $autoSave); if ($autoSave) { $obj->save(); $obj->finaliseAfterSave(); |
