From beccbfee1e1ebc0515d1ec7ccd2487747ea7ea8f Mon Sep 17 00:00:00 2001 From: Arsen Mirzaev Tatyano-Muradovich Date: Wed, 24 Dec 2025 22:15:06 +0500 Subject: [PATCH] namespace conflict fix --- .gitignore | 0 LICENSE | 0 README.md | 0 composer.json | 0 mirzaev/record/system/interfaces/record.php | 0 mirzaev/record/system/traits/record.php | 14 +++++++------- 6 files changed, 7 insertions(+), 7 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md mode change 100644 => 100755 composer.json mode change 100644 => 100755 mirzaev/record/system/interfaces/record.php mode change 100644 => 100755 mirzaev/record/system/traits/record.php diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 diff --git a/mirzaev/record/system/interfaces/record.php b/mirzaev/record/system/interfaces/record.php old mode 100644 new mode 100755 diff --git a/mirzaev/record/system/traits/record.php b/mirzaev/record/system/traits/record.php old mode 100644 new mode 100755 index b9f5355..bdce593 --- a/mirzaev/record/system/traits/record.php +++ b/mirzaev/record/system/traits/record.php @@ -10,7 +10,7 @@ use svoboda\time\statement as svoboda; // Baza database use mirzaev\baza\database, mirzaev\baza\column, - mirzaev\baza\record as baza, + mirzaev\baza\record as baza_record, mirzaev\baza\enumerations\encoding, mirzaev\baza\enumerations\type; @@ -44,9 +44,9 @@ trait record /** * Record * - * @var baza $record The record instance + * @var baza_record $record The record instance */ - protected baza $record; + protected baza_record $record; /** * Read @@ -64,7 +64,7 @@ trait record offset: 0 )[0] ?? false; - if ($record instanceof baza) { + if ($record instanceof baza_record) { // Initialized the record // Exit (success) @@ -86,8 +86,8 @@ trait record { // Writing into the database $record = $this->database->read( - filter: fn(baza $record) => $record->identifier === $this->record->identifier, - update: function (baza &$record) { + filter: fn(baza_record $record) => $record->identifier === $this->record->identifier, + update: function (baza_record &$record) { $this->record->updated = svoboda::timestamp(); $record = $this->record; }, @@ -95,7 +95,7 @@ trait record offset: 0 )[0] ?? false; - if ($record instanceof record) { + if ($record instanceof baza_record) { // Initialized the record // Exit (success)