Merge remote-tracking branch 'origin/dev-php74' into dev-php74

# Conflicts:
#	_incl_data/class/Battle.php
#	_incl_data/class/FightRequest.php
#	_incl_data/class/Filter.php
#	_incl_data/class/Magic.php
#	_incl_data/class/Priems.php
#	_incl_data/class/Quests.php
#	_incl_data/class/Season.php
#	_incl_data/class/User.php
#	_incl_data/class/__db_connect.php
#	_incl_data/class/priem/244.php
#	_incl_data/class/priem/263.php
#	_incl_data/class/priem/265.php
#	_incl_data/class/priem/267.php
#	buttons.php
#	cron_bs.php
#	cron_dungeon_getOut.php
#	cron_zv.php
#	dn_editor.php
#	dn_editor_bots.php
#	dn_editor_botsAll.php
#	dn_editor_bots_itms.php
#	enter.php
#	hmonitor.php
#	logs.php
#	main.php
#	main_bot.php
#	map.php
#	modules_data/_inv.php
#	modules_data/_umenie.php
#	modules_data/btl_.php
#	modules_data/location/btl_.php
#	modules_data/titul.php
#	myexp.php
#	obraz.php
#	online.php
#	register.php
#	ruin_characteristics.php
#	spam.php

_incl_data/class/Insallah/Core/Db.php

@@ -2,6 +2,7 @@
 
 namespace Insallah;
 
+use Core\Database;
 use Exception;
 use http\Message;
 use PDO;
@@ -50,8 +51,9 @@ class Db
                         PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES " . self::CHARSET,
                     ]
                 );
+//                self::$db = Database::pdoinit();
             } catch (PDOException $e) {
-                throw new Exception ($e->getMessage());
+                throw new Exception($e->getMessage());
             }
         }
         return self::$instance;