mirror of
https://github.com/archtechx/virtualcolumn.git
synced 2025-12-12 12:14:03 +00:00
Make static things non-static in VirtualColumn
This commit is contained in:
parent
424096a548
commit
43f505aa37
1 changed files with 16 additions and 22 deletions
|
|
@ -16,7 +16,6 @@ use Illuminate\Support\Facades\Crypt;
|
||||||
*/
|
*/
|
||||||
trait VirtualColumn
|
trait VirtualColumn
|
||||||
{
|
{
|
||||||
public static $afterListeners = [];
|
|
||||||
public static array $customEncryptedCastables = [];
|
public static array $customEncryptedCastables = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -26,7 +25,7 @@ trait VirtualColumn
|
||||||
*/
|
*/
|
||||||
public bool $dataEncoded = false;
|
public bool $dataEncoded = false;
|
||||||
|
|
||||||
protected static function decodeVirtualColumn(self $model): void
|
protected function decodeVirtualColumn(self $model): void
|
||||||
{
|
{
|
||||||
if (! $model->dataEncoded) {
|
if (! $model->dataEncoded) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -37,10 +36,10 @@ trait VirtualColumn
|
||||||
['encrypted', 'encrypted:array', 'encrypted:collection', 'encrypted:json', 'encrypted:object'], // Default encrypted castables
|
['encrypted', 'encrypted:array', 'encrypted:collection', 'encrypted:json', 'encrypted:object'], // Default encrypted castables
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach ($model->getAttribute(static::getDataColumn()) ?? [] as $key => $value) {
|
foreach ($model->getAttribute($this->getDataColumn()) ?? [] as $key => $value) {
|
||||||
$attributeHasEncryptedCastable = in_array(data_get($model->getCasts(), $key), $encryptedCastables);
|
$attributeHasEncryptedCastable = in_array(data_get($model->getCasts(), $key), $encryptedCastables);
|
||||||
|
|
||||||
if ($attributeHasEncryptedCastable && static::valueEncrypted($value)) {
|
if ($attributeHasEncryptedCastable && $this->valueEncrypted($value)) {
|
||||||
$model->attributes[$key] = $value;
|
$model->attributes[$key] = $value;
|
||||||
} else {
|
} else {
|
||||||
$model->setAttribute($key, $value);
|
$model->setAttribute($key, $value);
|
||||||
|
|
@ -49,19 +48,19 @@ trait VirtualColumn
|
||||||
$model->syncOriginalAttribute($key);
|
$model->syncOriginalAttribute($key);
|
||||||
}
|
}
|
||||||
|
|
||||||
$model->setAttribute(static::getDataColumn(), null);
|
$model->setAttribute($this->getDataColumn(), null);
|
||||||
|
|
||||||
$model->dataEncoded = false;
|
$model->dataEncoded = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static function encodeAttributes(self $model): void
|
protected function encodeAttributes(self $model): void
|
||||||
{
|
{
|
||||||
if ($model->dataEncoded) {
|
if ($model->dataEncoded) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$dataColumn = static::getDataColumn();
|
$dataColumn = $this->getDataColumn();
|
||||||
$customColumns = static::getCustomColumns();
|
$customColumns = $this->getCustomColumns();
|
||||||
$attributes = array_filter($model->getAttributes(), fn ($key) => ! in_array($key, $customColumns), ARRAY_FILTER_USE_KEY);
|
$attributes = array_filter($model->getAttributes(), fn ($key) => ! in_array($key, $customColumns), ARRAY_FILTER_USE_KEY);
|
||||||
|
|
||||||
// Remove data column from the attributes
|
// Remove data column from the attributes
|
||||||
|
|
@ -79,7 +78,7 @@ trait VirtualColumn
|
||||||
$model->dataEncoded = true;
|
$model->dataEncoded = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function valueEncrypted(string $value): bool
|
public function valueEncrypted(string $value): bool
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
Crypt::decryptString($value);
|
Crypt::decryptString($value);
|
||||||
|
|
@ -90,11 +89,11 @@ trait VirtualColumn
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static function decodeAttributes(self $model)
|
protected function decodeAttributes(self $model)
|
||||||
{
|
{
|
||||||
$model->dataEncoded = true;
|
$model->dataEncoded = true;
|
||||||
|
|
||||||
static::decodeVirtualColumn($model);
|
$this->decodeVirtualColumn($model);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getAfterListeners(): array
|
protected function getAfterListeners(): array
|
||||||
|
|
@ -123,7 +122,7 @@ trait VirtualColumn
|
||||||
protected function decodeIfEncoded()
|
protected function decodeIfEncoded()
|
||||||
{
|
{
|
||||||
if ($this->dataEncoded) {
|
if ($this->dataEncoded) {
|
||||||
static::decodeVirtualColumn($this);
|
$this->decodeVirtualColumn($this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -158,27 +157,22 @@ trait VirtualColumn
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function registerAfterListener(string $event, callable $callback)
|
|
||||||
{
|
|
||||||
static::$afterListeners[$event][] = $callback;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getCasts()
|
public function getCasts()
|
||||||
{
|
{
|
||||||
return array_merge(parent::getCasts(), [
|
return array_merge(parent::getCasts(), [
|
||||||
static::getDataColumn() => 'array',
|
$this->getDataColumn() => 'array',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the name of the column that stores additional data.
|
* Get the name of the column that stores additional data.
|
||||||
*/
|
*/
|
||||||
public static function getDataColumn(): string
|
public function getDataColumn(): string
|
||||||
{
|
{
|
||||||
return 'data';
|
return 'data';
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getCustomColumns(): array
|
public function getCustomColumns(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'id',
|
'id',
|
||||||
|
|
@ -192,10 +186,10 @@ trait VirtualColumn
|
||||||
*/
|
*/
|
||||||
public function getColumnForQuery(string $column): string
|
public function getColumnForQuery(string $column): string
|
||||||
{
|
{
|
||||||
if (in_array($column, static::getCustomColumns(), true)) {
|
if (in_array($column, $this->getCustomColumns(), true)) {
|
||||||
return $column;
|
return $column;
|
||||||
}
|
}
|
||||||
|
|
||||||
return static::getDataColumn() . '->' . $column;
|
return $this->getDataColumn() . '->' . $column;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue