mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-12 15:35:15 +00:00
Fix various code.
This commit is contained in:
@@ -27,6 +27,9 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
use function Safe\json_decode;
|
||||
use function Safe\json_encode;
|
||||
|
||||
class AccountMeta extends Model
|
||||
{
|
||||
use ReturnsIntegerIdTrait;
|
||||
@@ -47,11 +50,11 @@ class AccountMeta extends Model
|
||||
|
||||
public function getDataAttribute(mixed $value): string
|
||||
{
|
||||
return (string) \Safe\json_decode($value, true);
|
||||
return (string) json_decode((string) $value, true);
|
||||
}
|
||||
|
||||
public function setDataAttribute(mixed $value): void
|
||||
{
|
||||
$this->attributes['data'] = \Safe\json_encode($value);
|
||||
$this->attributes['data'] = json_encode($value);
|
||||
}
|
||||
}
|
||||
|
@@ -27,6 +27,9 @@ use FireflyIII\Support\Models\ReturnsIntegerIdTrait;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
use function Safe\json_decode;
|
||||
use function Safe\json_encode;
|
||||
|
||||
class Configuration extends Model
|
||||
{
|
||||
use ReturnsIntegerIdTrait;
|
||||
@@ -50,7 +53,7 @@ class Configuration extends Model
|
||||
*/
|
||||
public function getDataAttribute($value)
|
||||
{
|
||||
return \Safe\json_decode($value);
|
||||
return json_decode((string) $value);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -58,6 +61,6 @@ class Configuration extends Model
|
||||
*/
|
||||
public function setDataAttribute($value): void
|
||||
{
|
||||
$this->attributes['data'] = \Safe\json_encode($value);
|
||||
$this->attributes['data'] = json_encode($value);
|
||||
}
|
||||
}
|
||||
|
@@ -29,6 +29,9 @@ use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
use function Safe\json_decode;
|
||||
use function Safe\json_encode;
|
||||
|
||||
class TransactionJournalMeta extends Model
|
||||
{
|
||||
use ReturnsIntegerIdTrait;
|
||||
@@ -52,7 +55,7 @@ class TransactionJournalMeta extends Model
|
||||
*/
|
||||
public function getDataAttribute($value)
|
||||
{
|
||||
return \Safe\json_decode($value, false);
|
||||
return json_decode((string) $value, false);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -60,7 +63,7 @@ class TransactionJournalMeta extends Model
|
||||
*/
|
||||
public function setDataAttribute($value): void
|
||||
{
|
||||
$data = \Safe\json_encode($value);
|
||||
$data = json_encode($value);
|
||||
$this->attributes['data'] = $data;
|
||||
$this->attributes['hash'] = hash('sha256', (string) $data);
|
||||
}
|
||||
|
Reference in New Issue
Block a user