commits merging 2

mirzaev/record/system/interfaces/record.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace mirzaev\record\interfaces;
 
 // Baza database
-use mirzaev\baza\record as baza;
+use mirzaev\baza\record as baza_record;
 
 // Built-in libraries
 use InvalidArgumentException as exception_invalid_argument;
@@ -33,9 +33,11 @@ interface record
 	 *
 	 * @throws exception_invalid_argument If not initialized the database columns parameters
 	 *
+	 * @param baza_record|null $record The record
+	 *
 	 * @return void
 	 */
-	public function __construct(?baza $record = null);
+	public function __construct(?baza_record $record = null);
 
 	/**
 	 * Read

mirzaev/record/system/traits/record.php

@@ -10,7 +10,8 @@ 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;
 
 // Built-in libraries
@@ -43,18 +44,18 @@ trait record
 	/**
 	 * Record
 	 *
-	 * @var baza $record The record instance
+	 * @var baza_record $record The record instance
 	 */
-	protected baza $record;
+	protected baza_record $record;
 
 	/**
 	 * Constructor
 	 *
-	 * @method record|null $record The record
+	 * @method baza_record|null $record The record
 	 *
 	 * @return void
 	 */
-	public function __construct(?record $record = null)
+	public function __construct(?baza_record $record = null)
 	{
 		// Initializing the database
 		/* $this->database = new database()
@@ -67,7 +68,7 @@ trait record
 			->connect($this->file); */
 
 		// Initializing the record
-		$record instanceof record and $this->record = $record;
+		$record instanceof baza_record and $this->record = $record;
 	}
 
 	/**
@@ -86,7 +87,7 @@ trait record
 			offset: 0
 		)[0] ?? false;
 
-		if ($record instanceof baza) {
+		if ($record instanceof baza_record) {
 			// Initialized the record
 
 			// Exit (success)
@@ -108,8 +109,8 @@ trait record
 	{
 		// Writing into the database
 		$record = $this->database->read(
-			filter: fn(baza $record) => $record->identifier === $this->record->identifier,
+			filter: fn(baza_record $record) => $record->identifier === $this->record->identifier,
-			update: function (baza &$record) {
+			update: function (baza_record &$record) {
 				$this->record->updated = svoboda::timestamp();
 				$record = $this->record;
 			},
@@ -117,7 +118,7 @@ trait record
 			offset: 0
 		)[0] ?? false;
 
-		if ($record instanceof record) {
+		if ($record instanceof baza_record) {
 			// Initialized the record
 
 			// Exit (success)