repositories cleanup and cs fix
This commit is contained in:
@@ -34,8 +34,4 @@ use Espo\ORM\Entity;
|
||||
class ActionHistoryRecord extends \Espo\Core\Repositories\Database
|
||||
{
|
||||
protected $hooksDisabled = true;
|
||||
|
||||
protected $processFieldsAfterSaveDisabled = true;
|
||||
|
||||
protected $processFieldsAfterRemoveDisabled = true;
|
||||
}
|
||||
|
||||
@@ -40,11 +40,7 @@ class ArrayValue extends Database
|
||||
{
|
||||
protected $hooksDisabled = true;
|
||||
|
||||
protected $processFieldsAfterSaveDisabled = true;
|
||||
|
||||
protected $processFieldsAfterRemoveDisabled = true;
|
||||
|
||||
public function storeEntityAttribute(Entity $entity, string $attribute, bool $populateMode = false)
|
||||
public function storeEntityAttribute(Entity $entity, string $attribute, bool $populateMode = false): void
|
||||
{
|
||||
if (!$entity->getAttributeType($attribute) === Entity::JSON_ARRAY) {
|
||||
throw new Error("ArrayValue: Can't store non array attribute.");
|
||||
@@ -130,7 +126,7 @@ class ArrayValue extends Database
|
||||
}
|
||||
}
|
||||
|
||||
public function deleteEntityAttribute(Entity $entity, string $attribute)
|
||||
public function deleteEntityAttribute(Entity $entity, string $attribute): void
|
||||
{
|
||||
if (!$entity->id) {
|
||||
throw new Error("ArrayValue: Can't delete {$attribute} w/o id given.");
|
||||
|
||||
@@ -34,8 +34,4 @@ use Espo\ORM\Entity;
|
||||
class AuthFailLogRecord extends \Espo\Core\Repositories\Database
|
||||
{
|
||||
protected $hooksDisabled = true;
|
||||
|
||||
protected $processFieldsAfterSaveDisabled = true;
|
||||
|
||||
protected $processFieldsAfterRemoveDisabled = true;
|
||||
}
|
||||
|
||||
@@ -34,8 +34,4 @@ use Espo\ORM\Entity;
|
||||
class AuthLogRecord extends \Espo\Core\Repositories\Database
|
||||
{
|
||||
protected $hooksDisabled = true;
|
||||
|
||||
protected $processFieldsAfterSaveDisabled = true;
|
||||
|
||||
protected $processFieldsAfterRemoveDisabled = true;
|
||||
}
|
||||
|
||||
@@ -34,8 +34,4 @@ use Espo\ORM\Entity;
|
||||
class AuthToken extends \Espo\Core\Repositories\Database
|
||||
{
|
||||
protected $hooksDisabled = true;
|
||||
|
||||
protected $processFieldsAfterSaveDisabled = true;
|
||||
|
||||
protected $processFieldsAfterRemoveDisabled = true;
|
||||
}
|
||||
|
||||
@@ -42,9 +42,7 @@ class EmailAddress extends \Espo\Core\Repositories\Database implements
|
||||
use Di\ApplicationStateSetter;
|
||||
use Di\AclManagerSetter;
|
||||
|
||||
protected $processFieldsAfterSaveDisabled = true;
|
||||
|
||||
protected $processFieldsAfterRemoveDisabled = true;
|
||||
protected $hooksDisabled = true;
|
||||
|
||||
public function getIdListFormAddressList(array $addressList = []): array
|
||||
{
|
||||
|
||||
@@ -40,10 +40,6 @@ class Job extends \Espo\Core\Repositories\Database implements
|
||||
|
||||
protected $hooksDisabled = true;
|
||||
|
||||
protected $processFieldsAfterSaveDisabled = true;
|
||||
|
||||
protected $processFieldsAfterRemoveDisabled = true;
|
||||
|
||||
public function beforeSave(Entity $entity, array $options = [])
|
||||
{
|
||||
if (!$entity->has('executeTime') && $entity->isNew()) {
|
||||
@@ -52,6 +48,7 @@ class Job extends \Espo\Core\Repositories\Database implements
|
||||
|
||||
if (!$entity->has('attempts') && $entity->isNew()) {
|
||||
$attempts = $this->config->get('jobRerunAttemptNumber', 0);
|
||||
|
||||
$entity->set('attempts', $attempts);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,8 +34,4 @@ use Espo\ORM\Entity;
|
||||
class NextNumber extends \Espo\Core\Repositories\Database
|
||||
{
|
||||
protected $hooksDisabled = true;
|
||||
|
||||
protected $processFieldsAfterSaveDisabled = true;
|
||||
|
||||
protected $processFieldsAfterRemoveDisabled = true;
|
||||
}
|
||||
|
||||
@@ -45,9 +45,7 @@ class PhoneNumber extends Database implements
|
||||
use Di\ApplicationStateSetter;
|
||||
use Di\AclManagerSetter;
|
||||
|
||||
protected $processFieldsAfterSaveDisabled = true;
|
||||
|
||||
protected $processFieldsAfterRemoveDisabled = true;
|
||||
protected $hooksDisabled = true;
|
||||
|
||||
const ERASED_PREFIX = 'ERASED:';
|
||||
|
||||
|
||||
@@ -37,10 +37,6 @@ class ScheduledJob extends \Espo\Core\Repositories\Database
|
||||
{
|
||||
protected $hooksDisabled = true;
|
||||
|
||||
protected $processFieldsAfterSaveDisabled = true;
|
||||
|
||||
protected $processFieldsAfterRemoveDisabled = true;
|
||||
|
||||
protected function afterSave(Entity $entity, array $options = [])
|
||||
{
|
||||
parent::afterSave($entity, $options);
|
||||
|
||||
@@ -37,14 +37,12 @@ class UniqueId extends \Espo\Core\Repositories\Database
|
||||
{
|
||||
protected $hooksDisabled = true;
|
||||
|
||||
protected $processFieldsAfterSaveDisabled = true;
|
||||
|
||||
protected $processFieldsAfterRemoveDisabled = true;
|
||||
|
||||
public function getNew() : ?Entity
|
||||
public function getNew(): ?Entity
|
||||
{
|
||||
$entity = parent::getNew();
|
||||
|
||||
$entity->set('name', Util::generateMoreEntropyId());
|
||||
|
||||
return $entity;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,34 +37,39 @@ class Webhook extends \Espo\Core\Repositories\Database
|
||||
{
|
||||
protected $hooksDisabled = true;
|
||||
|
||||
protected $processFieldsAfterSaveDisabled = true;
|
||||
|
||||
protected $processFieldsAfterRemoveDisabled = true;
|
||||
|
||||
protected function beforeSave(Entity $entity, array $options = [])
|
||||
{
|
||||
if ($entity->isNew()) {
|
||||
$this->fillSecretKey($entity);
|
||||
}
|
||||
|
||||
parent::beforeSave($entity);
|
||||
|
||||
$this->processSettingAdditionalFields($entity);
|
||||
}
|
||||
|
||||
protected function fillSecretKey(Entity $entity)
|
||||
protected function fillSecretKey(Entity $entity): void
|
||||
{
|
||||
$secretKey = Util::generateSecretKey();
|
||||
|
||||
$entity->set('secretKey', $secretKey);
|
||||
}
|
||||
|
||||
protected function processSettingAdditionalFields(Entity $entity)
|
||||
protected function processSettingAdditionalFields(Entity $entity): void
|
||||
{
|
||||
$event = $entity->get('event');
|
||||
if (!$event) return;
|
||||
if (!$event) {
|
||||
return;
|
||||
}
|
||||
|
||||
$arr = explode('.', $event);
|
||||
if (count($arr) !== 2 && count($arr) !== 3) return;
|
||||
|
||||
if (count($arr) !== 2 && count($arr) !== 3) {
|
||||
return;
|
||||
}
|
||||
|
||||
$arr = explode('.', $event);
|
||||
|
||||
$entityType = $arr[0];
|
||||
$type = $arr[1];
|
||||
|
||||
@@ -73,14 +78,18 @@ class Webhook extends \Espo\Core\Repositories\Database
|
||||
|
||||
$field = null;
|
||||
|
||||
if (!$entityType) return;
|
||||
if (!$entityType) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ($type === 'fieldUpdate') {
|
||||
if (count($arr) == 3) {
|
||||
$field = $arr[2];
|
||||
}
|
||||
|
||||
$entity->set('field', $field);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
$entity->set('field', null);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user