babaev-an/php_components_pack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

20250713 1.1.1

Browse Source
This commit is contained in:
Александр Бабаев
2025-07-13 12:23:08 +03:00
parent 117deab9d8
commit 62762374e0
14 changed files with 386 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sources/traits/ActionState/ActionStateAddTrait.php
View File

@@ -5,7 +5,7 @@ namespace goodboyalex\php_components_pack\traits\ActionState;
use goodboyalex\php_components_pack\classes\ActionState;
use goodboyalex\php_components_pack\classes\ObjectArray;
use goodboyalex\php_components_pack\enums\MessageType;
use goodboyalex\php_components_pack\models\ActionStateMessageModel;
use goodboyalex\php_components_pack\models\ActionStateMessage;
/**
* Часть кода класса ActionState, отвечающая за методы добавления сообщений.
@@ -30,7 +30,7 @@ trait ActionStateAddTrait
// Если нужно очистить список сообщений
if ($clearAllBefore)
// - то очищаю список сообщений
$this->Clear(fn (ActionStateMessageModel $message) => true);
$this->Clear(fn (ActionStateMessage $message) => true);
// Добавляю сообщения из другого состояния
$this->AddRange($state->GetMessages(ActionState::GET_STRING_ALL()));
@@ -61,17 +61,17 @@ trait ActionStateAddTrait
*/
public function AddCritical (string $message): void
{
$this->Add(new ActionStateMessageModel(MessageType::Error, true, $message));
$this->Add(new ActionStateMessage(MessageType::Error, true, $message));
}
/**
* Добавление сообщения.
*
* @param ActionStateMessageModel $message Сообщение
* @param ActionStateMessage $message Сообщение
*
* @return void
*/
public function Add (ActionStateMessageModel $message): void
public function Add (ActionStateMessage $message): void
{
$this->Messages->Add($message);
}
@@ -85,7 +85,7 @@ trait ActionStateAddTrait
*/
public function AddError (string $message): void
{
$this->Add(new ActionStateMessageModel(MessageType::Error, false, $message));
$this->Add(new ActionStateMessage(MessageType::Error, false, $message));
}
/**
@@ -97,7 +97,7 @@ trait ActionStateAddTrait
*/
public function AddWarning (string $message): void
{
$this->Add(new ActionStateMessageModel(MessageType::Warning, false, $message));
$this->Add(new ActionStateMessage(MessageType::Warning, false, $message));
}
/**
@@ -109,6 +109,6 @@ trait ActionStateAddTrait
*/
public function AddInfo (string $message): void
{
$this->Add(new ActionStateMessageModel(MessageType::Info, false, $message));
$this->Add(new ActionStateMessage(MessageType::Info, false, $message));
}
}

8
sources/traits/ActionState/ActionStateHasTrait.php
View File

@@ -3,7 +3,7 @@
namespace goodboyalex\php_components_pack\traits\ActionState;
use goodboyalex\php_components_pack\enums\MessageType;
use goodboyalex\php_components_pack\models\ActionStateMessageModel;
use goodboyalex\php_components_pack\models\ActionStateMessage;
/**
* Часть кода класса ActionState, отвечающая за методы проверки на наличие сообщений.
@@ -22,7 +22,7 @@ trait ActionStateHasTrait
*/
public function HasInfos (): bool
{
return $this->Messages->IsExist(fn (ActionStateMessageModel $message)
return $this->Messages->IsExist(fn (ActionStateMessage $message)
=> $message->MessageType
== MessageType::Info);
}
@@ -48,7 +48,7 @@ trait ActionStateHasTrait
*/
public function HasErrors (bool $onlyCritical = false): bool
{
return $this->Messages->IsExist(fn (ActionStateMessageModel $message): bool
return $this->Messages->IsExist(fn (ActionStateMessage $message): bool
=> $onlyCritical
? $message->MessageType == MessageType::Error && $message->IsCritical
: $message->MessageType == MessageType::Error);
@@ -61,7 +61,7 @@ trait ActionStateHasTrait
*/
public function HasWarnings (): bool
{
return $this->Messages->IsExist(fn (ActionStateMessageModel $message)
return $this->Messages->IsExist(fn (ActionStateMessage $message)
=> $message->MessageType
== MessageType::Warning);
}

8
sources/traits/ActionState/ActionStateStaticTrait.php
View File

@@ -4,7 +4,7 @@ namespace goodboyalex\php_components_pack\traits\ActionState;
use Closure;
use goodboyalex\php_components_pack\enums\MessageType;
use goodboyalex\php_components_pack\models\ActionStateMessageModel;
use goodboyalex\php_components_pack\models\ActionStateMessage;
/**
* Часть кода класса ActionState, отвечающая за статичные методы и константы.
@@ -23,7 +23,7 @@ trait ActionStateStaticTrait
*/
public static function GET_STRING_ERROR_ONLY (): Closure
{
return fn (ActionStateMessageModel $message)
return fn (ActionStateMessage $message)
=> $message->MessageType === MessageType::Error;
}
@@ -34,7 +34,7 @@ trait ActionStateStaticTrait
*/
public static function GET_STRING_ERROR_AND_WARNING (): Closure
{
return fn (ActionStateMessageModel $message)
return fn (ActionStateMessage $message)
=> $message->MessageType === MessageType::Error
|| $message->MessageType === MessageType::Warning;
}
@@ -46,6 +46,6 @@ trait ActionStateStaticTrait
*/
public static function GET_STRING_ALL (): Closure
{
return fn (ActionStateMessageModel $message) => true;
return fn (ActionStateMessage $message) => true;
}
}