From f07f833dd19f7ebb2b61480d92132039fc6e96d8 Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Mon, 18 Apr 2022 03:59:09 +0300 Subject: [PATCH 01/37] Add games, server and mods --- database/seeds/GameModsTableSeeder.php | 582 +++++++++++++++++-------- database/seeds/GamesTableSeeder.php | 267 +++++++----- 2 files changed, 566 insertions(+), 283 deletions(-) diff --git a/database/seeds/GameModsTableSeeder.php b/database/seeds/GameModsTableSeeder.php index 18e2b4ea..397ef16d 100644 --- a/database/seeds/GameModsTableSeeder.php +++ b/database/seeds/GameModsTableSeeder.php @@ -14,6 +14,8 @@ class GameModsTableSeeder extends Seeder */ public function run() { + $gapRepoBaseUrl = 'http://files.gameap.ru'; + $defaultGoldSourceFastRcon = [ [ 'info' => 'Status', @@ -38,16 +40,30 @@ public function run() ] ); - /* Half-Life 1 */ + /* Half-Life */ + + DB::table('game_mods')->insert([ + 'game_code' => 'valve', + 'name' => 'Default', + 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), + 'vars' => json_encode(self::getDefaultGoldSourceVars()), + 'default_start_cmd_linux' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), + 'default_start_cmd_windows' => self::getDefaultGoldSourceStartCmd('win', 'valve'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + DB::table('game_mods')->insert([ 'game_code' => 'valve', - 'name' => 'Classic (Standart)', + 'name' => 'Classic (AMX Mod)', 'fast_rcon' => json_encode($defaultGoldSourceAmxFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars()), - 'local_repository' => '', - 'remote_repository' => 'http://files.gameap.ru/half-life/amxx.tar.xz', - 'default_start_cmd_linux' => './hlds_run -game valve +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}', - 'default_start_cmd_windows' => 'hlds.exe -console -game valve +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}', + 'remote_repository' => $gapRepoBaseUrl . '/half-life/amxx.tar.xz', + 'default_start_cmd_linux' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), + 'default_start_cmd_windows' => self::getDefaultGoldSourceStartCmd('win', 'valve'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'amx_say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -59,51 +75,43 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'valve', - 'name' => 'No AMX MOD X', + 'name' => 'Classic (ReHLDS)', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars()), - 'local_repository' => '', - 'remote_repository' => '', - 'default_start_cmd_linux' => './hlds_run -game valve +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}', - 'default_start_cmd_windows' => 'hlds.exe -console -game valve +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}', + 'remote_repository' => $gapRepoBaseUrl . '/half-life/rehlds-amxx-reunion.tar.xz', + 'default_start_cmd_linux' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), + 'default_start_cmd_windows' => self::getDefaultGoldSourceStartCmd('win', 'valve'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', 'srestart_cmd' => 'restart', - 'chname_cmd' => '', - 'ban_cmd' => '', 'kick_cmd' => 'kick #{id}', ]); + /* Counter-Strike 1.6 */ + DB::table('game_mods')->insert([ - 'game_code' => 'valve', - 'name' => 'ReHLDS', + 'game_code' => 'cstrike', + 'name' => 'Default', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), - 'vars' => json_encode(self::getDefaultGoldSourceVars()), - 'local_repository' => '', - 'remote_repository' => 'http://files.gameap.ru/half-life/rehlds-amxx-reunion.tar.xz', - 'default_start_cmd_linux' => './hlds_run -game cstrike +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}', - 'default_start_cmd_windows' => 'hlds.exe -console -game cstrike +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}', + 'vars' => json_encode(self::getDefaultGoldSourceVars('de_dust2')), + 'default_start_cmd_linux' => self::getDefaultGoldSourceStartCmd('nix', 'cstrike'), + 'default_start_cmd_windows' => self::getDefaultGoldSourceStartCmd('win', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', 'srestart_cmd' => 'restart', - 'chname_cmd' => '', - 'ban_cmd' => '', 'kick_cmd' => 'kick #{id}', ]); - /* Counter-Strike 1.6 */ - DB::table('game_mods')->insert([ 'game_code' => 'cstrike', - 'name' => 'Classic (Standart)', + 'name' => 'Classic (AMX Mod)', 'fast_rcon' => json_encode($defaultGoldSourceAmxFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars('de_dust2')), - 'local_repository' => '', - 'remote_repository' => 'http://files.gameap.ru/cstrike-1.6/amxx.tar.xz', - 'default_start_cmd_linux' => './hlds_run -game cstrike +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}', - 'default_start_cmd_windows' => 'hlds.exe -console -game cstrike +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}', + 'remote_repository' => $gapRepoBaseUrl . '/cstrike-1.6/amxx.tar.xz', + 'default_start_cmd_linux' => self::getDefaultGoldSourceStartCmd('nix', 'cstrike'), + 'default_start_cmd_windows' => self::getDefaultGoldSourceStartCmd('win', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'amx_say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -115,141 +123,318 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'cstrike', - 'name' => 'No AMX MOD X', + 'name' => 'Classic (ReHLDS)', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars('de_dust2')), - 'local_repository' => '', - 'remote_repository' => '', - 'default_start_cmd_linux' => './hlds_run -game cstrike +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password} +rcon_password {rcon_password}', - 'default_start_cmd_windows' => 'hlds.exe -console -game cstrike +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password} +rcon_password {rcon_password}', + 'remote_repository' => $gapRepoBaseUrl . '/cstrike-1.6/rehlds-amxx-reunion.tar.xz', + 'default_start_cmd_linux' => self::getDefaultGoldSourceStartCmd('nix', 'cstrike'), + 'default_start_cmd_windows' => self::getDefaultGoldSourceStartCmd('win', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', 'srestart_cmd' => 'restart', - 'chname_cmd' => '', - 'ban_cmd' => '', 'kick_cmd' => 'kick #{id}', ]); + /* Counter-Strike Source */ + DB::table('game_mods')->insert([ - 'game_code' => 'cstrike', - 'name' => 'ReHLDS', - 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), - 'vars' => json_encode(self::getDefaultGoldSourceVars('de_dust2')), - 'local_repository' => '', - 'remote_repository' => 'http://files.gameap.ru/cstrike-1.6/rehlds-amxx-reunion.tar.xz', - 'default_start_cmd_linux' => './hlds_run -game cstrike +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}', - 'default_start_cmd_windows' => 'hlds.exe -console -game cstrike +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}', + 'game_code' => 'cssource', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars('de_dust2')), + 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'cstrike'), + 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', 'srestart_cmd' => 'restart', - 'chname_cmd' => '', - 'ban_cmd' => '', 'kick_cmd' => 'kick #{id}', ]); - /* Minecraft */ + /* Counter-Strike Global Offensive */ DB::table('game_mods')->insert([ - 'game_code' => 'minecraft', - 'name' => 'Multicore', - 'fast_rcon' => '', - 'vars' => '[{"var":"version","default":"1.14.3","info":"Minecraft version"},{"var":"core_mod","default":"vanilla","info":"Core"},{"var":"core_mod_version","default":null,"info":"Core mod version"}]', - 'local_repository' => '', - 'remote_repository' => 'http://files.gameap.ru/minecraft/minecraft-runner.tar.gz', - 'default_start_cmd_linux' => './mcrun.sh run --version={version} --core-mod={core_mod} --core-mod-version={core_mod_version} --ip={ip} --port={port} --query-port={query_port} --rcon-port={rcon_port} --rcon-password={rcon_password}', - 'passwd_cmd' => '', - 'sendmsg_cmd' => '', - 'chmap_cmd' => '', - 'srestart_cmd' => '', - 'chname_cmd' => '', - 'ban_cmd' => '', - 'kick_cmd' => '', + 'game_code' => 'csgo', + 'name' => 'Default', + 'vars' => json_encode(array_merge(self::getDefaultSourceVars('de_dust2'), [ + [ + 'var' => 'mapgroup', + 'default' => 'mg_active', + 'info' => 'Map group', + ], + [ + 'var' => 'steamaccount', + 'default' => '', + 'info' => 'Steam account token', + ], + ])), + 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 0', + 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 0', + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', ]); DB::table('game_mods')->insert([ - 'game_code' => 'minecraft', - 'name' => 'Vanilla', - 'fast_rcon' => '', - 'vars' => '', - 'local_repository' => '', - 'remote_repository' => '', - 'passwd_cmd' => '', - 'sendmsg_cmd' => '', - 'chmap_cmd' => '', - 'srestart_cmd' => '', - 'chname_cmd' => '', - 'ban_cmd' => '', - 'kick_cmd' => '', + 'game_code' => 'csgo', + 'name' => 'Competitive', + 'vars' => json_encode(array_merge(self::getDefaultSourceVars('de_dust2'), [ + [ + 'var' => 'mapgroup', + 'default' => 'mg_active', + 'info' => 'Map group', + ], + [ + 'var' => 'steamaccount', + 'default' => '', + 'info' => 'Steam account token', + ], + ])), + 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 1', + 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 1', + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', ]); - // Rust + DB::table('game_mods')->insert([ + 'game_code' => 'csgo', + 'name' => 'Gungame', + 'vars' => json_encode(array_merge(self::getDefaultSourceVars('de_dust2'), [ + [ + 'var' => 'mapgroup', + 'default' => 'mg_active', + 'info' => 'Map group', + ], + [ + 'var' => 'steamaccount', + 'default' => '', + 'info' => 'Steam account token', + ], + ])), + 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 0', + 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 0', + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); DB::table('game_mods')->insert([ - 'game_code' => 'rust', - 'name' => 'Vanilla', - 'fast_rcon' => '', - 'vars' => '', - 'local_repository' => '', - 'remote_repository' => '', - 'passwd_cmd' => '', - 'sendmsg_cmd' => '', - 'chmap_cmd' => '', - 'srestart_cmd' => '', - 'chname_cmd' => '', - 'ban_cmd' => '', - 'kick_cmd' => '', + 'game_code' => 'csgo', + 'name' => 'Demolition', + 'vars' => json_encode(array_merge(self::getDefaultSourceVars('de_dust2'), [ + [ + 'var' => 'mapgroup', + 'default' => 'mg_active', + 'info' => 'Map group', + ], + [ + 'var' => 'steamaccount', + 'default' => '', + 'info' => 'Steam account token', + ], + ])), + 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 1', + 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 1', + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', ]); DB::table('game_mods')->insert([ - 'game_code' => 'rust', - 'name' => 'Oxide', - 'fast_rcon' => '', - 'vars' => '', - 'local_repository' => '', - 'remote_repository' => '', - 'passwd_cmd' => '', - 'sendmsg_cmd' => '', - 'chmap_cmd' => '', - 'srestart_cmd' => '', - 'chname_cmd' => '', - 'ban_cmd' => '', - 'kick_cmd' => '', + 'game_code' => 'csgo', + 'name' => 'Deathmatch', + 'vars' => json_encode(array_merge(self::getDefaultSourceVars('de_dust2'), [ + [ + 'var' => 'mapgroup', + 'default' => 'mg_active', + 'info' => 'Map group', + ], + [ + 'var' => 'steamaccount', + 'default' => '', + 'info' => 'Steam account token', + ], + ])), + 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 2', + 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 2', + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', ]); - /* Counter-Strike Global Offensive */ + /* Insurgency */ DB::table('game_mods')->insert([ - 'game_code' => 'csgo', - 'name' => 'Classic', - 'fast_rcon' => '', - 'vars' => json_encode(self::getDefaultSourceVars('de_dust2')), - 'default_start_cmd_linux' => './srcds_run -game csgo -console -usercon +game_type 0 +game_mode 0 +ip {ip} +port {port} +maxplayers {maxplayers} +mapgroup mg_active +map {default_map} +rcon_password {rcon_password}', - 'default_start_cmd_windows' => 'srcds.exe -game csgo -console -usercon +game_type 0 +game_mode 0 +ip {ip} +port {port} +maxplayers {maxplayers} +mapgroup mg_active +map {default_map} +rcon_password {rcon_password}', - 'local_repository' => '', - 'remote_repository' => '', + 'game_code' => 'insurgency', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars('ministry')), + 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix'), + 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Team Fortress 2 */ + + DB::table('game_mods')->insert([ + 'game_code' => 'tf2', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars('cp_badlands')), + 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix'), + 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Garry's Mod */ + + DB::table('game_mods')->insert([ + 'game_code' => 'garrysmod', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars('gm_construct')), + 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'garrysmod'), + 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'garrysmod'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Black Mesa: Deathmatch */ + + DB::table('game_mods')->insert([ + 'game_code' => 'bms', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars()), + 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'bms'), + 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'bms'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', 'srestart_cmd' => 'restart', - 'chname_cmd' => '', - 'ban_cmd' => '', 'kick_cmd' => 'kick #{id}', ]); + /* Day of Defeat Source */ + + DB::table('game_mods')->insert([ + 'game_code' => 'dods', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars('dod_anzio')), + 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'dods'), + 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'dods'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Minecraft */ + + DB::table('game_mods')->insert([ + 'game_code' => 'minecraft', + 'name' => 'Vanilla', + ]); + + DB::table('game_mods')->insert([ + 'game_code' => 'minecraft', + 'name' => 'Multicore', + 'vars' => json_encode([ + [ + 'var' => 'version', + 'default' => '1.14.3', + 'info' => 'Minecraft version', + ], + [ + 'var' => 'core_mod', + 'default' => 'vanilla', + 'info' => 'Core', + ], + [ + 'var' => 'core_mod_version', + 'default' => null, + 'info' => 'Core mod version', + ], + ]), + 'remote_repository' => $gapRepoBaseUrl . '/minecraft/minecraft-runner.tar.gz', + 'default_start_cmd_linux' => './mcrun.sh run --version={version} --core-mod={core_mod} --core-mod-version={core_mod_version} --ip={ip} --port={port} --query-port={query_port} --rcon-port={rcon_port} --rcon-password={rcon_password}', + ]); + + /* PMMP (MinecraftPE) */ + + DB::table('game_mods')->insert([ + 'game_code' => 'pmmp', + 'name' => 'Default', + 'default_start_cmd_linux' => './bin/php7/bin/php ./PocketMine-MP.phar', + 'default_start_cmd_windows' => '', + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say {msg}', + 'srestart_cmd' => 'reload', + 'ban_cmd' => 'ban {name} {reason}', + 'kick_cmd' => 'kick {name}', + ]); + + /* SAMP */ + + DB::table('game_mods')->insert([ + 'game_code' => 'samp', + 'name' => 'Freeroam (Linux)', + 'default_start_cmd_linux' => './samp03svr', + 'remote_repository' => 'http://files.sa-mp.com/samp037svr_R2-1.tar.gz', + ]); + + DB::table('game_mods')->insert([ + 'game_code' => 'samp', + 'name' => 'Freeroam (Windows)', + 'default_start_cmd_windows' => 'samp-server.exe', + 'remote_repository' => 'http://files.sa-mp.com/samp037_svr_R2-1-1_win32.zip', + ]); + + /* Multi Theft Auto (MTA) */ + + DB::table('game_mods')->insert([ + 'game_code' => 'mta', + 'name' => 'DeathMatch', + 'vars' => json_encode([ + [ + 'var' => 'maxplayers', + 'default' => 32, + 'info' => 'Maximum players on server', + ] + ]), + 'default_start_cmd_linux' => './mta-server64 -t -n --ip {ip} --port {port} --maxplayers {maxplayers}', + 'remote_repository' => $gapRepoBaseUrl . '/mta/default-deathmatch.tar.xz', + ]); + /* FiveM */ DB::table('game_mods')->insert([ 'game_code' => 'fivem', - 'name' => 'Vanilla', - 'fast_rcon' => '', + 'name' => 'Default', 'vars' => json_encode([ [ 'var' => 'hostname', 'default' => 'GameAP FiveM Server', 'info' => 'Server Hostname', - 'admin_var' => false, ], [ 'var' => 'license_key', @@ -260,86 +445,101 @@ public function run() ]), 'default_start_cmd_linux' => './fivem_run.sh --ip={ip} --port={port} --hostname="{hostname}" --rcon-password="{rcon_password}" --license-key="{license_key}"', 'default_start_cmd_windows' => 'run.cmd +exec server.cfg', - 'local_repository' => '', - 'remote_repository' => '', - - 'passwd_cmd' => '', 'sendmsg_cmd' => 'say {msg}', - 'chmap_cmd' => '', - 'srestart_cmd' => '', - 'chname_cmd' => '', - 'ban_cmd' => '', 'kick_cmd' => 'clientkick {id}', ]); + /* Just cause 2 */ + + DB::table('game_mods')->insert([ + 'game_code' => 'justcause2', + 'name' => 'Default', + 'default_start_cmd_linux' => './Jcmp-Server', + 'default_start_cmd_windows' => '', + ]); + + /* Just cause 3 */ + + DB::table('game_mods')->insert([ + 'game_code' => 'justcause3', + 'name' => 'Default', + 'default_start_cmd_linux' => './Server', + 'default_start_cmd_windows' => '', + ]); + + /* Rust */ + + DB::table('game_mods')->insert([ + 'game_code' => 'rust', + 'name' => 'Vanilla', + ]); + + DB::table('game_mods')->insert([ + 'game_code' => 'rust', + 'name' => 'Oxide', + ]); + /* 7 Day to Die */ DB::table('game_mods')->insert([ 'game_code' => '7d2d', 'name' => 'Default', - 'default_start_cmd_linux' => './startserver.sh -configfile=serverconfig.xml', 'default_start_cmd_windows' => 'startdedicated.bat', ]); - /* Multi Theft Auto (MTA) */ + /* Killing floor 2 */ DB::table('game_mods')->insert([ - 'game_code' => 'mta', - 'name' => 'DeathMatch Default', + 'game_code' => 'killingfloor2', + 'name' => 'Default', 'vars' => json_encode([ - [ - 'var' => 'maxplayers', - 'default' => 32, - 'info' => 'Maximum players on server', - 'admin_var' => false, - ] + 'var' => 'default_map', + 'default' => 'kf-bioticslab', + 'info' => 'Default Map', ]), - 'default_start_cmd_linux' => './mta-server64 -t -n --ip {ip} --port {port} --maxplayers {maxplayers}', - 'default_start_cmd_windows' => '', - - 'remote_repository' => 'http://files.gameap.ru/mta/default-deathmatch.tar.xz', + 'default_start_cmd_linux' => './Binaries/Win64/KFGameSteamServer.bin.x86_64 {default_map}', + 'default_start_cmd_windows' => 'Binaries\win64\kfserver {default_map}', ]); - /* Black Mesa: Deathmatch */ + /* TeamSpeak 3 */ DB::table('game_mods')->insert([ - 'game_code' => 'bms', - 'name' => 'Default', - 'fast_rcon' => '', - 'vars' => json_encode(self::getDefaultSourceVars()), - 'default_start_cmd_linux' => './srcds_run -game bms -console -usercon +ip {ip} +port {port} +maxplayers {maxplayers} +map {default_map} +rcon_password {rcon_password}', - 'default_start_cmd_windows' => 'srcds.exe -game bms -console -usercon +ip {ip} +port {port} +maxplayers {maxplayers} +map {default_map} +rcon_password {rcon_password}', - 'local_repository' => '', - 'remote_repository' => '', - 'passwd_cmd' => 'password {password}', - 'sendmsg_cmd' => 'say "{msg}"', - 'chmap_cmd' => 'changelevel {map}', - 'srestart_cmd' => 'restart', - 'chname_cmd' => '', - 'ban_cmd' => '', - 'kick_cmd' => 'kick #{id}', + 'game_code' => 'ts3', + 'name' => 'Linux', + 'default_start_cmd_linux' => './ts3server', + 'remote_repository' => 'https://files.teamspeak-services.com/releases/server/3.13.6/teamspeak3-server_linux_amd64-3.13.6.tar.bz2', ]); - /* Garry's Mod */ - DB::table('game_mods')->insert([ - 'game_code' => 'bms', - 'name' => 'Default', - 'fast_rcon' => '', - 'vars' => json_encode(self::getDefaultGoldSourceVars('gm_flatgrass')), - 'default_start_cmd_linux' => './srcds_run -game bms -console -usercon +ip {ip} +port {port} +maxplayers {maxplayers} +map {default_map} +rcon_password {rcon_password}', - 'default_start_cmd_windows' => 'srcds.exe -game bms -console -usercon +ip {ip} +port {port} +maxplayers {maxplayers} +map {default_map} +rcon_password {rcon_password}', - 'local_repository' => '', - 'remote_repository' => '', - 'passwd_cmd' => 'password {password}', - 'sendmsg_cmd' => 'say "{msg}"', - 'chmap_cmd' => 'changelevel {map}', - 'srestart_cmd' => 'restart', - 'chname_cmd' => '', - 'ban_cmd' => '', - 'kick_cmd' => 'kick #{id}', + 'game_code' => 'ts3', + 'name' => 'Windows', + 'default_start_cmd_windows' => 'teamspeak3-server_win64\ts3server.exe', + 'remote_repository' => 'https://files.teamspeak-services.com/releases/server/3.13.6/teamspeak3-server_win64-3.13.6.zip', ]); + + } + + /** + * @param string $os + * @param string $game + * @return string + */ + private static function getDefaultGoldSourceStartCmd($os, $game) + { + $cmd = ''; + if($game){ + $game = ' -game ' . $game; + } + switch ($os) { + case 'nix': + $cmd = './hlds_run -console' . $game . ' +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}'; + break; + case 'win': + $cmd = 'hlds.exe -console' . $game . ' +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}'; + break; + } + return $cmd; } /** @@ -353,7 +553,11 @@ private static function getDefaultGoldSourceVars($defaultMap = 'crossfire') 'var' => 'default_map', 'default' => $defaultMap, 'info' => 'Default Map', - 'admin_var' => false, + ], + [ + 'var' => 'maxplayers', + 'default' => 32, + 'info' => 'Maximum players on server', ], [ 'var' => 'fps', @@ -361,15 +565,31 @@ private static function getDefaultGoldSourceVars($defaultMap = 'crossfire') 'info' => 'Server FPS (tickrate)', 'admin_var' => true, ], - [ - 'var' => 'maxplayers', - 'default' => 32, - 'info' => 'Maximum players on server', - 'admin_var' => false, - ], ]; } + /** + * @param string $os + * @param string $game + * @return string + */ + private static function getDefaultSourceStartCmd($os, $game = '') + { + $cmd = ''; + if($game){ + $game = ' -game ' . $game; + } + switch ($os) { + case 'nix': + $cmd = './srcds_run -console -usercon' . $game . ' +ip {ip} +port {port} +maxplayers {maxplayers} +map {default_map} -tickrate {tickrate} +rcon_password {rcon_password}'; + break; + case 'win': + $cmd = 'srcds.exe -console -usercon' . $game . ' +ip {ip} +port {port} +maxplayers {maxplayers} +map {default_map} -tickrate {tickrate} +rcon_password {rcon_password}'; + break; + } + return $cmd; + } + /** * @param string $defaultMap * @return array[] @@ -381,14 +601,18 @@ private static function getDefaultSourceVars($defaultMap = 'crossfire') 'var' => 'default_map', 'default' => $defaultMap, 'info' => 'Default Map', - 'admin_var' => false, ], [ 'var' => 'maxplayers', 'default' => 32, 'info' => 'Maximum players on server', - 'admin_var' => false, ], + [ + 'var' => 'tickrate', + 'default' => 64, + 'info' => 'Server tickrate', + 'admin_var' => true, + ] ]; } } diff --git a/database/seeds/GamesTableSeeder.php b/database/seeds/GamesTableSeeder.php index 532b8351..7e060ed5 100644 --- a/database/seeds/GamesTableSeeder.php +++ b/database/seeds/GamesTableSeeder.php @@ -14,24 +14,26 @@ class GamesTableSeeder extends Seeder */ public function run() { + $gapRepoBaseUrl = 'http://files.gameap.ru'; + DB::table('games')->insert([ 'code' => 'valve', 'start_code' => 'valve', 'name' => 'Half-Life 1', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id' => 90 + 'steam_app_id' => 90, ]); - + DB::table('games')->insert([ 'code' => 'hl2mp', 'start_code' => 'hl2mp', 'name' => 'Half-Life 2', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 232370 + 'steam_app_id' => 232370, ]); - + DB::table('games')->insert([ 'code' => 'op4', 'start_code' => 'gearbox', @@ -41,23 +43,25 @@ public function run() 'steam_app_id' => 90, 'steam_app_set_config' => "90 mod gearbox", ]); - + DB::table('games')->insert([ - 'code' => 'l4d', - 'start_code' => 'l4d', - 'name' => 'Left 4 Dead', - 'engine' => 'Source', + 'code' => 'dmc', + 'start_code' => 'dmc', + 'name' => 'Deathmatch Classic', + 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id' => 222840, + 'steam_app_id' => 90, + 'steam_app_set_config' => "90 mod dmc", ]); - + DB::table('games')->insert([ - 'code' => 'l4d2', - 'start_code' => 'l4d2', - 'name' => 'Left 4 Dead 2', - 'engine' => 'Source', + 'code' => 'ricochet', + 'start_code' => 'ricochet', + 'name' => 'Ricochet', + 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id' => 222860, + 'steam_app_id' => 90, + 'steam_app_set_config' => "90 mod ricochet", ]); DB::table('games')->insert([ @@ -65,7 +69,7 @@ public function run() 'start_code' => 'cstrike', 'name' => 'Counter-Strike 1.5', 'engine' => 'GoldSource', - 'engine_version' => 'won' + 'engine_version' => '1', ]); DB::table('games')->insert([ @@ -92,8 +96,8 @@ public function run() 'start_code' => "cstrike", 'name' => "Counter-Strike: Source v34", 'engine' => "Source", - 'engine_version' => "v34", - 'steam_app_id' => 232330 + 'engine_version' => "34", + 'steam_app_id' => 232330, ]); DB::table('games')->insert([ @@ -101,17 +105,17 @@ public function run() 'start_code' => "cstrike", 'name' => "Counter-Strike: Source", 'engine' => "Source", - 'engine_version' => "", - 'steam_app_id' => 232330 + 'engine_version' => "1", + 'steam_app_id' => 232330, ]); - + DB::table('games')->insert([ 'code' => "csgo", 'start_code' => "csgo", 'name' => "Counter-Strike: Global Offensive", 'engine' => "Source", 'engine_version' => "1", - 'steam_app_id' => 740 + 'steam_app_id' => 740, ]); DB::table('games')->insert([ @@ -131,8 +135,8 @@ public function run() 'engine_version' => '1', 'steam_app_id' => 90, 'steam_app_set_config' => "90 mod dod", - ]); - + ]); + DB::table('games')->insert([ 'code' => 'dods', 'start_code' => 'dods', @@ -141,7 +145,7 @@ public function run() 'engine_version' => '1', 'steam_app_id' => 232290, ]); - + DB::table('games')->insert([ 'code' => 'tfc', 'start_code' => 'tfc', @@ -151,42 +155,77 @@ public function run() 'steam_app_id' => 90, 'steam_app_set_config' => "90 mod tfc", ]); - + DB::table('games')->insert([ 'code' => 'tf2', 'start_code' => 'tf', 'name' => 'Team Fortress 2', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 232250 + 'steam_app_id' => 232250, ]); - + + DB::table('games')->insert([ + 'code' => 'insurgency', + 'start_code' => 'insurgency', + 'name' => 'Insurgency', + 'engine' => 'Source', + 'engine_version' => '1', + 'steam_app_id' => 237410, + ]); + DB::table('games')->insert([ 'code' => 'synergy', 'start_code' => 'synergy', 'name' => 'Synergy', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 17525 + 'steam_app_id' => 17525, ]); DB::table('games')->insert([ - 'code' => 'dmc', - 'start_code' => 'dmc', - 'name' => 'Deathmatch Classic', - 'engine' => 'GoldSource', + 'code' => 'garrysmod', + 'start_code' => 'garrysmod', + 'name' => 'Garry`s Mod', + 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 90, - 'steam_app_set_config' => "90 mod dmc", + 'steam_app_id' => 4020, ]); - + DB::table('games')->insert([ - 'code' => 'garrysmod', - 'start_code' => 'garrysmod', - 'name' => 'Garry\'s Mod', + 'code' => 'bms', + 'start_code' => 'bms', + 'name' => 'Black Mesa: Deathmatch', + 'engine' => 'Source', + 'engine_version' => '4', + 'steam_app_id' => 346680, + ]); + + DB::table('games')->insert([ + 'code' => 'l4d', + 'start_code' => 'l4d', + 'name' => 'Left 4 Dead', + 'engine' => 'Source', + 'engine_version' => '1', + 'steam_app_id' => 222840, + ]); + + DB::table('games')->insert([ + 'code' => 'l4d2', + 'start_code' => 'l4d2', + 'name' => 'Left 4 Dead 2', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 4020 + 'steam_app_id' => 222860, + ]); + + DB::table('games')->insert([ + 'code' => 'ark', + 'start_code' => 'ark', + 'name' => 'ARK: Survival Evolved', + 'engine' => 'Source', + 'engine_version' => '1', + 'steam_app_id' => 376030, ]); DB::table('games')->insert([ @@ -194,44 +233,39 @@ public function run() 'start_code' => 'minecraft', 'name' => 'Minecraft', 'engine' => 'Minecraft', - 'engine_version' => '1', - 'remote_repository' => 'http://files.gameap.ru/minecraft/minecraft_install.tar.gz', + 'remote_repository' => $gapRepoBaseUrl . '/minecraft/minecraft_install.tar.gz', ]); DB::table('games')->insert([ - 'code' => 'ricochet', - 'start_code' => 'ricochet', - 'name' => 'Ricochet', - 'engine' => 'GoldSource', - 'engine_version' => '1', - 'steam_app_id' => 90, - 'steam_app_set_config' => "90 mod ricochet", + 'code' => 'pmmp', + 'start_code' => 'pmmp', + 'name' => 'PocketMineMP (Minecraft PE)', + 'engine' => 'Minecraft', + 'remote_repository' => 'https://github.com/pmmp/PocketMine-MP/releases/download/4.2.7/PocketMine-MP.phar', ]); DB::table('games')->insert([ 'code' => 'rust', 'start_code' => 'rust', 'name' => 'Rust', - 'engine' => 'rust', - 'engine_version' => 'staging', - 'steam_app_id' => 258550 + 'engine' => 'Unity', + 'steam_app_id' => 258550, ]); DB::table('games')->insert([ 'code' => 'hurtworld', 'start_code' => 'hurtworld', 'name' => 'HurtWorld', - 'engine' => 'hurtworld', - 'engine_version' => 'stable', - 'steam_app_id' => 405100 + 'engine' => 'Unity', + 'steam_app_id' => 405100, ]); DB::table('games')->insert([ 'code' => 'arma2', 'start_code' => 'arma2', 'name' => 'Arma 2', - 'engine' => 'armedassault2', - 'engine_version' => '2', + 'engine' => 'RealVirtuality', + 'engine_version' => '3', 'steam_app_id' => 33905, ]); @@ -239,8 +273,8 @@ public function run() 'code' => 'arma2oa', 'start_code' => 'arma2oa', 'name' => 'Arma 2: Operation Arrowhead', - 'engine' => 'armedassault2oa', - 'engine_version' => '2', + 'engine' => 'RealVirtuality', + 'engine_version' => '3', 'steam_app_id' => 33935, ]); @@ -248,8 +282,8 @@ public function run() 'code' => 'arma3', 'start_code' => 'arma3', 'name' => 'Arma 3', - 'engine' => 'armedassault3', - 'engine_version' => '3', + 'engine' => 'RealVirtuality', + 'engine_version' => '4', 'steam_app_id' => 233780, ]); @@ -257,80 +291,105 @@ public function run() 'code' => 'cod4', 'start_code' => 'cod4', 'name' => 'Call of Duty 4', - 'engine' => 'cod4', - 'engine_version' => '4' - ]); - - DB::table('games')->insert([ - 'code' => 'bms', - 'start_code' => 'bms', - 'name' => 'Black Mesa: Deathmatch', - 'engine' => 'Source', - 'engine_version' => '4', - 'steam_app_id' => 346680, - ]); - - DB::table('games')->insert([ - 'code' => 'ark', - 'start_code' => 'ark', - 'name' => 'ARK: Survival Evolved', - 'engine' => 'Source', - 'steam_app_id' => 376030, + 'engine' => 'IWEngine', + 'engine_version' => '3.0' ]); DB::table('games')->insert([ 'code' => 'mta', 'start_code' => 'mta', 'name' => 'GTA: Multi Theft Auto', - 'engine' => 'mta', - 'remote_repository' => 'http://files.gameap.ru/mta/mta.tar.xz', + 'engine' => 'RenderWare', + 'remote_repository' => $gapRepoBaseUrl . '/mta/mta.tar.xz', ]); DB::table('games')->insert([ 'code' => 'samp', 'start_code' => 'samp', - 'name' => 'GTA: San-Andreas Multiplayer', - 'engine' => 'samp`' + 'name' => 'SA-MP', + 'engine' => 'RenderWare', ]); - + + DB::table('games')->insert([ + 'code' => 'fivem', + 'start_code' => 'fivem', + 'name' => 'FiveM', + 'engine' => 'Rage', + 'remote_repository' => $gapRepoBaseUrl . '/fivem/fivem.tar.xz', + ]); + + DB::table('games')->insert([ + 'code' => 'justcause2', + 'start_code' => 'justcause2', + 'name' => 'Just Cause 2', + 'engine' => 'AvalancheEngine', + 'engine_version' => '2.0', + 'steam_app_id' => 261140, + ]); + + DB::table('games')->insert([ + 'code' => 'justcause3', + 'start_code' => 'justcause3', + 'name' => 'Just Cause 3', + 'engine' => 'AvalancheEngine', + 'engine_version' => '3.0', + 'steam_app_id' => 619960, + ]); + DB::table('games')->insert([ 'code' => '7d2d', 'start_code' => '7d2d', 'name' => '7 Days to Die', - 'engine' => '7d2d', + 'engine' => 'Unity', 'steam_app_id' => 294420, ]); - + DB::table('games')->insert([ - 'code' => 'justcause', - 'start_code' => 'justcause', - 'name' => 'Just Cause 2', - 'engine' => 'JustCause', - 'steam_app_id' => 261140, + 'code' => 'killingfloor', + 'start_code' => 'killingfloor', + 'name' => 'Killing Floor', + 'engine' => 'UnrealEngine', + 'engine_version' => '2.5', + 'steam_app_id' => 232130, ]); DB::table('games')->insert([ - 'code' => 'rok', - 'start_code' => 'rok', - 'name' => 'Reign Of Kings', - 'engine' => 'ReignOfKings', - 'steam_app_id' => 344760, + 'code' => 'killingfloor2', + 'start_code' => 'killingfloor2', + 'name' => 'Killing Floor 2', + 'engine' => 'UnrealEngine', + 'engine_version' => '3', + 'steam_app_id' => 232130, ]); DB::table('games')->insert([ 'code' => 'the-forest', 'start_code' => 'the-forest', 'name' => 'The Forest', - 'engine' => 'TheForest', + 'engine' => 'Unity', 'steam_app_id' => 556450, ]); DB::table('games')->insert([ - 'code' => 'fivem', - 'start_code' => 'fivem', - 'name' => 'FiveM', - 'engine' => 'Gta5m', - 'remote_repository' => 'http://files.gameap.ru/fivem/fivem.tar.xz', + 'code' => 'rok', + 'start_code' => 'rok', + 'name' => 'Reign Of Kings', + 'engine' => 'Unity', + 'steam_app_id' => 344760, + ]); + + DB::table('games')->insert([ + 'code' => 'ts3', + 'start_code' => 'ts3', + 'name' => 'TeamSpeak', + 'engine' => 'TeamSpeak', + ]); + + DB::table('games')->insert([ + 'code' => 'mumble', + 'start_code' => 'mumble', + 'name' => 'Mumble', + 'engine' => 'Mumble', ]); } } From f64877784eaafe6f713431f45c08de6e98a40ef0 Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Wed, 27 Apr 2022 00:25:23 +0300 Subject: [PATCH 02/37] separate nix and win fields (steam_app_id, local_repository, remote_repository) --- app/Http/Requests/Admin/GameModRequest.php | 4 +- app/Http/Requests/Admin/GameRequest.php | 9 +- app/Models/Game.php | 6 +- app/Models/GameMod.php | 13 +- app/UseCases/CreateGameServer.php | 4 +- database/factories/GameModFactory.php | 4 +- .../2017_09_12_300000_create_games_table.php | 9 +- ...17_09_12_400000_create_game_mods_table.php | 10 +- database/seeds/GameModsTableSeeder.php | 788 +++++++++++++++--- database/seeds/GamesTableSeeder.php | 471 +++++++---- resources/lang/en/games.php | 7 +- resources/lang/en/labels.php | 13 +- resources/lang/ru/games.php | 5 + resources/lang/ru/labels.php | 13 +- .../views/admin/game_mods/create.blade.php | 6 +- .../views/admin/game_mods/edit.blade.php | 22 +- resources/views/admin/games/create.blade.php | 14 +- resources/views/admin/games/edit.blade.php | 41 +- .../Admin/GameModsControllerTest.php | 12 +- 19 files changed, 1128 insertions(+), 323 deletions(-) diff --git a/app/Http/Requests/Admin/GameModRequest.php b/app/Http/Requests/Admin/GameModRequest.php index dd86af9d..0ce177d6 100644 --- a/app/Http/Requests/Admin/GameModRequest.php +++ b/app/Http/Requests/Admin/GameModRequest.php @@ -17,8 +17,8 @@ public function rules() 'name' => 'required|string|max:255', 'game_code' => 'sometimes|string|max:255|exists:games,code', - 'default_start_cmd_linux' => 'nullable|string|max:1000', - 'default_start_cmd_windows' => 'nullable|string|max:1000', + 'start_cmd_nix' => 'nullable|string|max:1000', + 'start_cmd_win' => 'nullable|string|max:1000', 'vars.*.var' => 'max:16', 'vars.*.default' => 'max:64', diff --git a/app/Http/Requests/Admin/GameRequest.php b/app/Http/Requests/Admin/GameRequest.php index 6e6cc619..95ee6976 100644 --- a/app/Http/Requests/Admin/GameRequest.php +++ b/app/Http/Requests/Admin/GameRequest.php @@ -14,10 +14,13 @@ public function rules() 'name' => 'required|min:2', 'engine' => 'required|min:2', 'engine_version' => 'required', - 'steam_app_id' => 'nullable|integer', + 'steam_app_id_nix' => 'nullable|integer', + 'steam_app_id_win' => 'nullable|integer', 'steam_app_set_config' => '', - 'local_repository' => '', - 'remote_repository' => '', + 'local_repository_nix' => '', + 'local_repository_win' => '', + 'remote_repository_nix' => '', + 'remote_repository_win' => '', ]; } } diff --git a/app/Models/Game.php b/app/Models/Game.php index 986bf886..1af87fe4 100644 --- a/app/Models/Game.php +++ b/app/Models/Game.php @@ -54,8 +54,10 @@ class Game extends Model protected $fillable = [ 'code', 'start_code', 'name', 'engine', 'engine_version', - 'steam_app_id', 'steam_app_set_config', - 'local_repository', 'remote_repository', + 'steam_app_id_nix', 'steam_app_id_win', + 'steam_app_set_config', + 'remote_repository_nix', 'remote_repository_win', + 'local_repository_nix', 'local_repository_win' ]; /** diff --git a/app/Models/GameMod.php b/app/Models/GameMod.php index 844d2def..5f08bdd0 100644 --- a/app/Models/GameMod.php +++ b/app/Models/GameMod.php @@ -15,8 +15,8 @@ * @property array $vars * @property string $remote_repository * @property string $local_repository - * @property string $default_start_cmd_linux - * @property string $default_start_cmd_windows + * @property string $start_cmd_nix + * @property string $start_cmd_win * @property string $kick_cmd * @property string $ban_cmd * @property string $chname_cmd @@ -40,8 +40,9 @@ class GameMod extends Model protected $fillable = [ 'name', 'game_code', 'fast_rcon', 'vars', - 'remote_repository', 'local_repository', - 'default_start_cmd_linux', 'default_start_cmd_windows', + 'remote_repository_nix', 'remote_repository_win', + 'local_repository_nix', 'local_repository_win', + 'start_cmd_nix', 'start_cmd_win', 'kick_cmd', 'ban_cmd', 'chname_cmd', 'srestart_cmd', 'chmap_cmd', 'sendmsg_cmd', 'passwd_cmd', ]; @@ -54,8 +55,8 @@ class GameMod extends Model 'name' => 'required|string|max:255', 'game_code' => 'sometimes|string|max:255|exists:games,code', - 'default_start_cmd_linux' => 'nullable|string|max:1000', - 'default_start_cmd_windows' => 'nullable|string|max:1000', + 'start_cmd_nix' => 'nullable|string|max:1000', + 'start_cmd_win' => 'nullable|string|max:1000', 'vars.*.var' => 'max:16', 'vars.*.default' => 'max:64', diff --git a/app/UseCases/CreateGameServer.php b/app/UseCases/CreateGameServer.php index 559c266a..fedf274b 100644 --- a/app/UseCases/CreateGameServer.php +++ b/app/UseCases/CreateGameServer.php @@ -67,8 +67,8 @@ public function __invoke(CreateGameServerCommand $command) $server->start_command = $node->isLinux() - ? $gameMod->default_start_cmd_linux - : $gameMod->default_start_cmd_windows; + ? $gameMod->start_cmd_nix + : $gameMod->start_cmd_win; } else { $server->start_command = $command->startCommand; } diff --git a/database/factories/GameModFactory.php b/database/factories/GameModFactory.php index f90516b2..0871254a 100644 --- a/database/factories/GameModFactory.php +++ b/database/factories/GameModFactory.php @@ -17,8 +17,8 @@ 'vars' => '', 'remote_repository' => '', 'local_repository' => '', - 'default_start_cmd_linux' => '', - 'default_start_cmd_windows' => '', + 'start_cmd_nix' => '', + 'start_cmd_win' => '', 'kick_cmd' => '', 'ban_cmd' => '', 'chname_cmd' => '', diff --git a/database/migrations/2017_09_12_300000_create_games_table.php b/database/migrations/2017_09_12_300000_create_games_table.php index 99f2d929..71008bd1 100644 --- a/database/migrations/2017_09_12_300000_create_games_table.php +++ b/database/migrations/2017_09_12_300000_create_games_table.php @@ -19,10 +19,13 @@ public function up() $table->string('name'); $table->string('engine'); $table->string('engine_version')->default('1.0'); - $table->integer('steam_app_id')->unsigned()->nullable(); + $table->integer('steam_app_id_nix')->unsigned()->nullable(); + $table->integer('steam_app_id_win')->unsigned()->nullable(); $table->string('steam_app_set_config')->nullable(); - $table->string('remote_repository')->nullable(); - $table->string('local_repository')->nullable(); + $table->string('remote_repository_nix')->nullable(); + $table->string('remote_repository_win')->nullable(); + $table->string('local_repository_nix')->nullable(); + $table->string('local_repository_win')->nullable(); }); } diff --git a/database/migrations/2017_09_12_400000_create_game_mods_table.php b/database/migrations/2017_09_12_400000_create_game_mods_table.php index 80a770c2..5c438ab4 100644 --- a/database/migrations/2017_09_12_400000_create_game_mods_table.php +++ b/database/migrations/2017_09_12_400000_create_game_mods_table.php @@ -19,10 +19,12 @@ public function up() $table->string('name'); $table->text('fast_rcon')->nullable(); $table->text('vars')->nullable(); - $table->text('remote_repository')->nullable(); - $table->text('local_repository')->nullable(); - $table->text('default_start_cmd_linux')->nullable(); - $table->text('default_start_cmd_windows')->nullable(); + $table->text('remote_repository_nix')->nullable(); + $table->text('remote_repository_win')->nullable(); + $table->text('local_repository_nix')->nullable(); + $table->text('local_repository_win')->nullable(); + $table->text('start_cmd_nix')->nullable(); + $table->text('start_cmd_win')->nullable(); $table->string('kick_cmd', 64)->nullable(); $table->string('ban_cmd', 64)->nullable(); $table->string('chname_cmd', 64)->nullable(); diff --git a/database/seeds/GameModsTableSeeder.php b/database/seeds/GameModsTableSeeder.php index 397ef16d..e722024d 100644 --- a/database/seeds/GameModsTableSeeder.php +++ b/database/seeds/GameModsTableSeeder.php @@ -40,6 +40,10 @@ public function run() ] ); + ### + ### Half life + ### + /* Half-Life */ DB::table('game_mods')->insert([ @@ -47,8 +51,8 @@ public function run() 'name' => 'Default', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars()), - 'default_start_cmd_linux' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), - 'default_start_cmd_windows' => self::getDefaultGoldSourceStartCmd('win', 'valve'), + 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), + 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'valve'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -61,9 +65,10 @@ public function run() 'name' => 'Classic (AMX Mod)', 'fast_rcon' => json_encode($defaultGoldSourceAmxFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars()), - 'remote_repository' => $gapRepoBaseUrl . '/half-life/amxx.tar.xz', - 'default_start_cmd_linux' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), - 'default_start_cmd_windows' => self::getDefaultGoldSourceStartCmd('win', 'valve'), + 'remote_repository_nix' => $gapRepoBaseUrl . '/half-life/amxx.tar.xz', + 'remote_repository_win' => $gapRepoBaseUrl . '/half-life/amxx.tar.xz', + 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), + 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'valve'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'amx_say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -78,9 +83,10 @@ public function run() 'name' => 'Classic (ReHLDS)', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars()), - 'remote_repository' => $gapRepoBaseUrl . '/half-life/rehlds-amxx-reunion.tar.xz', - 'default_start_cmd_linux' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), - 'default_start_cmd_windows' => self::getDefaultGoldSourceStartCmd('win', 'valve'), + 'remote_repository_nix' => $gapRepoBaseUrl . '/half-life/rehlds-amxx-reunion.tar.xz', + 'remote_repository_win' => $gapRepoBaseUrl . '/half-life/rehlds-amxx-reunion.tar.xz', + 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), + 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'valve'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -88,6 +94,56 @@ public function run() 'kick_cmd' => 'kick #{id}', ]); + /* Half-Life: Opposing Force */ + + DB::table('game_mods')->insert([ + 'game_code' => 'op4', + 'name' => 'Default', + 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), + 'vars' => json_encode(self::getDefaultGoldSourceVars()), + 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), + 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'valve'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Half Life 2 */ + + DB::table('game_mods')->insert([ + 'game_code' => 'hl2mp', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars()), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', ''), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', ''), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Black Mesa: Deathmatch */ + + DB::table('game_mods')->insert([ + 'game_code' => 'bms', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars()), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'bms'), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'bms'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + ### + ### Counter Strike + ### + /* Counter-Strike 1.6 */ DB::table('game_mods')->insert([ @@ -95,8 +151,8 @@ public function run() 'name' => 'Default', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars('de_dust2')), - 'default_start_cmd_linux' => self::getDefaultGoldSourceStartCmd('nix', 'cstrike'), - 'default_start_cmd_windows' => self::getDefaultGoldSourceStartCmd('win', 'cstrike'), + 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'cstrike'), + 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -109,9 +165,10 @@ public function run() 'name' => 'Classic (AMX Mod)', 'fast_rcon' => json_encode($defaultGoldSourceAmxFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars('de_dust2')), - 'remote_repository' => $gapRepoBaseUrl . '/cstrike-1.6/amxx.tar.xz', - 'default_start_cmd_linux' => self::getDefaultGoldSourceStartCmd('nix', 'cstrike'), - 'default_start_cmd_windows' => self::getDefaultGoldSourceStartCmd('win', 'cstrike'), + 'remote_repository_nix' => $gapRepoBaseUrl . '/cstrike-1.6/amxx.tar.xz', + 'remote_repository_win' => $gapRepoBaseUrl . '/cstrike-1.6/amxx.tar.xz', + 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'cstrike'), + 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'amx_say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -126,9 +183,41 @@ public function run() 'name' => 'Classic (ReHLDS)', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars('de_dust2')), - 'remote_repository' => $gapRepoBaseUrl . '/cstrike-1.6/rehlds-amxx-reunion.tar.xz', - 'default_start_cmd_linux' => self::getDefaultGoldSourceStartCmd('nix', 'cstrike'), - 'default_start_cmd_windows' => self::getDefaultGoldSourceStartCmd('win', 'cstrike'), + 'remote_repository_nix' => $gapRepoBaseUrl . '/cstrike-1.6/rehlds-amxx-reunion.tar.xz', + 'remote_repository_win' => $gapRepoBaseUrl . '/cstrike-1.6/rehlds-amxx-reunion.tar.xz', + 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'cstrike'), + 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'cstrike'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Counter-Strike Condition Zero */ + + DB::table('game_mods')->insert([ + 'game_code' => 'czero', + 'name' => 'Default', + 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), + 'vars' => json_encode(self::getDefaultGoldSourceVars('de_dust')), + 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'czero'), + 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'czero'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Counter-Strike Source v34*/ + + DB::table('game_mods')->insert([ + 'game_code' => 'cssv34', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars('de_dust2')), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'cstrike'), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -142,8 +231,8 @@ public function run() 'game_code' => 'cssource', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('de_dust2')), - 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'cstrike'), - 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'cstrike'), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'cstrike'), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -168,8 +257,8 @@ public function run() 'info' => 'Steam account token', ], ])), - 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 0', - 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 0', + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 0', + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 0', 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -192,8 +281,8 @@ public function run() 'info' => 'Steam account token', ], ])), - 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 1', - 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 1', + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 1', + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 1', 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -216,8 +305,8 @@ public function run() 'info' => 'Steam account token', ], ])), - 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 0', - 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 0', + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 0', + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 0', 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -240,8 +329,8 @@ public function run() 'info' => 'Steam account token', ], ])), - 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 1', - 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 1', + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 1', + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 1', 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -264,8 +353,8 @@ public function run() 'info' => 'Steam account token', ], ])), - 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 2', - 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 2', + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 2', + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 2', 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -273,14 +362,18 @@ public function run() 'kick_cmd' => 'kick #{id}', ]); - /* Insurgency */ + ### + ### Team Fortress + ### + + /* Team Fortress Classic */ DB::table('game_mods')->insert([ - 'game_code' => 'insurgency', + 'game_code' => 'tfc', 'name' => 'Default', - 'vars' => json_encode(self::getDefaultSourceVars('ministry')), - 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix'), - 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win'), + 'vars' => json_encode(self::getDefaultSourceVars('2fort')), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'tfc'), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'tfc'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -293,9 +386,147 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'tf2', 'name' => 'Default', - 'vars' => json_encode(self::getDefaultSourceVars('cp_badlands')), - 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix'), - 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win'), + 'vars' => json_encode(self::getDefaultSourceVars('ctf_2fort')), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'tf'), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'tf'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + ### + ### Day of Defeat + ### + + /* Day of Defeat */ + + DB::table('game_mods')->insert([ + 'game_code' => 'dod', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars('dod_anzio')), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'dod'), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'dod'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Day of Defeat Source */ + + DB::table('game_mods')->insert([ + 'game_code' => 'dods', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars('dod_anzio')), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'dods'), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'dods'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + ### + ### Left 4 Dead + ### + + /* Left 4 Dead */ + + DB::table('game_mods')->insert([ + 'game_code' => 'l4d', + 'name' => 'Default', + 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), + 'vars' => json_encode(self::getDefaultGoldSourceVars('l4d_farm04_barn')), + 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'left4dead'), + 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'left4dead'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Left 4 Dead 2 */ + + DB::table('game_mods')->insert([ + 'game_code' => 'l4d2', + 'name' => 'Default', + 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), + 'vars' => json_encode(self::getDefaultSourceVars('c2m1_highway')), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'left4dead2'), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'left4dead2'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + ### + ### Other GoldSource + ### + + /* Deathmatch Classic */ + + DB::table('game_mods')->insert([ + 'game_code' => 'dmc', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars('')), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', ''), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', ''), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Ricochet */ + + DB::table('game_mods')->insert([ + 'game_code' => 'ricochet', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars('')), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', ''), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', ''), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Sven Co-op */ + + DB::table('game_mods')->insert([ + 'game_code' => 'svencoop', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultGoldSourceVars('stadium4')), + 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', '', './svends_run'), + 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', '', 'svends.exe'), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + ### + ### Other Source + ### + + /* Insurgency */ + + DB::table('game_mods')->insert([ + 'game_code' => 'insurgency', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars('ministry')), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix'), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -309,8 +540,8 @@ public function run() 'game_code' => 'garrysmod', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('gm_construct')), - 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'garrysmod'), - 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'garrysmod'), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'garrysmod'), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'garrysmod'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -318,14 +549,14 @@ public function run() 'kick_cmd' => 'kick #{id}', ]); - /* Black Mesa: Deathmatch */ + /* No More Room In Hell */ DB::table('game_mods')->insert([ - 'game_code' => 'bms', + 'game_code' => 'nmrih', 'name' => 'Default', - 'vars' => json_encode(self::getDefaultSourceVars()), - 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'bms'), - 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'bms'), + 'vars' => json_encode(self::getDefaultSourceVars('')), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', ''), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', ''), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -333,14 +564,29 @@ public function run() 'kick_cmd' => 'kick #{id}', ]); - /* Day of Defeat Source */ + /* Pirates, Vikings, and Knights II */ DB::table('game_mods')->insert([ - 'game_code' => 'dods', + 'game_code' => 'pvk2', 'name' => 'Default', - 'vars' => json_encode(self::getDefaultSourceVars('dod_anzio')), - 'default_start_cmd_linux' => self::getDefaultSourceStartCmd('nix', 'dods'), - 'default_start_cmd_windows' => self::getDefaultSourceStartCmd('win', 'dods'), + 'vars' => json_encode(self::getDefaultSourceVars('')), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', ''), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', ''), + 'passwd_cmd' => 'password {password}', + 'sendmsg_cmd' => 'say "{msg}"', + 'chmap_cmd' => 'changelevel {map}', + 'srestart_cmd' => 'restart', + 'kick_cmd' => 'kick #{id}', + ]); + + /* Synergy */ + + DB::table('game_mods')->insert([ + 'game_code' => 'synergy', + 'name' => 'Default', + 'vars' => json_encode(self::getDefaultSourceVars('d1_trainstation_01')), + 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'synergy'), + 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'synergy'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -348,11 +594,38 @@ public function run() 'kick_cmd' => 'kick #{id}', ]); + ### + ### Minecraft + ### + /* Minecraft */ DB::table('game_mods')->insert([ 'game_code' => 'minecraft', - 'name' => 'Vanilla', + 'name' => 'Default', + 'vars' => json_encode([ + [ + 'var' => 'world', + 'default' => 'world', + 'info' => 'World file', + ], + [ + 'var' => 'java_xms', + 'default' => '1G', + 'info' => 'Java start RAM amount', + 'admin_var' => true, + ], + [ + 'var' => 'java_xmx', + 'default' => '2G', + 'info' => 'Java max RAM amount', + 'admin_var' => true, + ], + ]), + 'remote_repository_nix' => 'https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar', + 'remote_repository_win' => 'https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar', + 'start_cmd_nix' => 'java -Xms{java_xms} -Xmx{java_xms} -jar server.jar --port {port} --world {world} --nogui', + 'start_cmd_win' => 'java -Xms{java_xms} -Xmx{java_xms} -jar server.jar --port {port} --world {world} --nogui', ]); DB::table('game_mods')->insert([ @@ -375,8 +648,9 @@ public function run() 'info' => 'Core mod version', ], ]), - 'remote_repository' => $gapRepoBaseUrl . '/minecraft/minecraft-runner.tar.gz', - 'default_start_cmd_linux' => './mcrun.sh run --version={version} --core-mod={core_mod} --core-mod-version={core_mod_version} --ip={ip} --port={port} --query-port={query_port} --rcon-port={rcon_port} --rcon-password={rcon_password}', + 'remote_repository_nix' => $gapRepoBaseUrl . '/minecraft/minecraft-runner.tar.gz', + 'remote_repository_win' => $gapRepoBaseUrl . '/minecraft/minecraft-runner.tar.gz', + 'start_cmd_nix' => './mcrun.sh run --version={version} --core-mod={core_mod} --core-mod-version={core_mod_version} --ip={ip} --port={port} --query-port={query_port} --rcon-port={rcon_port} --rcon-password={rcon_password}', ]); /* PMMP (MinecraftPE) */ @@ -384,8 +658,8 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'pmmp', 'name' => 'Default', - 'default_start_cmd_linux' => './bin/php7/bin/php ./PocketMine-MP.phar', - 'default_start_cmd_windows' => '', + 'start_cmd_nix' => './bin/php7/bin/php ./PocketMine-MP.phar', + 'start_cmd_win' => '', 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say {msg}', 'srestart_cmd' => 'reload', @@ -393,20 +667,20 @@ public function run() 'kick_cmd' => 'kick {name}', ]); - /* SAMP */ + ### + ### GTA + ### - DB::table('game_mods')->insert([ - 'game_code' => 'samp', - 'name' => 'Freeroam (Linux)', - 'default_start_cmd_linux' => './samp03svr', - 'remote_repository' => 'http://files.sa-mp.com/samp037svr_R2-1.tar.gz', - ]); + /* SAMP */ + // ToDo: pre run script - move files from folder samp03 to server root DB::table('game_mods')->insert([ 'game_code' => 'samp', - 'name' => 'Freeroam (Windows)', - 'default_start_cmd_windows' => 'samp-server.exe', - 'remote_repository' => 'http://files.sa-mp.com/samp037_svr_R2-1-1_win32.zip', + 'name' => 'Default (Freeroam)', + 'remote_repository_nix' => 'http://files.sa-mp.com/samp037svr_R2-1.tar.gz', + 'remote_repository_win' => 'http://files.sa-mp.com/samp037_svr_R2-1-1_win32.zip', + 'start_cmd_nix' => './samp03svr', + 'start_cmd_win' => 'samp-server.exe', ]); /* Multi Theft Auto (MTA) */ @@ -421,8 +695,10 @@ public function run() 'info' => 'Maximum players on server', ] ]), - 'default_start_cmd_linux' => './mta-server64 -t -n --ip {ip} --port {port} --maxplayers {maxplayers}', - 'remote_repository' => $gapRepoBaseUrl . '/mta/default-deathmatch.tar.xz', + 'remote_repository_nix' => $gapRepoBaseUrl . '/mta/default-deathmatch.tar.xz', + 'remote_repository_win' => $gapRepoBaseUrl . '/mta/default-deathmatch.tar.xz', + 'start_cmd_nix' => './mta-server64 -t -n --ip {ip} --port {port} --maxplayers {maxplayers}', + 'start_cmd_win' => '', ]); /* FiveM */ @@ -443,19 +719,32 @@ public function run() 'admin_var' => true, ], ]), - 'default_start_cmd_linux' => './fivem_run.sh --ip={ip} --port={port} --hostname="{hostname}" --rcon-password="{rcon_password}" --license-key="{license_key}"', - 'default_start_cmd_windows' => 'run.cmd +exec server.cfg', + 'start_cmd_nix' => './fivem_run.sh --ip={ip} --port={port} --hostname="{hostname}" --rcon-password="{rcon_password}" --license-key="{license_key}"', + 'start_cmd_win' => 'run.cmd +exec server.cfg', 'sendmsg_cmd' => 'say {msg}', 'kick_cmd' => 'clientkick {id}', ]); + /* RageMP */ + + DB::table('game_mods')->insert([ + 'game_code' => 'ragemp', + 'name' => 'Default', + 'start_cmd_nix' => './ragemp-server', + 'start_cmd_win' => '', + ]); + + ### + ### Just cause + ### + /* Just cause 2 */ DB::table('game_mods')->insert([ 'game_code' => 'justcause2', 'name' => 'Default', - 'default_start_cmd_linux' => './Jcmp-Server', - 'default_start_cmd_windows' => '', + 'start_cmd_nix' => './Jcmp-Server', + 'start_cmd_win' => '', ]); /* Just cause 3 */ @@ -463,8 +752,167 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'justcause3', 'name' => 'Default', - 'default_start_cmd_linux' => './Server', - 'default_start_cmd_windows' => '', + 'start_cmd_nix' => './Server', + 'start_cmd_win' => '', + ]); + + ### + ### Arma + ### + + /* Arma 2 */ + DB::table('game_mods')->insert([ + 'game_code' => 'arma2', + 'name' => 'Default', + 'vars' => json_encode([ + [ + 'var' => 'server_name', + 'default' => 'Arma 2 server', + 'info' => 'Server name', + ], + [ + 'var' => 'config_file', + 'default' => 'server.cfg', + 'info' => 'Config file name', + ], + ]), + 'start_cmd_nix' => './arma2server -name={server_name} -config={config_file}', + 'start_cmd_win' => '', + ]); + + /* Arma 2 OA */ + DB::table('game_mods')->insert([ + 'game_code' => 'arma2oa', + 'name' => 'Default', + 'vars' => json_encode([ + [ + 'var' => 'server_name', + 'default' => 'Arma 2 server', + 'info' => 'Server name', + ], + [ + 'var' => 'config_file', + 'default' => 'server.cfg', + 'info' => 'Config file name', + ], + ]), + 'start_cmd_nix' => './arma2server -name={server_name} -config={config_file}', + 'start_cmd_win' => '', + ]); + + /* Arma 3 */ + DB::table('game_mods')->insert([ + 'game_code' => 'arma3', + 'name' => 'Default', + 'vars' => json_encode([ + [ + 'var' => 'server_name', + 'default' => 'Arma 2 server', + 'info' => 'Server name', + ], + [ + 'var' => 'config_file', + 'default' => 'server.cfg', + 'info' => 'Config file name', + ], + ]), + 'start_cmd_nix' => './arma3server -name={server_name} -config={config_file}', + 'start_cmd_win' => '', + ]); + + ### + ### Killing floor + ### + + /* Killing floor */ + +// DB::table('game_mods')->insert([ +// 'game_code' => 'killingfloor', +// 'name' => 'Default', +// 'vars' => json_encode([ +// [ +// 'var' => 'maxplayers', +// 'default' => '6', +// 'info' => 'Maximum players on server', +// ], +// [ +// 'var' => 'default_map', +// 'default' => 'KF-bioticslab', +// 'info' => 'Default Map', +// ], +// [ +// 'var' => 'is_vac', +// 'default' => 'true', +// 'info' => 'Is VAC enabled?', +// ], +// ]), +// 'start_cmd_nix' => './ucc-bin server {default_map}.rom?game=KFmod.KFGameType?VACSecured={is_vac}?MaxPlayers={maxplayers} -nohomedir', +// 'start_cmd_win' => 'ucc server {default_map}.rom?game=KFmod.KFGameType?VACSecured={is_vac}?MaxPlayers={maxplayers}', +// ]); + + /* Killing floor 2 */ + + DB::table('game_mods')->insert([ + 'game_code' => 'killingfloor2', + 'name' => 'Default', + 'vars' => json_encode([ + 'var' => 'default_map', + 'default' => 'kf-bioticslab', + 'info' => 'Default Map', + ]), + 'start_cmd_nix' => './Binaries/Win64/KFGameSteamServer.bin.x86_64 {default_map}', + 'start_cmd_win' => 'Binaries\win64\kfserver {default_map}', + ]); + + ### + ### Other games + ### + + /* ARK: Survival Evolved' */ + + DB::table('game_mods')->insert([ + 'game_code' => 'ark', + 'name' => 'Default', + 'vars' => json_encode([ + [ + 'var' => 'server_password', + 'default' => '', + 'info' => 'Server password', + ], + [ + 'var' => 'session_name', + 'default' => 'ARK server', + 'info' => 'Session name', + ], + ]), + 'start_cmd_nix' => './ShooterGameServer TheIsland?listen?SessionName={session_name}?Port={port}?QueryPort={query_port}?MaxPlayers={maxplayers}?ServerPassword={server_password}?ServerAdminPassword={rcon_password} -server -log', + 'start_cmd_win' => 'ShooterGameServer.exe TheIsland?listen?SessionName={session_name}?Port={port}?QueryPort={query_port}?MaxPlayers={maxplayers}?ServerPassword={server_password}?ServerAdminPassword={rcon_password} exit', + ]); + + /* HurtWorld */ + + DB::table('game_mods')->insert([ + 'game_code' => 'hurtworld', + 'name' => 'Default', + 'vars' => json_encode([ + [ + 'var' => 'server_name', + 'default' => 'HurtWorld server', + 'info' => 'Server name', + ], + [ + 'var' => 'admin_uid', + 'default' => '', + 'info' => 'Admin UID', + ], + [ + 'var' => 'log_file', + 'default' => 'gamelog.txt', + 'info' => 'Log file name', + ], + ]), + 'start_cmd_nix' => '', + 'start_cmd_win' => 'Hurtworld.exe -batchmode -nographics -exec "host {port};queryport {query_port};servername {server_name};addadmin admin_uid" -logfile "{log_file}"', ]); /* Rust */ @@ -479,67 +927,141 @@ public function run() 'name' => 'Oxide', ]); + /* 7 Reign Of Kings */ + + DB::table('game_mods')->insert([ + 'game_code' => 'rok', + 'name' => 'Default', + 'start_cmd_nix' => '', + 'start_cmd_win' => '', + ]); + /* 7 Day to Die */ DB::table('game_mods')->insert([ 'game_code' => '7d2d', 'name' => 'Default', - 'default_start_cmd_linux' => './startserver.sh -configfile=serverconfig.xml', - 'default_start_cmd_windows' => 'startdedicated.bat', + 'start_cmd_nix' => './startserver.sh -configfile=serverconfig.xml', + 'start_cmd_win' => 'startdedicated.bat', ]); - /* Killing floor 2 */ + /* Don`t Starve Together */ DB::table('game_mods')->insert([ - 'game_code' => 'killingfloor2', + 'game_code' => 'dst', + 'name' => 'Default', + 'start_cmd_nix' => './dontstarve_dedicated_server_nullrenderer', + 'start_cmd_win' => '', + ]); + + /* The Forest */ + // ToDo: add all launch params https://steamcommunity.com/sharedfiles/filedetails/?id=907906289 + + DB::table('game_mods')->insert([ + 'game_code' => 'the-forest', 'name' => 'Default', 'vars' => json_encode([ - 'var' => 'default_map', - 'default' => 'kf-bioticslab', - 'info' => 'Default Map', + [ + 'var' => 'name', + 'default' => 'The forest dedicated server', + 'info' => 'Server name', + ], + [ + 'var' => 'password', + 'default' => '', + 'info' => 'Server password', + ], + [ + 'var' => 'password_admin', + 'default' => '', + 'info' => 'Server admin password', + ], + [ + 'var' => 'serversteamaccount', + 'default' => '', + 'info' => 'Server steam account', + ], + [ + 'var' => 'enableVAC', + 'default' => 'on', + 'info' => 'Enable VAC?', + ], + [ + 'var' => 'serverautosaveinterval', + 'default' => '15', + 'info' => 'Autosave interval', + ], + [ + 'var' => 'difficulty', + 'default' => 'Normal', + 'info' => 'Difficulty', + ], + [ + 'var' => 'slot', + 'default' => '1', + 'info' => 'slot', + ], + [ + 'var' => 'maxplayers', + 'default' => '8', + 'info' => 'Max players', + 'admin_var' => true, + ], + [ + 'var' => 'steamport', + 'default' => '8766', + 'info' => 'Server steamport', + 'admin_var' => true, + ], ]), - 'default_start_cmd_linux' => './Binaries/Win64/KFGameSteamServer.bin.x86_64 {default_map}', - 'default_start_cmd_windows' => 'Binaries\win64\kfserver {default_map}', + 'start_cmd_win' => 'TheForestDedicatedServer.exe -serverip {ip} -servergameport {port} -serverqueryport {query_port} -serversteamport {steamport} -serverplayers {maxplayers} -servername "{servername}" -serverpassword {password} -serverpassword_admin {password_admin} -enableVAC {enableVAC} -serverautosaveinterval {serverautosaveinterval} -difficulty {difficulty} -slot {slot} ', ]); - /* TeamSpeak 3 */ + /* Teeworlds */ + // ToDo: add commands + // ToDo: add pre run script for generating server.cfg https://www.teeworlds.com/?page=docs&wiki=server_setup DB::table('game_mods')->insert([ - 'game_code' => 'ts3', - 'name' => 'Linux', - 'default_start_cmd_linux' => './ts3server', - 'remote_repository' => 'https://files.teamspeak-services.com/releases/server/3.13.6/teamspeak3-server_linux_amd64-3.13.6.tar.bz2', + 'game_code' => 'teeworlds', + 'name' => 'Default', + 'start_cmd_nix' => './teeworlds-0.7.5-linux_x86_64/teeworlds_srv -f server.cfg', + 'start_cmd_win' => 'teeworlds-0.7.5-win64\teeworlds_srv.exe -f server.cfg', + 'remote_repository_nix' => 'https://github.com/teeworlds/teeworlds/releases/download/0.7.5/teeworlds-0.7.5-linux_x86_64.tar.gz', + 'remote_repository_win' => 'https://github.com/teeworlds/teeworlds/releases/download/0.7.5/teeworlds-0.7.5-win64.zip', ]); DB::table('game_mods')->insert([ - 'game_code' => 'ts3', - 'name' => 'Windows', - 'default_start_cmd_windows' => 'teamspeak3-server_win64\ts3server.exe', - 'remote_repository' => 'https://files.teamspeak-services.com/releases/server/3.13.6/teamspeak3-server_win64-3.13.6.zip', + 'game_code' => 'teeworlds', + 'name' => 'DDrace', + 'start_cmd_nix' => './DDNet-16.0.3-linux_x86_64/DDNet-Server -f server.cfg', + 'start_cmd_win' => 'DDNet-16.0.3-win64\DDNet-Server.exe -f server.cfg', + 'remote_repository_nix' => 'https://ddnet.tw/downloads/DDNet-16.0.3-linux_x86_64.tar.xz', + 'remote_repository_win' => 'https://ddnet.tw/downloads/DDNet-16.0.3-win64.zip', ]); - } + ### + ### Software + ### + + /* TeamSpeak 3 */ + +// DB::table('game_mods')->insert([ +// 'game_code' => 'ts3', +// 'name' => 'Linux', +// 'vars' => json_encode([ +// [ +// 'var' => 'filetransfer_port', +// 'default' => '30033', +// 'info' => 'Filetransfer port', +// 'admin_var' => true, +// ], +// ]), +// 'start_cmd_nix' => './teamspeak3-server_linux_amd64/ts3server_minimal_runscript.sh voice_ip={ip} default_voice_port={port} query_ip={ip} query_port={query_port} filetransfer_ip={ip} filetransfer_port={filetransfer_port} license_accepted=1', +// 'start_cmd_win' => 'teamspeak3-server_win64\ts3server.exe', +// 'remote_repository_nix' => 'https://files.teamspeak-services.com/releases/server/3.13.6/teamspeak3-server_linux_amd64-3.13.6.tar.bz2', +// 'remote_repository_win' => 'https://files.teamspeak-services.com/releases/server/3.13.6/teamspeak3-server_win64-3.13.6.zip', +// ]); - /** - * @param string $os - * @param string $game - * @return string - */ - private static function getDefaultGoldSourceStartCmd($os, $game) - { - $cmd = ''; - if($game){ - $game = ' -game ' . $game; - } - switch ($os) { - case 'nix': - $cmd = './hlds_run -console' . $game . ' +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}'; - break; - case 'win': - $cmd = 'hlds.exe -console' . $game . ' +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}'; - break; - } - return $cmd; } /** @@ -558,6 +1080,7 @@ private static function getDefaultGoldSourceVars($defaultMap = 'crossfire') 'var' => 'maxplayers', 'default' => 32, 'info' => 'Maximum players on server', + 'admin_var' => true, ], [ 'var' => 'fps', @@ -571,20 +1094,27 @@ private static function getDefaultGoldSourceVars($defaultMap = 'crossfire') /** * @param string $os * @param string $game + * @param string $file * @return string */ - private static function getDefaultSourceStartCmd($os, $game = '') + private static function getDefaultGoldSourceStartCmd($os, $game = '', $file = '') { $cmd = ''; - if($game){ + if(!empty($game)){ $game = ' -game ' . $game; } switch ($os) { case 'nix': - $cmd = './srcds_run -console -usercon' . $game . ' +ip {ip} +port {port} +maxplayers {maxplayers} +map {default_map} -tickrate {tickrate} +rcon_password {rcon_password}'; + if(empty($file)){ + $file = './hlds_run'; + } + $cmd = $file . ' -console' . $game . ' +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}'; break; case 'win': - $cmd = 'srcds.exe -console -usercon' . $game . ' +ip {ip} +port {port} +maxplayers {maxplayers} +map {default_map} -tickrate {tickrate} +rcon_password {rcon_password}'; + if(empty($file)){ + $file = 'hlds.exe'; + } + $cmd = $file . ' -console' . $game . ' +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}'; break; } return $cmd; @@ -606,6 +1136,7 @@ private static function getDefaultSourceVars($defaultMap = 'crossfire') 'var' => 'maxplayers', 'default' => 32, 'info' => 'Maximum players on server', + 'admin_var' => true, ], [ 'var' => 'tickrate', @@ -615,4 +1146,33 @@ private static function getDefaultSourceVars($defaultMap = 'crossfire') ] ]; } + + /** + * @param string $os + * @param string $game + * @param string $file + * @return string + */ + private static function getDefaultSourceStartCmd($os, $game = '', $file = '') + { + $cmd = ''; + if(!empty($game)){ + $game = ' -game ' . $game; + } + switch ($os) { + case 'nix': + if(empty($file)){ + $file = './srcds_run'; + } + $cmd = $file . ' -console' . $game . ' +ip {ip} +port {port} +maxplayers {maxplayers} +map {default_map} -tickrate {tickrate} +rcon_password {rcon_password}'; + break; + case 'win': + if(empty($file)){ + $file = 'srcds.exe'; + } + $cmd = $file . ' -console' . $game . ' +ip {ip} +port {port} +maxplayers {maxplayers} +map {default_map} -tickrate {tickrate} +rcon_password {rcon_password}'; + break; + } + return $cmd; + } } diff --git a/database/seeds/GamesTableSeeder.php b/database/seeds/GamesTableSeeder.php index 7e060ed5..69730e8a 100644 --- a/database/seeds/GamesTableSeeder.php +++ b/database/seeds/GamesTableSeeder.php @@ -16,22 +16,18 @@ public function run() { $gapRepoBaseUrl = 'http://files.gameap.ru'; + /* + * Half life + */ + DB::table('games')->insert([ 'code' => 'valve', 'start_code' => 'valve', 'name' => 'Half-Life 1', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id' => 90, - ]); - - DB::table('games')->insert([ - 'code' => 'hl2mp', - 'start_code' => 'hl2mp', - 'name' => 'Half-Life 2', - 'engine' => 'Source', - 'engine_version' => '1', - 'steam_app_id' => 232370, + 'steam_app_id_nix' => 90, + 'steam_app_id_win' => 90, ]); DB::table('games')->insert([ @@ -40,30 +36,35 @@ public function run() 'name' => 'Half-Life: Opposing Force', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id' => 90, + 'steam_app_id_nix' => 90, + 'steam_app_id_win' => 90, 'steam_app_set_config' => "90 mod gearbox", ]); DB::table('games')->insert([ - 'code' => 'dmc', - 'start_code' => 'dmc', - 'name' => 'Deathmatch Classic', - 'engine' => 'GoldSource', + 'code' => 'hl2mp', + 'start_code' => 'hl2mp', + 'name' => 'Half-Life 2', + 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 90, - 'steam_app_set_config' => "90 mod dmc", + 'steam_app_id_nix' => 232370, + 'steam_app_id_win' => 232370, ]); DB::table('games')->insert([ - 'code' => 'ricochet', - 'start_code' => 'ricochet', - 'name' => 'Ricochet', - 'engine' => 'GoldSource', - 'engine_version' => '1', - 'steam_app_id' => 90, - 'steam_app_set_config' => "90 mod ricochet", + 'code' => 'bms', + 'start_code' => 'bms', + 'name' => 'Black Mesa: Deathmatch', + 'engine' => 'Source', + 'engine_version' => '4', + 'steam_app_id_nix' => 346680, + 'steam_app_id_win' => 346680, ]); + /* + * Counter Strike + */ + DB::table('games')->insert([ 'code' => 'cs15', 'start_code' => 'cstrike', @@ -78,7 +79,8 @@ public function run() 'name' => 'Counter-Strike 1.6', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id' => 90, + 'steam_app_id_nix' => 90, + 'steam_app_id_win' => 90, ]); DB::table('games')->insert([ @@ -87,7 +89,8 @@ public function run() 'name' => "Counter-Strike: Condition Zero", 'engine' => "GoldSource", 'engine_version' => "1", - 'steam_app_id' => 90, + 'steam_app_id_nix' => 90, + 'steam_app_id_win' => 90, 'steam_app_set_config' => "90 mod czero", ]); @@ -97,7 +100,8 @@ public function run() 'name' => "Counter-Strike: Source v34", 'engine' => "Source", 'engine_version' => "34", - 'steam_app_id' => 232330, + 'steam_app_id_nix' => 232330, + 'steam_app_id_win' => 232330, ]); DB::table('games')->insert([ @@ -106,7 +110,8 @@ public function run() 'name' => "Counter-Strike: Source", 'engine' => "Source", 'engine_version' => "1", - 'steam_app_id' => 232330, + 'steam_app_id_nix' => 232330, + 'steam_app_id_win' => 232330, ]); DB::table('games')->insert([ @@ -115,25 +120,47 @@ public function run() 'name' => "Counter-Strike: Global Offensive", 'engine' => "Source", 'engine_version' => "1", - 'steam_app_id' => 740, + 'steam_app_id_nix' => 740, + 'steam_app_id_win' => 740, ]); + /* + * Team Fortress + */ + DB::table('games')->insert([ - 'code' => 'svencoop', - 'start_code' => 'svencoop', - 'name' => 'Sven Co-op', + 'code' => 'tfc', + 'start_code' => 'tfc', + 'name' => 'Team Fortress Classic', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id' => 276060, + 'steam_app_id_nix' => 90, + 'steam_app_id_win' => 90, + 'steam_app_set_config' => "90 mod tfc", ]); + DB::table('games')->insert([ + 'code' => 'tf2', + 'start_code' => 'tf', + 'name' => 'Team Fortress 2', + 'engine' => 'Source', + 'engine_version' => '1', + 'steam_app_id_nix' => 232250, + 'steam_app_id_win' => 232250, + ]); + + /* + * Day of Defeat + */ + DB::table('games')->insert([ 'code' => 'dod', 'start_code' => 'dod', 'name' => 'Day of Defeat', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id' => 90, + 'steam_app_id_nix' => 90, + 'steam_app_id_win' => 90, 'steam_app_set_config' => "90 mod dod", ]); @@ -143,97 +170,145 @@ public function run() 'name' => 'Day of Defeat: Source', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 232290, + 'steam_app_id_nix' => 232290, + 'steam_app_id_win' => 232290, ]); + /* + * Left 4 Dead + */ + DB::table('games')->insert([ - 'code' => 'tfc', - 'start_code' => 'tfc', - 'name' => 'Team Fortress Classic', - 'engine' => 'GoldSource', + 'code' => 'l4d', + 'start_code' => 'l4d', + 'name' => 'Left 4 Dead', + 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 90, - 'steam_app_set_config' => "90 mod tfc", + 'steam_app_id_nix' => 222840, + 'steam_app_id_win' => 222840, ]); DB::table('games')->insert([ - 'code' => 'tf2', - 'start_code' => 'tf', - 'name' => 'Team Fortress 2', + 'code' => 'l4d2', + 'start_code' => 'l4d2', + 'name' => 'Left 4 Dead 2', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 232250, + 'steam_app_id_nix' => 222860, + 'steam_app_id_win' => 222860, ]); + /* + * Other gold source + */ + DB::table('games')->insert([ - 'code' => 'insurgency', - 'start_code' => 'insurgency', - 'name' => 'Insurgency', - 'engine' => 'Source', + 'code' => 'dmc', + 'start_code' => 'dmc', + 'name' => 'Deathmatch Classic', + 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id' => 237410, + 'steam_app_id_nix' => 90, + 'steam_app_id_win' => 90, + 'steam_app_set_config' => "90 mod dmc", ]); DB::table('games')->insert([ - 'code' => 'synergy', - 'start_code' => 'synergy', - 'name' => 'Synergy', - 'engine' => 'Source', + 'code' => 'ricochet', + 'start_code' => 'ricochet', + 'name' => 'Ricochet', + 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id' => 17525, + 'steam_app_id_nix' => 90, + 'steam_app_id_win' => 90, + 'steam_app_set_config' => "90 mod ricochet", ]); - + DB::table('games')->insert([ - 'code' => 'garrysmod', - 'start_code' => 'garrysmod', - 'name' => 'Garry`s Mod', + 'code' => 'svencoop', + 'start_code' => 'svencoop', + 'name' => 'Sven Co-op', + 'engine' => 'GoldSource', + 'engine_version' => '1', + 'steam_app_id_nix' => 276060, + 'steam_app_id_win' => 276060, + ]); + + /* + * Other source + */ + + DB::table('games')->insert([ + 'code' => 'insurgency', + 'start_code' => 'insurgency', + 'name' => 'Insurgency', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 4020, + 'steam_app_id_nix' => 237410, + 'steam_app_id_win' => 237410, ]); DB::table('games')->insert([ - 'code' => 'bms', - 'start_code' => 'bms', - 'name' => 'Black Mesa: Deathmatch', + 'code' => 'garrysmod', + 'start_code' => 'garrysmod', + 'name' => 'Garry`s Mod', 'engine' => 'Source', - 'engine_version' => '4', - 'steam_app_id' => 346680, + 'engine_version' => '1', + 'steam_app_id_nix' => 4020, + 'steam_app_id_win' => 4020, ]); DB::table('games')->insert([ - 'code' => 'l4d', - 'start_code' => 'l4d', - 'name' => 'Left 4 Dead', + 'code' => 'pvk2', + 'start_code' => 'pvk2', + 'name' => 'Pirates, Vikings, and Knights II', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 222840, + 'steam_app_id_nix' => 17575, + 'steam_app_id_win' => 17575, ]); DB::table('games')->insert([ - 'code' => 'l4d2', - 'start_code' => 'l4d2', - 'name' => 'Left 4 Dead 2', + 'code' => 'nmrih', + 'start_code' => 'nmrih', + 'name' => 'No More Room In Hell', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 222860, + 'steam_app_id_nix' => 317670, + 'steam_app_id_win' => 317670, ]); DB::table('games')->insert([ - 'code' => 'ark', - 'start_code' => 'ark', - 'name' => 'ARK: Survival Evolved', + 'code' => 'synergy', + 'start_code' => 'synergy', + 'name' => 'Synergy', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id' => 376030, + 'steam_app_id_nix' => 17525, + 'steam_app_id_win' => 17525, ]); - + +// DB::table('games')->insert([ +// 'code' => 'dota2', +// 'start_code' => 'dota2', +// 'name' => 'Dota 2', +// 'engine' => 'Source', +// 'engine_version' => '1', +// 'steam_app_id_nix' => 570, +// 'steam_app_id_win' => 570, +// ]); + + /* + * Minecraft + */ + DB::table('games')->insert([ 'code' => 'minecraft', 'start_code' => 'minecraft', 'name' => 'Minecraft', 'engine' => 'Minecraft', - 'remote_repository' => $gapRepoBaseUrl . '/minecraft/minecraft_install.tar.gz', + 'remote_repository_nix' => $gapRepoBaseUrl . '/minecraft/minecraft_install.tar.gz', + 'remote_repository_win' => $gapRepoBaseUrl . '/minecraft/minecraft_install.tar.gz', ]); DB::table('games')->insert([ @@ -241,68 +316,69 @@ public function run() 'start_code' => 'pmmp', 'name' => 'PocketMineMP (Minecraft PE)', 'engine' => 'Minecraft', - 'remote_repository' => 'https://github.com/pmmp/PocketMine-MP/releases/download/4.2.7/PocketMine-MP.phar', - ]); - - DB::table('games')->insert([ - 'code' => 'rust', - 'start_code' => 'rust', - 'name' => 'Rust', - 'engine' => 'Unity', - 'steam_app_id' => 258550, - ]); - - DB::table('games')->insert([ - 'code' => 'hurtworld', - 'start_code' => 'hurtworld', - 'name' => 'HurtWorld', - 'engine' => 'Unity', - 'steam_app_id' => 405100, + 'remote_repository_nix' => 'https://github.com/pmmp/PocketMine-MP/releases/download/4.2.7/PocketMine-MP.phar', + 'remote_repository_win' => 'https://github.com/pmmp/PocketMine-MP/releases/download/4.2.7/PocketMine-MP.phar', ]); + /* + * Arma + */ + DB::table('games')->insert([ 'code' => 'arma2', 'start_code' => 'arma2', 'name' => 'Arma 2', 'engine' => 'RealVirtuality', 'engine_version' => '3', - 'steam_app_id' => 33905, + 'steam_app_id_nix' => 33905, + 'steam_app_id_win' => 33905, ]); - + DB::table('games')->insert([ 'code' => 'arma2oa', 'start_code' => 'arma2oa', 'name' => 'Arma 2: Operation Arrowhead', 'engine' => 'RealVirtuality', 'engine_version' => '3', - 'steam_app_id' => 33935, + 'steam_app_id_nix' => 33935, + 'steam_app_id_win' => 33935, ]); - + DB::table('games')->insert([ 'code' => 'arma3', 'start_code' => 'arma3', 'name' => 'Arma 3', 'engine' => 'RealVirtuality', 'engine_version' => '4', - 'steam_app_id' => 233780, + 'steam_app_id_nix' => 233780, + 'steam_app_id_win' => 233780, ]); - + + /* + * Call of duty + */ + + DB::table('games')->insert([ + 'code' => 'cod3', + 'start_code' => 'cod3', + 'name' => 'Call of Duty 3', + 'engine' => 'Treyarch NGL', + 'steam_app_id_nix' => 42750, + 'steam_app_id_win' => 42750, + ]); + DB::table('games')->insert([ 'code' => 'cod4', 'start_code' => 'cod4', 'name' => 'Call of Duty 4', 'engine' => 'IWEngine', - 'engine_version' => '3.0' - ]); - - DB::table('games')->insert([ - 'code' => 'mta', - 'start_code' => 'mta', - 'name' => 'GTA: Multi Theft Auto', - 'engine' => 'RenderWare', - 'remote_repository' => $gapRepoBaseUrl . '/mta/mta.tar.xz', + 'engine_version' => '3.0', ]); - + + /* + * GTA + */ + DB::table('games')->insert([ 'code' => 'samp', 'start_code' => 'samp', @@ -310,21 +386,45 @@ public function run() 'engine' => 'RenderWare', ]); + DB::table('games')->insert([ + 'code' => 'mta', + 'start_code' => 'mta', + 'name' => 'GTA: Multi Theft Auto', + 'engine' => 'RenderWare', + 'remote_repository_nix' => $gapRepoBaseUrl . '/mta/mta.tar.xz', + 'remote_repository_win' => $gapRepoBaseUrl . '/mta/mta.tar.xz', + ]); + DB::table('games')->insert([ 'code' => 'fivem', 'start_code' => 'fivem', 'name' => 'FiveM', 'engine' => 'Rage', - 'remote_repository' => $gapRepoBaseUrl . '/fivem/fivem.tar.xz', + 'remote_repository_nix' => $gapRepoBaseUrl . '/fivem/fivem.tar.xz', + 'remote_repository_win' => $gapRepoBaseUrl . '/fivem/fivem.tar.xz', + ]); + + DB::table('games')->insert([ + 'code' => 'ragemp', + 'start_code' => 'ragemp', + 'name' => 'RageMP', + 'engine' => 'Rage', + 'remote_repository_nix' => 'https://cdn.rage.mp/updater/prerelease/server-files/linux_x64.tar.gz', + 'remote_repository_win' => 'https://cdn.rage.mp/updater/prerelease/server-files/linux_x64.tar.gz', ]); + /* + * Just Cause + */ + DB::table('games')->insert([ 'code' => 'justcause2', 'start_code' => 'justcause2', 'name' => 'Just Cause 2', 'engine' => 'AvalancheEngine', 'engine_version' => '2.0', - 'steam_app_id' => 261140, + 'steam_app_id_nix' => 261140, + 'steam_app_id_win' => 261140, ]); DB::table('games')->insert([ @@ -333,25 +433,23 @@ public function run() 'name' => 'Just Cause 3', 'engine' => 'AvalancheEngine', 'engine_version' => '3.0', - 'steam_app_id' => 619960, + 'steam_app_id_nix' => 619960, + 'steam_app_id_win' => 619960, ]); - DB::table('games')->insert([ - 'code' => '7d2d', - 'start_code' => '7d2d', - 'name' => '7 Days to Die', - 'engine' => 'Unity', - 'steam_app_id' => 294420, - ]); + /* + * Killing Floor + */ - DB::table('games')->insert([ - 'code' => 'killingfloor', - 'start_code' => 'killingfloor', - 'name' => 'Killing Floor', - 'engine' => 'UnrealEngine', - 'engine_version' => '2.5', - 'steam_app_id' => 232130, - ]); +// DB::table('games')->insert([ +// 'code' => 'killingfloor', +// 'start_code' => 'killingfloor', +// 'name' => 'Killing Floor', +// 'engine' => 'UnrealEngine', +// 'engine_version' => '2.5', +// 'steam_app_id_nix' => 232130, +// 'steam_app_id_win' => 232130, +// ]); DB::table('games')->insert([ 'code' => 'killingfloor2', @@ -359,7 +457,49 @@ public function run() 'name' => 'Killing Floor 2', 'engine' => 'UnrealEngine', 'engine_version' => '3', - 'steam_app_id' => 232130, + 'steam_app_id_nix' => 232130, + 'steam_app_id_win' => 232130, + ]); + + /* + * Other games + */ + + DB::table('games')->insert([ + 'code' => 'ark', + 'start_code' => 'ark', + 'name' => 'ARK: Survival Evolved', + 'engine' => 'Unreal Engine', + 'engine_version' => '4', + 'steam_app_id_nix' => 376030, + 'steam_app_id_win' => 376030, + ]); + + DB::table('games')->insert([ + 'code' => 'rust', + 'start_code' => 'rust', + 'name' => 'Rust', + 'engine' => 'Unity', + 'steam_app_id_nix' => 258550, + 'steam_app_id_win' => 258550, + ]); + + DB::table('games')->insert([ + 'code' => 'hurtworld', + 'start_code' => 'hurtworld', + 'name' => 'HurtWorld', + 'engine' => 'Unity', + 'steam_app_id_nix' => 405100, + 'steam_app_id_win' => 405100, + ]); + + DB::table('games')->insert([ + 'code' => '7d2d', + 'start_code' => '7d2d', + 'name' => '7 Days to Die', + 'engine' => 'Unity', + 'steam_app_id_nix' => 294420, + 'steam_app_id_win' => 294420, ]); DB::table('games')->insert([ @@ -367,7 +507,8 @@ public function run() 'start_code' => 'the-forest', 'name' => 'The Forest', 'engine' => 'Unity', - 'steam_app_id' => 556450, + 'steam_app_id_nix' => 556450, + 'steam_app_id_win' => 556450, ]); DB::table('games')->insert([ @@ -375,21 +516,61 @@ public function run() 'start_code' => 'rok', 'name' => 'Reign Of Kings', 'engine' => 'Unity', - 'steam_app_id' => 344760, - ]); - - DB::table('games')->insert([ - 'code' => 'ts3', - 'start_code' => 'ts3', - 'name' => 'TeamSpeak', - 'engine' => 'TeamSpeak', + 'steam_app_id_nix' => 344760, + 'steam_app_id_win' => 344760, ]); DB::table('games')->insert([ - 'code' => 'mumble', - 'start_code' => 'mumble', - 'name' => 'Mumble', - 'engine' => 'Mumble', - ]); + 'code' => 'dst', + 'start_code' => 'dst', + 'name' => 'Don`t Starve Together', + 'engine' => 'Don`t Starve', + 'engine_version' => '1', + 'steam_app_id_nix' => 343050, + 'steam_app_id_win' => 343050, + ]); + + DB::table('games')->insert([ + 'code' => 'teeworlds', + 'start_code' => 'teeworlds', + 'name' => 'Teeworlds', + 'engine' => 'Teeworlds', + ]); + +// DB::table('games')->insert([ +// 'code' => 'terraria', +// 'start_code' => 'terraria', +// 'name' => 'Terraria', +// 'engine' => 'Terraria', +// 'steam_app_id_nix' => 105600, +// 'steam_app_id_win' => 105600, +// ]); + +// DB::table('games')->insert([ +// 'code' => 'unturned', +// 'start_code' => 'unturned', +// 'name' => 'Unturned', +// 'engine' => 'Unturned', +// 'steam_app_id_nix' => 1110390, +// 'steam_app_id_win' => 1110390, +// ]); + + /* + * Software + */ + +// DB::table('games')->insert([ +// 'code' => 'ts3', +// 'start_code' => 'ts3', +// 'name' => 'TeamSpeak', +// 'engine' => 'TeamSpeak', +// ]); + +// DB::table('games')->insert([ +// 'code' => 'mumble', +// 'start_code' => 'mumble', +// 'name' => 'Mumble', +// 'engine' => 'Mumble', +// ]); } } diff --git a/resources/lang/en/games.php b/resources/lang/en/games.php index 4ef4a04f..70a53139 100644 --- a/resources/lang/en/games.php +++ b/resources/lang/en/games.php @@ -31,8 +31,13 @@ 'vars' => 'Vars', 'fast_rcon_commands' => 'Fast RCON commands', - 'basic_info' => 'Basic Info', + 'basic_info' => 'Basic info', + 'game_info' => 'Game info', + 'game_mod_info' => 'Game mod info', + 'steam_info' => 'Steamcmd settings', 'repositories' => 'Repositories', + 'repositories_local' => 'Local repositories', + 'repositories_remote' => 'Remote repositories', // Descriptions 'd_kick_cmd' => 'Shortcodes: {id} -- player id, {name} -- player name', diff --git a/resources/lang/en/labels.php b/resources/lang/en/labels.php index f814948b..cf6f6699 100644 --- a/resources/lang/en/labels.php +++ b/resources/lang/en/labels.php @@ -45,15 +45,18 @@ 'start_code' => 'Start Code', 'engine' => 'Engine', 'engine_version' => 'Engine Version', - 'steam_app_id' => 'Steam App ID', + 'steam_app_id_nix' => 'Steam App ID (Linux)', + 'steam_app_id_win' => 'Steam App ID (Windows)', 'steam_app_set_config' => 'Steam App Set Config', // GameMod 'game_code' => 'Game Code', 'fast_rcon' => 'Fast RCON', 'vars' => 'Vars', - 'remote_repository' => 'Remote Repository', - 'local_repository' => 'Local Repository', + 'remote_repository_nix' => 'Remote Repository (Linux)', + 'remote_repository_win' => 'Remote Repository (Windows)', + 'local_repository_nix' => 'Local Repository (Linux)', + 'local_repository_win' => 'Local Repository (Windows)', 'kick_cmd' => 'Kick Command', 'ban_cmd' => 'Ban Command', 'chname_cmd' => 'Change Name Command', @@ -61,8 +64,8 @@ 'chmap_cmd' => 'Change Map Command', 'sendmsg_cmd' => 'Send Message Command', 'passwd_cmd' => 'Set/Change Password Command', - 'default_start_cmd_linux' => 'Default Start Command (Linux)', - 'default_start_cmd_windows' => 'Default Start Command (Windows)', + 'start_cmd_nix' => 'Start Command (Linux)', + 'start_cmd_win' => 'Start Command (Windows)', // Server 'game_server' => 'Game server', diff --git a/resources/lang/ru/games.php b/resources/lang/ru/games.php index 1fc65010..de86cc51 100644 --- a/resources/lang/ru/games.php +++ b/resources/lang/ru/games.php @@ -32,7 +32,12 @@ 'fast_rcon_commands' => 'Fast RCON команды', 'basic_info' => 'Основное', + 'game_info' => 'Параметры игры', + 'game_mod_info' => 'Параметры игрового мода', + 'steam_info' => 'Настройки steamcmd', 'repositories' => 'Репозитории', + 'repositories_local' => 'Локальные репозитории', + 'repositories_remote' => 'Удаленные репозитории', // Descriptions 'd_kick_cmd' => 'Шорткоды: {id} -- id игрока, {name} -- имя игрока', diff --git a/resources/lang/ru/labels.php b/resources/lang/ru/labels.php index 9da949b3..76241ceb 100644 --- a/resources/lang/ru/labels.php +++ b/resources/lang/ru/labels.php @@ -45,15 +45,18 @@ 'start_code' => 'Старт код', 'engine' => 'Движок', 'engine_version' => 'Версия движка', - 'steam_app_id' => 'Steam App ID', + 'steam_app_id_nix' => 'Steam App ID (Linux)', + 'steam_app_id_win' => 'Steam App ID (Windows)', 'steam_app_set_config' => 'Steam App Set Config', // GameMod 'game_code' => 'Код игры', 'fast_rcon' => 'Fast RCON', 'vars' => 'Переменные', - 'remote_repository' => 'Удалённый репозиторий', - 'local_repository' => 'Локальный репозиторий', + 'remote_repository_nix' => 'Удалённый репозиторий (Linux)', + 'remote_repository_win' => 'Удалённый репозиторий (Windows)', + 'local_repository_nix' => 'Локальный репозиторий (Linux)', + 'local_repository_win' => 'Локальный репозиторий (Windows)', 'kick_cmd' => 'Команда кика', 'ban_cmd' => 'Команда бана', 'chname_cmd' => 'Команда смены имени (ника)', @@ -61,8 +64,8 @@ 'chmap_cmd' => 'Команда смены карты', 'sendmsg_cmd' => 'Команда отправки сообщения', 'passwd_cmd' => 'Команда установки/смены пароля', - 'default_start_cmd_linux' => 'Команда запуска по умолчанию (Linux)', - 'default_start_cmd_windows' => 'Команда запуска по умолчанию (Windows)', + 'start_cmd_nix' => 'Команда запуска (Linux)', + 'start_cmd_win' => 'Команда запуска (Windows)', // Server 'game_server' => 'Игровой сервер', diff --git a/resources/views/admin/game_mods/create.blade.php b/resources/views/admin/game_mods/create.blade.php index 0c805794..8d0bcb66 100644 --- a/resources/views/admin/game_mods/create.blade.php +++ b/resources/views/admin/game_mods/create.blade.php @@ -27,8 +27,10 @@ {{ Form::bsText('name') }} - {{ Form::bsText('remote_repository') }} - {{ Form::bsText('local_repository') }} + {{ Form::bsText('remote_repository_nix') }} + {{ Form::bsText('remote_repository_win') }} + {{ Form::bsText('local_repository_nix') }} + {{ Form::bsText('local_repository_win') }} diff --git a/resources/views/admin/game_mods/edit.blade.php b/resources/views/admin/game_mods/edit.blade.php index 4381cfe6..929d4de5 100644 --- a/resources/views/admin/game_mods/edit.blade.php +++ b/resources/views/admin/game_mods/edit.blade.php @@ -48,10 +48,8 @@ {{ __('games.run_commands') }}
- {{ Form::bsText('default_start_cmd_linux') }} -
-
- {{ Form::bsText('default_start_cmd_windows') }} + {{ Form::bsText('start_cmd_nix') }} + {{ Form::bsText('start_cmd_win') }}
@@ -59,11 +57,21 @@
- {{ __('games.repositories') }} + {{ __('games.repositories_local') }} +
+
+ {{ Form::bsText('local_repository_nix') }} + {{ Form::bsText('local_repository_win') }} +
+
+ +
+
+ {{ __('games.repositories_remote') }}
- {{ Form::bsText('remote_repository') }} - {{ Form::bsText('local_repository') }} + {{ Form::bsText('remote_repository_nix') }} + {{ Form::bsText('remote_repository_win') }}
diff --git a/resources/views/admin/games/create.blade.php b/resources/views/admin/games/create.blade.php index aab94e49..0f78f79f 100644 --- a/resources/views/admin/games/create.blade.php +++ b/resources/views/admin/games/create.blade.php @@ -30,15 +30,23 @@
- {{ Form::bsText('steam_app_id') }} + {{ Form::bsText('steam_app_id_nix') }} + {{ Form::bsText('steam_app_id_win') }} {{ Form::bsText('steam_app_set_config') }}
+ +
+
+ {{ Form::bsText('local_repository_nix') }} + {{ Form::bsText('local_repository_win') }} +
+
- {{ Form::bsText('local_repository') }} - {{ Form::bsText('remote_repository') }} + {{ Form::bsText('local_repository_nix') }} + {{ Form::bsText('local_repository_win') }}
diff --git a/resources/views/admin/games/edit.blade.php b/resources/views/admin/games/edit.blade.php index 3b0ce3dd..7fbc6af4 100644 --- a/resources/views/admin/games/edit.blade.php +++ b/resources/views/admin/games/edit.blade.php @@ -24,6 +24,9 @@
+
+ {{ __('games.basic_info') }} +
{{ Form::bsText('code', null, null, ['disabled']) }} {{ Form::bsText('start_code') }} @@ -33,34 +36,50 @@ {{ Form::bsText('engine_version') }}
+ +
+
+ {{ __('games.mods') }} +
+
+ +
+
+
+ {{ __('games.steam_info') }} +
- {{ Form::bsText('steam_app_id') }} + {{ Form::bsText('steam_app_id_nix') }} + {{ Form::bsText('steam_app_id_win') }} {{ Form::bsText('steam_app_set_config') }}
+
+ {{ __('games.repositories_local') }} +
- {{ Form::bsText('local_repository') }} - {{ Form::bsText('remote_repository') }} + {{ Form::bsText('local_repository_nix') }} + {{ Form::bsText('local_repository_win') }}
- +
- {{ __('games.mods') }} + {{ __('games.repositories_remote') }}
- - + {{ Form::bsText('remote_repository_nix') }} + {{ Form::bsText('remote_repository_win') }}
diff --git a/tests/Feature/Permissions/Controllers/Admin/GameModsControllerTest.php b/tests/Feature/Permissions/Controllers/Admin/GameModsControllerTest.php index c28a6384..21c33043 100644 --- a/tests/Feature/Permissions/Controllers/Admin/GameModsControllerTest.php +++ b/tests/Feature/Permissions/Controllers/Admin/GameModsControllerTest.php @@ -56,8 +56,8 @@ public function testAllow() 'vars' => null, 'remote_repository' => null, 'local_repository' => null, - 'default_start_cmd_linux' => '', - 'default_start_cmd_windows' => '', + 'start_cmd_nix' => '', + 'start_cmd_win' => '', 'kick_cmd' => null, 'ban_cmd' => null, 'chname_cmd' => null, @@ -104,8 +104,8 @@ public function testForbidden() 'vars' => null, 'remote_repository' => null, 'local_repository' => null, - 'default_start_cmd_linux' => '', - 'default_start_cmd_windows' => '', + 'start_cmd_nix' => '', + 'start_cmd_win' => '', 'kick_cmd' => null, 'ban_cmd' => null, 'chname_cmd' => null, @@ -151,8 +151,8 @@ public function testForbiddenUser() 'vars' => null, 'remote_repository' => null, 'local_repository' => null, - 'default_start_cmd_linux' => '', - 'default_start_cmd_windows' => '', + 'start_cmd_nix' => '', + 'start_cmd_win' => '', 'kick_cmd' => null, 'ban_cmd' => null, 'chname_cmd' => null, From 7ee433c12969188b10ad8a34f53c45a6c0acf5e1 Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Wed, 27 Apr 2022 01:18:22 +0300 Subject: [PATCH 03/37] Fix server controller. Now return 'remote_repository', 'local_repository', 'steam_app_id', 'start_cmd' special for DS OS. --- .../GdaemonAPI/ServersController.php | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/GdaemonAPI/ServersController.php b/app/Http/Controllers/GdaemonAPI/ServersController.php index 08a4ef9f..03683ffc 100644 --- a/app/Http/Controllers/GdaemonAPI/ServersController.php +++ b/app/Http/Controllers/GdaemonAPI/ServersController.php @@ -6,6 +6,7 @@ use Gameap\Http\Requests\GdaemonAPI\ServerRequest; use Gameap\Models\DedicatedServer; use Gameap\Models\Server; +use Gameap\Repositories\NodeRepository; use Gameap\Repositories\ServerRepository; use Illuminate\Http\JsonResponse; use Illuminate\Http\Response; @@ -30,6 +31,7 @@ public function index(DedicatedServer $dedicatedServer): JsonResponse return response()->json( QueryBuilder::for(Server::where('ds_id', '=', $dedicatedServer->id)) ->allowedFilters('id') + ->with('dedicatedServer') ->with('game') ->with('gameMod') ->with('settings') @@ -39,11 +41,34 @@ public function index(DedicatedServer $dedicatedServer): JsonResponse public function server(Server $server): JsonResponse { - // Get Relations + $server->getRelationValue('dedicatedServer'); + $isLinux = $server->dedicatedServer->isLinux(); + $server->unsetRelation('dedicatedServer'); + $server->getRelationValue('game'); $server->getRelationValue('gameMod'); $server->getRelationValue('settings'); + $fieldSiffix = 'win'; + if($isLinux) { + $fieldSiffix = 'nix'; + } + $arFields = [ + 'game' => [ + 'remote_repository', 'local_repository', 'steam_app_id', + ], + 'gameMod' => [ + 'remote_repository', 'local_repository', 'start_cmd', + ], + ]; + foreach($arFields as $relationName => $arRelationFields){ + foreach($arRelationFields as $gameField){ + $server->{$relationName}->{$gameField} = $server->{$relationName}->{$gameField . '_' . $fieldSiffix}; + unset($server->{$relationName}->{$gameField . '_nix'}); + unset($server->{$relationName}->{$gameField . '_win'}); + } + } + return response()->json($server); } From 57c610c51d723854234ad5bee996a3e70270dc38 Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Wed, 27 Apr 2022 01:21:07 +0300 Subject: [PATCH 04/37] FastFix: Cleanup --- app/Http/Controllers/GdaemonAPI/ServersController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/GdaemonAPI/ServersController.php b/app/Http/Controllers/GdaemonAPI/ServersController.php index 03683ffc..d7fefcaa 100644 --- a/app/Http/Controllers/GdaemonAPI/ServersController.php +++ b/app/Http/Controllers/GdaemonAPI/ServersController.php @@ -6,7 +6,6 @@ use Gameap\Http\Requests\GdaemonAPI\ServerRequest; use Gameap\Models\DedicatedServer; use Gameap\Models\Server; -use Gameap\Repositories\NodeRepository; use Gameap\Repositories\ServerRepository; use Illuminate\Http\JsonResponse; use Illuminate\Http\Response; From f249a0a862fbdc5b57afce632daf2237eb00420f Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Wed, 27 Apr 2022 01:41:10 +0300 Subject: [PATCH 05/37] FastFix: Cleanup games and modes --- database/seeds/GameModsTableSeeder.php | 4 ++++ database/seeds/GamesTableSeeder.php | 26 +++----------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/database/seeds/GameModsTableSeeder.php b/database/seeds/GameModsTableSeeder.php index e722024d..97b19fe1 100644 --- a/database/seeds/GameModsTableSeeder.php +++ b/database/seeds/GameModsTableSeeder.php @@ -658,6 +658,8 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'pmmp', 'name' => 'Default', + 'remote_repository_nix' => 'https://github.com/pmmp/PocketMine-MP/releases/download/4.2.7/PocketMine-MP.phar', + 'remote_repository_win' => 'https://github.com/pmmp/PocketMine-MP/releases/download/4.2.7/PocketMine-MP.phar', 'start_cmd_nix' => './bin/php7/bin/php ./PocketMine-MP.phar', 'start_cmd_win' => '', 'passwd_cmd' => 'password {password}', @@ -719,6 +721,8 @@ public function run() 'admin_var' => true, ], ]), + 'remote_repository_nix' => $gapRepoBaseUrl . '/fivem/fivem.tar.xz', + 'remote_repository_win' => $gapRepoBaseUrl . '/fivem/fivem.tar.xz', 'start_cmd_nix' => './fivem_run.sh --ip={ip} --port={port} --hostname="{hostname}" --rcon-password="{rcon_password}" --license-key="{license_key}"', 'start_cmd_win' => 'run.cmd +exec server.cfg', 'sendmsg_cmd' => 'say {msg}', diff --git a/database/seeds/GamesTableSeeder.php b/database/seeds/GamesTableSeeder.php index 69730e8a..0eb8d9e2 100644 --- a/database/seeds/GamesTableSeeder.php +++ b/database/seeds/GamesTableSeeder.php @@ -295,7 +295,6 @@ public function run() // 'engine' => 'Source', // 'engine_version' => '1', // 'steam_app_id_nix' => 570, -// 'steam_app_id_win' => 570, // ]); /* @@ -307,8 +306,6 @@ public function run() 'start_code' => 'minecraft', 'name' => 'Minecraft', 'engine' => 'Minecraft', - 'remote_repository_nix' => $gapRepoBaseUrl . '/minecraft/minecraft_install.tar.gz', - 'remote_repository_win' => $gapRepoBaseUrl . '/minecraft/minecraft_install.tar.gz', ]); DB::table('games')->insert([ @@ -316,8 +313,6 @@ public function run() 'start_code' => 'pmmp', 'name' => 'PocketMineMP (Minecraft PE)', 'engine' => 'Minecraft', - 'remote_repository_nix' => 'https://github.com/pmmp/PocketMine-MP/releases/download/4.2.7/PocketMine-MP.phar', - 'remote_repository_win' => 'https://github.com/pmmp/PocketMine-MP/releases/download/4.2.7/PocketMine-MP.phar', ]); /* @@ -330,7 +325,6 @@ public function run() 'name' => 'Arma 2', 'engine' => 'RealVirtuality', 'engine_version' => '3', - 'steam_app_id_nix' => 33905, 'steam_app_id_win' => 33905, ]); @@ -340,7 +334,6 @@ public function run() 'name' => 'Arma 2: Operation Arrowhead', 'engine' => 'RealVirtuality', 'engine_version' => '3', - 'steam_app_id_nix' => 33935, 'steam_app_id_win' => 33935, ]); @@ -363,7 +356,6 @@ public function run() 'start_code' => 'cod3', 'name' => 'Call of Duty 3', 'engine' => 'Treyarch NGL', - 'steam_app_id_nix' => 42750, 'steam_app_id_win' => 42750, ]); @@ -391,8 +383,6 @@ public function run() 'start_code' => 'mta', 'name' => 'GTA: Multi Theft Auto', 'engine' => 'RenderWare', - 'remote_repository_nix' => $gapRepoBaseUrl . '/mta/mta.tar.xz', - 'remote_repository_win' => $gapRepoBaseUrl . '/mta/mta.tar.xz', ]); DB::table('games')->insert([ @@ -400,8 +390,6 @@ public function run() 'start_code' => 'fivem', 'name' => 'FiveM', 'engine' => 'Rage', - 'remote_repository_nix' => $gapRepoBaseUrl . '/fivem/fivem.tar.xz', - 'remote_repository_win' => $gapRepoBaseUrl . '/fivem/fivem.tar.xz', ]); DB::table('games')->insert([ @@ -410,7 +398,7 @@ public function run() 'name' => 'RageMP', 'engine' => 'Rage', 'remote_repository_nix' => 'https://cdn.rage.mp/updater/prerelease/server-files/linux_x64.tar.gz', - 'remote_repository_win' => 'https://cdn.rage.mp/updater/prerelease/server-files/linux_x64.tar.gz', + 'remote_repository_win' => '', ]); /* @@ -433,8 +421,6 @@ public function run() 'name' => 'Just Cause 3', 'engine' => 'AvalancheEngine', 'engine_version' => '3.0', - 'steam_app_id_nix' => 619960, - 'steam_app_id_win' => 619960, ]); /* @@ -447,8 +433,8 @@ public function run() // 'name' => 'Killing Floor', // 'engine' => 'UnrealEngine', // 'engine_version' => '2.5', -// 'steam_app_id_nix' => 232130, -// 'steam_app_id_win' => 232130, +// 'steam_app_id_nix' => 215360, +// 'steam_app_id_win' => 215350, // ]); DB::table('games')->insert([ @@ -480,7 +466,6 @@ public function run() 'start_code' => 'rust', 'name' => 'Rust', 'engine' => 'Unity', - 'steam_app_id_nix' => 258550, 'steam_app_id_win' => 258550, ]); @@ -507,7 +492,6 @@ public function run() 'start_code' => 'the-forest', 'name' => 'The Forest', 'engine' => 'Unity', - 'steam_app_id_nix' => 556450, 'steam_app_id_win' => 556450, ]); @@ -516,7 +500,6 @@ public function run() 'start_code' => 'rok', 'name' => 'Reign Of Kings', 'engine' => 'Unity', - 'steam_app_id_nix' => 344760, 'steam_app_id_win' => 344760, ]); @@ -527,7 +510,6 @@ public function run() 'engine' => 'Don`t Starve', 'engine_version' => '1', 'steam_app_id_nix' => 343050, - 'steam_app_id_win' => 343050, ]); DB::table('games')->insert([ @@ -543,7 +525,6 @@ public function run() // 'name' => 'Terraria', // 'engine' => 'Terraria', // 'steam_app_id_nix' => 105600, -// 'steam_app_id_win' => 105600, // ]); // DB::table('games')->insert([ @@ -552,7 +533,6 @@ public function run() // 'name' => 'Unturned', // 'engine' => 'Unturned', // 'steam_app_id_nix' => 1110390, -// 'steam_app_id_win' => 1110390, // ]); /* From e692b1c3ce6dadbfdd9d655667a9c39ce7195204 Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Wed, 27 Apr 2022 01:44:56 +0300 Subject: [PATCH 06/37] FastFix: Move all repos to related game modes --- database/seeds/GameModsTableSeeder.php | 2 ++ database/seeds/GamesTableSeeder.php | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/database/seeds/GameModsTableSeeder.php b/database/seeds/GameModsTableSeeder.php index 97b19fe1..bf7e4fcd 100644 --- a/database/seeds/GameModsTableSeeder.php +++ b/database/seeds/GameModsTableSeeder.php @@ -734,6 +734,8 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'ragemp', 'name' => 'Default', + 'remote_repository_nix' => 'https://cdn.rage.mp/updater/prerelease/server-files/linux_x64.tar.gz', + 'remote_repository_win' => '', 'start_cmd_nix' => './ragemp-server', 'start_cmd_win' => '', ]); diff --git a/database/seeds/GamesTableSeeder.php b/database/seeds/GamesTableSeeder.php index 0eb8d9e2..6a3d7de0 100644 --- a/database/seeds/GamesTableSeeder.php +++ b/database/seeds/GamesTableSeeder.php @@ -14,7 +14,6 @@ class GamesTableSeeder extends Seeder */ public function run() { - $gapRepoBaseUrl = 'http://files.gameap.ru'; /* * Half life @@ -397,8 +396,6 @@ public function run() 'start_code' => 'ragemp', 'name' => 'RageMP', 'engine' => 'Rage', - 'remote_repository_nix' => 'https://cdn.rage.mp/updater/prerelease/server-files/linux_x64.tar.gz', - 'remote_repository_win' => '', ]); /* From 44e62a13e4034c8fad381938ee2bcd3b07f920ed Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Wed, 27 Apr 2022 18:33:27 +0300 Subject: [PATCH 07/37] Fix list UIs --- resources/lang/en/home.php | 2 ++ resources/lang/en/modules.php | 1 + resources/lang/ru/home.php | 2 ++ resources/lang/ru/modules.php | 1 + .../client_certificates/create.blade.php | 2 +- .../admin/client_certificates/list.blade.php | 2 +- .../admin/client_certificates/view.blade.php | 2 +- .../admin/dedicated_servers/create.blade.php | 2 +- .../admin/dedicated_servers/edit.blade.php | 2 +- .../admin/dedicated_servers/list.blade.php | 17 ++++++------- .../admin/dedicated_servers/view.blade.php | 2 +- .../views/admin/game_mods/create.blade.php | 2 +- .../views/admin/game_mods/edit.blade.php | 2 +- resources/views/admin/games/create.blade.php | 2 +- resources/views/admin/games/edit.blade.php | 2 +- resources/views/admin/games/list.blade.php | 24 +++++++++---------- resources/views/admin/games/view.blade.php | 2 +- .../views/admin/gdaemon_tasks/list.blade.php | 2 +- .../views/admin/gdaemon_tasks/view.blade.php | 2 +- .../views/admin/servers/create.blade.php | 2 +- resources/views/admin/servers/edit.blade.php | 2 +- resources/views/admin/servers/list.blade.php | 9 ++++--- .../admin/servers_settings/settings.blade.php | 2 +- resources/views/admin/users/create.blade.php | 2 +- resources/views/admin/users/edit.blade.php | 2 +- resources/views/admin/users/list.blade.php | 9 ++++--- .../admin/users/server_perms/edit.blade.php | 2 +- resources/views/admin/users/view.blade.php | 2 +- resources/views/help.blade.php | 2 +- resources/views/layouts/main.blade.php | 2 +- resources/views/modules/installed.blade.php | 12 ++++++++-- resources/views/modules/marketplace.blade.php | 13 ++++++++-- resources/views/report_bug.blade.php | 9 +++++-- resources/views/servers/not_active.blade.php | 2 +- resources/views/servers/view.blade.php | 2 +- resources/views/update.blade.php | 2 +- 36 files changed, 92 insertions(+), 57 deletions(-) diff --git a/resources/lang/en/home.php b/resources/lang/en/home.php index 357c18ff..46f4e2da 100644 --- a/resources/lang/en/home.php +++ b/resources/lang/en/home.php @@ -32,6 +32,8 @@ 'd_report_bug' => 'Please check the PHP version and the availability of the necessary PHP extensions. PHP versions should be no lower than the minimum recommended. Some functions of the panel will not work correctly without the necessary extensions', + 'send_report' => 'Send report', + 'system_check' => 'System check', 'send_bug_success_msg' => 'Error message sent successfully', diff --git a/resources/lang/en/modules.php b/resources/lang/en/modules.php index f0434144..329cbd79 100644 --- a/resources/lang/en/modules.php +++ b/resources/lang/en/modules.php @@ -1,6 +1,7 @@ 'Modules', 'title' => 'GameAP Modules', 'migrate' => 'Run migrate', diff --git a/resources/lang/ru/home.php b/resources/lang/ru/home.php index f9cf5e6b..62d73f68 100644 --- a/resources/lang/ru/home.php +++ b/resources/lang/ru/home.php @@ -32,6 +32,8 @@ 'd_report_bug' => 'Пожалуйста, проверьте версию PHP и наличи необходимых расширений PHP. Версий PHP должна быть не ниже минимальной рекомендуемой. Без необходимых расширений некоторые функции панели будут работать некорректно.', + 'send_report' => 'Отправить отчет', + 'system_check' => 'Проверка системы', 'send_bug_success_msg' => 'Информация об ошибке успешно отправлена', diff --git a/resources/lang/ru/modules.php b/resources/lang/ru/modules.php index f12bcf14..d7f0c46c 100644 --- a/resources/lang/ru/modules.php +++ b/resources/lang/ru/modules.php @@ -1,6 +1,7 @@ 'Модули', 'title' => 'GameAP Модули', 'migrate' => 'Запустить миграцию', diff --git a/resources/views/admin/client_certificates/create.blade.php b/resources/views/admin/client_certificates/create.blade.php index 2f1a16fa..906440f0 100644 --- a/resources/views/admin/client_certificates/create.blade.php +++ b/resources/views/admin/client_certificates/create.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
  1. GameAP
  2. diff --git a/resources/views/admin/client_certificates/list.blade.php b/resources/views/admin/client_certificates/list.blade.php index 0cdb21b3..ac67d16b 100644 --- a/resources/views/admin/client_certificates/list.blade.php +++ b/resources/views/admin/client_certificates/list.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
    1. GameAP
    2. diff --git a/resources/views/admin/client_certificates/view.blade.php b/resources/views/admin/client_certificates/view.blade.php index 9ad23430..4a18d48e 100644 --- a/resources/views/admin/client_certificates/view.blade.php +++ b/resources/views/admin/client_certificates/view.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
      1. GameAP
      2. diff --git a/resources/views/admin/dedicated_servers/create.blade.php b/resources/views/admin/dedicated_servers/create.blade.php index 8234f44a..823d5c46 100644 --- a/resources/views/admin/dedicated_servers/create.blade.php +++ b/resources/views/admin/dedicated_servers/create.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
        1. GameAP
        2. diff --git a/resources/views/admin/dedicated_servers/edit.blade.php b/resources/views/admin/dedicated_servers/edit.blade.php index 7d28dabe..e8f1f0b8 100644 --- a/resources/views/admin/dedicated_servers/edit.blade.php +++ b/resources/views/admin/dedicated_servers/edit.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
          1. GameAP
          2. diff --git a/resources/views/admin/dedicated_servers/list.blade.php b/resources/views/admin/dedicated_servers/list.blade.php index e78e7b2b..1636ea87 100644 --- a/resources/views/admin/dedicated_servers/list.blade.php +++ b/resources/views/admin/dedicated_servers/list.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
            1. GameAP
            2. {{ __('dedicated_servers.dedicated_servers') }}
              3. @@ -10,13 +10,14 @@ @endsection @section('content') - - {{ __('dedicated_servers.create') }} - - - {{ __('client_certificates.client_certificates') }} - -
              +
              + + {{ __('dedicated_servers.create') }} + + + {{ __('client_certificates.client_certificates') }} + +
              @include('components.grid', [ 'modelsList' => $dedicatedServers, diff --git a/resources/views/admin/dedicated_servers/view.blade.php b/resources/views/admin/dedicated_servers/view.blade.php index ee3ad6ca..08547745 100644 --- a/resources/views/admin/dedicated_servers/view.blade.php +++ b/resources/views/admin/dedicated_servers/view.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
              1. GameAP
              2. Dedicated servers
                3. diff --git a/resources/views/admin/game_mods/create.blade.php b/resources/views/admin/game_mods/create.blade.php index 8d0bcb66..b1b8af9f 100644 --- a/resources/views/admin/game_mods/create.blade.php +++ b/resources/views/admin/game_mods/create.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                1. GameAP
                2. {{ __('games.games') }}
                  3. diff --git a/resources/views/admin/game_mods/edit.blade.php b/resources/views/admin/game_mods/edit.blade.php index 929d4de5..fbf31775 100644 --- a/resources/views/admin/game_mods/edit.blade.php +++ b/resources/views/admin/game_mods/edit.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                  1. GameAP
                  2. {{ __('games.games') }}
                    3. diff --git a/resources/views/admin/games/create.blade.php b/resources/views/admin/games/create.blade.php index 0f78f79f..4649d40a 100644 --- a/resources/views/admin/games/create.blade.php +++ b/resources/views/admin/games/create.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                    1. GameAP
                    2. {{ __('games.games') }}
                      3. diff --git a/resources/views/admin/games/edit.blade.php b/resources/views/admin/games/edit.blade.php index 7fbc6af4..0b997be7 100644 --- a/resources/views/admin/games/edit.blade.php +++ b/resources/views/admin/games/edit.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                      1. GameAP
                      2. {{ __('games.games') }}
                        3. diff --git a/resources/views/admin/games/list.blade.php b/resources/views/admin/games/list.blade.php index f8da7cd3..c66b9891 100644 --- a/resources/views/admin/games/list.blade.php +++ b/resources/views/admin/games/list.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                        1. GameAP
                        2. {{ __('games.games') }}
                          3. @@ -10,17 +10,7 @@ @endsection @section('content') -
                          - {{ Form::open(['method' => 'PATCH', 'url' => route('admin.games.upgrade'), 'style'=>'display:inline']) }} - {{ Form::button( ' ' . __('games.upgrade'), - [ - 'class' => 'btn btn-dark', - 'v-on:click' => 'confirmAction($event, \'' . __('games.d_upgrade_confirm') . '\')', - 'type' => 'submit' - ] - ) }} - {{ Form::close() }} - +
                           {{ __('games.add') }} @@ -28,6 +18,16 @@  {{ __('games.add_mod') }} + + {{ Form::open(['method' => 'PATCH', 'url' => route('admin.games.upgrade'), 'style'=>'display:inline']) }} + {{ Form::button( ' ' . __('games.upgrade'), + [ + 'class' => 'btn btn-dark', + 'v-on:click' => 'confirmAction($event, \'' . __('games.d_upgrade_confirm') . '\')', + 'type' => 'submit' + ] + ) }} + {{ Form::close() }}
                          @include('components.grid', [ diff --git a/resources/views/admin/games/view.blade.php b/resources/views/admin/games/view.blade.php index 2ebc5b84..3a8ea6fc 100644 --- a/resources/views/admin/games/view.blade.php +++ b/resources/views/admin/games/view.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                          1. GameAP
                          2. {{ __('games.games') }}
                            3. diff --git a/resources/views/admin/gdaemon_tasks/list.blade.php b/resources/views/admin/gdaemon_tasks/list.blade.php index 5a966d54..8473ead3 100644 --- a/resources/views/admin/gdaemon_tasks/list.blade.php +++ b/resources/views/admin/gdaemon_tasks/list.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                            1. GameAP
                            2. {{ __('gdaemon_tasks.gdaemon_tasks') }}
                              3. diff --git a/resources/views/admin/gdaemon_tasks/view.blade.php b/resources/views/admin/gdaemon_tasks/view.blade.php index 3c817d23..94ed4404 100644 --- a/resources/views/admin/gdaemon_tasks/view.blade.php +++ b/resources/views/admin/gdaemon_tasks/view.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                              1. GameAP
                              2. {{ __('gdaemon_tasks.gdaemon_tasks') }}
                                3. diff --git a/resources/views/admin/servers/create.blade.php b/resources/views/admin/servers/create.blade.php index c53a9d86..03dc52d4 100644 --- a/resources/views/admin/servers/create.blade.php +++ b/resources/views/admin/servers/create.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                1. GameAP
                                2. {{ __('servers.game_servers') }}
                                  3. diff --git a/resources/views/admin/servers/edit.blade.php b/resources/views/admin/servers/edit.blade.php index ce2c38a2..8fd3bc60 100644 --- a/resources/views/admin/servers/edit.blade.php +++ b/resources/views/admin/servers/edit.blade.php @@ -9,7 +9,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                  1. GameAP
                                  2. {{ __('servers.game_servers') }}
                                    3. diff --git a/resources/views/admin/servers/list.blade.php b/resources/views/admin/servers/list.blade.php index 304caeaf..509647c6 100644 --- a/resources/views/admin/servers/list.blade.php +++ b/resources/views/admin/servers/list.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                    1. GameAP
                                    2. {{ __('servers.game_servers') }}
                                      3. @@ -10,8 +10,11 @@ @endsection @section('content') -  {{ __('servers.create') }} -
                                      +
                                      + +  {{ __('servers.create') }} + +
                                      @include('components.grid', [ 'modelsList' => $servers, diff --git a/resources/views/admin/servers_settings/settings.blade.php b/resources/views/admin/servers_settings/settings.blade.php index 9009f093..e6f25883 100644 --- a/resources/views/admin/servers_settings/settings.blade.php +++ b/resources/views/admin/servers_settings/settings.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                      1. GameAP
                                      2. {{ __('servers.game_servers') }}
                                        3. diff --git a/resources/views/admin/users/create.blade.php b/resources/views/admin/users/create.blade.php index cc3cae0c..224f969c 100644 --- a/resources/views/admin/users/create.blade.php +++ b/resources/views/admin/users/create.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                        1. GameAP
                                        2. {{ __('users.users') }}
                                          3. diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php index 95628106..81341c99 100644 --- a/resources/views/admin/users/edit.blade.php +++ b/resources/views/admin/users/edit.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                          1. GameAP
                                          2. {{ __('users.users') }}
                                            3. diff --git a/resources/views/admin/users/list.blade.php b/resources/views/admin/users/list.blade.php index 50bd1b48..5e3b35e9 100644 --- a/resources/views/admin/users/list.blade.php +++ b/resources/views/admin/users/list.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                            1. GameAP
                                            2. {{ __('users.users') }}
                                              3. @@ -10,8 +10,11 @@ @endsection @section('content') - {{ __('main.create') }} -
                                              +
                                              + +  {{ __('main.create') }} + +
                                              @include('components.grid', [ 'modelsList' => $users, diff --git a/resources/views/admin/users/server_perms/edit.blade.php b/resources/views/admin/users/server_perms/edit.blade.php index 152fc57f..f6e9de01 100644 --- a/resources/views/admin/users/server_perms/edit.blade.php +++ b/resources/views/admin/users/server_perms/edit.blade.php @@ -12,7 +12,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                              1. GameAP
                                              2. {{ __('users.users') }}
                                                3. diff --git a/resources/views/admin/users/view.blade.php b/resources/views/admin/users/view.blade.php index 1779b02b..e96e2f5d 100644 --- a/resources/views/admin/users/view.blade.php +++ b/resources/views/admin/users/view.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                                1. GameAP
                                                2. {{ __('users.users') }}
                                                  3. diff --git a/resources/views/help.blade.php b/resources/views/help.blade.php index 905a19c6..2524bb39 100644 --- a/resources/views/help.blade.php +++ b/resources/views/help.blade.php @@ -1,6 +1,6 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                                  1. GameAP
                                                  2. {{ __('home.get_help') }}
                                                    3. diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index b2e6da4f..997f4454 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -39,7 +39,7 @@
                                                    - @yield('breadclumbs') + @yield('breadcrumbs') @include('components.messages') diff --git a/resources/views/modules/installed.blade.php b/resources/views/modules/installed.blade.php index 42f1d665..adeafb94 100644 --- a/resources/views/modules/installed.blade.php +++ b/resources/views/modules/installed.blade.php @@ -8,11 +8,19 @@ @extends('layouts.main') +@section('breadcrumbs') +
                                                      +
                                                    1. GameAP
                                                      2. +
                                                    2. {{ __('modules.modules') }}
                                                      3. +
                                                    +@endsection + @section('content') @include('components.form.errors_block') - @include('modules.migrate_button') -
                                                    +
                                                    + @include('modules.migrate_button') +
                                                    • diff --git a/resources/views/modules/marketplace.blade.php b/resources/views/modules/marketplace.blade.php index 351ab694..1a6cb030 100644 --- a/resources/views/modules/marketplace.blade.php +++ b/resources/views/modules/marketplace.blade.php @@ -9,11 +9,20 @@ @extends('layouts.main') +@section('breadcrumbs') +
                                                        +
                                                      1. GameAP
                                                        2. +
                                                      2. {{ __('modules.modules') }}
                                                        3. +
                                                      3. {{ __('modules.marketplace') }}
                                                        4. +
                                                      +@endsection + @section('content') @include('components.form.errors_block') - @include('modules.migrate_button') -
                                                      +
                                                      + @include('modules.migrate_button') +
                                                      • diff --git a/resources/views/report_bug.blade.php b/resources/views/report_bug.blade.php index b6237811..7a1491da 100644 --- a/resources/views/report_bug.blade.php +++ b/resources/views/report_bug.blade.php @@ -1,6 +1,6 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                                        1. GameAP
                                                        2. {{ __('home.report_bug') }}
                                                          3. @@ -9,7 +9,9 @@ @section('content')
                                                          - +
                                                          + {{ __('home.system_check') }} +
                                                          @@ -85,6 +87,9 @@
                                                          +
                                                          + {{ __('home.send_report') }} +
                                                          {{ Form::open(['url' => route('send_bug'), 'style'=>'display:inline']) }}
                                                          diff --git a/resources/views/servers/not_active.blade.php b/resources/views/servers/not_active.blade.php index dd7282ca..79cd8e2f 100644 --- a/resources/views/servers/not_active.blade.php +++ b/resources/views/servers/not_active.blade.php @@ -10,7 +10,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                                          1. GameAP
                                                          2. {{ __('servers.game_servers') }}
                                                            3. diff --git a/resources/views/servers/view.blade.php b/resources/views/servers/view.blade.php index deba6a2f..8fb0ddc7 100644 --- a/resources/views/servers/view.blade.php +++ b/resources/views/servers/view.blade.php @@ -2,7 +2,7 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                                            1. GameAP
                                                            2. {{ __('servers.game_servers') }}
                                                              3. diff --git a/resources/views/update.blade.php b/resources/views/update.blade.php index 8785f350..8a8a3392 100644 --- a/resources/views/update.blade.php +++ b/resources/views/update.blade.php @@ -1,6 +1,6 @@ @extends('layouts.main') -@section('breadclumbs') +@section('breadcrumbs')
                                                              1. GameAP
                                                              2. {{ __('home.update') }}
                                                                3. From 56b3e75cad9c0b06fe02abaae0bffc55ba709a0b Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Wed, 27 Apr 2022 23:48:54 +0300 Subject: [PATCH 08/37] Fix "report bug" page layout on mobile and tablets --- resources/views/report_bug.blade.php | 118 +++++++++++++-------------- 1 file changed, 58 insertions(+), 60 deletions(-) diff --git a/resources/views/report_bug.blade.php b/resources/views/report_bug.blade.php index 7a1491da..43738db2 100644 --- a/resources/views/report_bug.blade.php +++ b/resources/views/report_bug.blade.php @@ -21,67 +21,65 @@
                                                          -
                                                          -
                                                          PHP:
                                                          -
                                                          -

                                                          @php echo phpversion(); @endphp

                                                          -
                                                          -
                                                          - -
                                                          -
                                                          GD:
                                                          -
                                                          - @if (in_array('gd', $extensions)) -

                                                          - @else -

                                                          - @endif -
                                                          -
                                                          - -
                                                          -
                                                          OpenSSL:
                                                          -
                                                          - @if (in_array('openssl', $extensions)) -

                                                          - @else -

                                                          - @endif -
                                                          -
                                                          + + + + + -
                                                          -
                                                          Curl:
                                                          -
                                                          - @if (in_array('curl', $extensions)) -

                                                          - @else -

                                                          - @endif -
                                                          -
                                                          - -
                                                          -
                                                          GMP:
                                                          -
                                                          - @if (in_array('gmp', $extensions)) -

                                                          - @else -

                                                          - @endif -
                                                          -
                                                          - -
                                                          -
                                                          Intl:
                                                          -
                                                          - @if (in_array('intl', $extensions)) -

                                                          - @else -

                                                          - @endif -
                                                          -
                                                          + + + + + + + + + + + + + + + + + + + + + + +
                                                          PHP:@php echo phpversion(); @endphp
                                                          GD: + @if (in_array('gd', $extensions)) + + @else + + @endif +
                                                          OpenSSL: + @if (in_array('openssl', $extensions)) + + @else + + @endif +
                                                          Curl: + @if (in_array('curl', $extensions)) + + @else + + @endif +
                                                          GMP: + @if (in_array('gmp', $extensions)) + + @else + + @endif +
                                                          Intl: + @if (in_array('intl', $extensions)) + + @else + + @endif +
                                                          From 5d86e832329e84480ec8e0f97f18db6c7d23b4a1 Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Thu, 28 Apr 2022 00:08:01 +0300 Subject: [PATCH 09/37] Fix main layout (remove big right padding in main content zone), prepare to refactor --- public/css/gameap.css | 4 +--- resources/views/layouts/main.blade.php | 24 +++++++++--------------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/public/css/gameap.css b/public/css/gameap.css index ae131bdf..d66541e9 100644 --- a/public/css/gameap.css +++ b/public/css/gameap.css @@ -7,7 +7,6 @@ .logo { max-width: 300px; max-height: 35px; - margin-left: 30px; } .logo-mini { @@ -219,10 +218,9 @@ input.terminal-input { .left-menu { height: calc(100vh - 62px); - width: 245px; + width: 230px; position: fixed; z-index: 5; - margin-left: -15px; } .small-menu .left-menu { diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index 997f4454..46eca8c8 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -26,34 +26,28 @@ @yield('page-data')
                                                          -
                                                          - @include("components.navbar") + @include("components.navbar") +
                                                          -
                                                          -
                                                        -
                                                      • +
                                                      •  {{ Auth::user()->name }}
                                                        • From 9b461ab96c02d2efc81d0e1e9e30b811d0708fb3 Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Thu, 28 Apr 2022 00:21:37 +0300 Subject: [PATCH 13/37] FastFix: change group name margin in left menu (mini) --- public/css/gameap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/gameap.css b/public/css/gameap.css index 7fd5e850..3f3c7426 100644 --- a/public/css/gameap.css +++ b/public/css/gameap.css @@ -234,7 +234,7 @@ input.terminal-input { .small-menu .left-menu-group-mini { display: inline; - padding-left: 18px; + padding-left: 21px; text-align: center; margin-bottom: 0.3rem; font-weight: bold; From e650c280476c20e4d39c1869f320f5af0c946ca6 Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Thu, 28 Apr 2022 00:28:04 +0300 Subject: [PATCH 14/37] CleanUp: Report bug --- public/css/gameap.css | 7 +++++++ resources/views/report_bug.blade.php | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/public/css/gameap.css b/public/css/gameap.css index 3f3c7426..8055a44a 100644 --- a/public/css/gameap.css +++ b/public/css/gameap.css @@ -4,6 +4,13 @@ flex-wrap: wrap; } +.table.table-fit{ + width: fit-content; +} +.table.table-noborder td{ + border: none; +} + .logo { max-width: 300px; max-height: 35px; diff --git a/resources/views/report_bug.blade.php b/resources/views/report_bug.blade.php index 43738db2..9931090a 100644 --- a/resources/views/report_bug.blade.php +++ b/resources/views/report_bug.blade.php @@ -21,15 +21,15 @@
                                                    - +
                                                    - + - + - + - + - + - +
                                                    PHP:PHP @php echo phpversion(); @endphp
                                                    GD:GD @if (in_array('gd', $extensions)) @@ -39,7 +39,7 @@
                                                    OpenSSL:OpenSSL @if (in_array('openssl', $extensions)) @@ -49,7 +49,7 @@
                                                    Curl:Curl @if (in_array('curl', $extensions)) @@ -59,7 +59,7 @@
                                                    GMP:GMP @if (in_array('gmp', $extensions)) @@ -69,7 +69,7 @@
                                                    Intl:Intl @if (in_array('intl', $extensions)) From b376f04ab825e778df8ab0c37c4b64dffb159a91 Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Mon, 13 Jun 2022 19:31:57 +0300 Subject: [PATCH 15/37] revert old migrations --- .../2017_09_12_300000_create_games_table.php | 9 +++------ .../2017_09_12_400000_create_game_mods_table.php | 10 ++++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/database/migrations/2017_09_12_300000_create_games_table.php b/database/migrations/2017_09_12_300000_create_games_table.php index 71008bd1..99f2d929 100644 --- a/database/migrations/2017_09_12_300000_create_games_table.php +++ b/database/migrations/2017_09_12_300000_create_games_table.php @@ -19,13 +19,10 @@ public function up() $table->string('name'); $table->string('engine'); $table->string('engine_version')->default('1.0'); - $table->integer('steam_app_id_nix')->unsigned()->nullable(); - $table->integer('steam_app_id_win')->unsigned()->nullable(); + $table->integer('steam_app_id')->unsigned()->nullable(); $table->string('steam_app_set_config')->nullable(); - $table->string('remote_repository_nix')->nullable(); - $table->string('remote_repository_win')->nullable(); - $table->string('local_repository_nix')->nullable(); - $table->string('local_repository_win')->nullable(); + $table->string('remote_repository')->nullable(); + $table->string('local_repository')->nullable(); }); } diff --git a/database/migrations/2017_09_12_400000_create_game_mods_table.php b/database/migrations/2017_09_12_400000_create_game_mods_table.php index 5c438ab4..80a770c2 100644 --- a/database/migrations/2017_09_12_400000_create_game_mods_table.php +++ b/database/migrations/2017_09_12_400000_create_game_mods_table.php @@ -19,12 +19,10 @@ public function up() $table->string('name'); $table->text('fast_rcon')->nullable(); $table->text('vars')->nullable(); - $table->text('remote_repository_nix')->nullable(); - $table->text('remote_repository_win')->nullable(); - $table->text('local_repository_nix')->nullable(); - $table->text('local_repository_win')->nullable(); - $table->text('start_cmd_nix')->nullable(); - $table->text('start_cmd_win')->nullable(); + $table->text('remote_repository')->nullable(); + $table->text('local_repository')->nullable(); + $table->text('default_start_cmd_linux')->nullable(); + $table->text('default_start_cmd_windows')->nullable(); $table->string('kick_cmd', 64)->nullable(); $table->string('ban_cmd', 64)->nullable(); $table->string('chname_cmd', 64)->nullable(); From 3de4d6a39719e71cd59fbd3bc71bca4e36b99fcd Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Mon, 13 Jun 2022 19:32:25 +0300 Subject: [PATCH 16/37] add changing migrations --- .../2022_06_13_191501_change_games_table.php | 42 +++++++++++++++++++ ...22_06_13_191643_change_game_mods_table.php | 42 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 database/migrations/2022_06_13_191501_change_games_table.php create mode 100644 database/migrations/2022_06_13_191643_change_game_mods_table.php diff --git a/database/migrations/2022_06_13_191501_change_games_table.php b/database/migrations/2022_06_13_191501_change_games_table.php new file mode 100644 index 00000000..8f348dae --- /dev/null +++ b/database/migrations/2022_06_13_191501_change_games_table.php @@ -0,0 +1,42 @@ +renameColumn('steam_app_id', 'steam_app_id_linux'); + $table->renameColumn('remote_repository', 'remote_repository_linux'); + $table->renameColumn('local_repository', 'local_repository_linux'); + $table->integer('steam_app_id_windows')->unsigned()->nullable(); + $table->string('remote_repository_windows')->nullable(); + $table->string('local_repository_windows')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('game_mods', function (Blueprint $table) { + $table->renameColumn('steam_app_id_linux', 'steam_app_id'); + $table->renameColumn('remote_repository_linux', 'remote_repository'); + $table->renameColumn('local_repository_linux', 'local_repository'); + $table->dropColumn('steam_app_id_windows'); + $table->dropColumn('remote_repository_windows'); + $table->dropColumn('local_repository_windows'); + }); + } +} diff --git a/database/migrations/2022_06_13_191643_change_game_mods_table.php b/database/migrations/2022_06_13_191643_change_game_mods_table.php new file mode 100644 index 00000000..8f04e8fa --- /dev/null +++ b/database/migrations/2022_06_13_191643_change_game_mods_table.php @@ -0,0 +1,42 @@ +renameColumn('remote_repository', 'remote_repository_linux'); + $table->renameColumn('local_repository', 'local_repository_linux'); + $table->renameColumn('default_start_cmd_linux', 'start_cmd_linux'); + $table->renameColumn('default_start_cmd_windows', 'start_cmd_windows'); + $table->text('remote_repository_windows')->nullable(); + $table->text('local_repository_windows')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('game_mods', function (Blueprint $table) { + $table->renameColumn('remote_repository_linux', 'remote_repository'); + $table->renameColumn('local_repository_linux', 'local_repository'); + $table->renameColumn('start_cmd_linux', 'default_start_cmd_linux'); + $table->renameColumn('start_cmd_windows', 'default_start_cmd_windows'); + $table->dropColumn('remote_repository_windows'); + $table->dropColumn('local_repository_windows'); + }); + } +} From b82d3f24f8c91caea052da9ce09d25b306e7d247 Mon Sep 17 00:00:00 2001 From: Sergey Abu Date: Mon, 13 Jun 2022 19:54:23 +0300 Subject: [PATCH 17/37] replace FROM all short 'nix' & 'win' TO full 'linux' & windows --- .../GdaemonAPI/ServersController.php | 8 +- app/Http/Requests/Admin/GameModRequest.php | 4 +- app/Http/Requests/Admin/GameRequest.php | 12 +- app/Models/Game.php | 15 +- app/Models/GameMod.php | 20 +- app/UseCases/CreateGameServer.php | 4 +- database/factories/GameModFactory.php | 10 +- .../2022_06_13_191501_change_games_table.php | 14 +- ...22_06_13_191643_change_game_mods_table.php | 8 +- database/seeds/GameModsTableSeeder.php | 276 +++++++++--------- database/seeds/GamesTableSeeder.php | 140 ++++----- resources/lang/en/labels.php | 16 +- resources/lang/ru/labels.php | 16 +- .../views/admin/game_mods/create.blade.php | 8 +- .../views/admin/game_mods/edit.blade.php | 12 +- resources/views/admin/games/create.blade.php | 12 +- resources/views/admin/games/edit.blade.php | 12 +- .../Admin/GameModsControllerTest.php | 30 +- 18 files changed, 317 insertions(+), 300 deletions(-) diff --git a/app/Http/Controllers/GdaemonAPI/ServersController.php b/app/Http/Controllers/GdaemonAPI/ServersController.php index d7fefcaa..64fa8b18 100644 --- a/app/Http/Controllers/GdaemonAPI/ServersController.php +++ b/app/Http/Controllers/GdaemonAPI/ServersController.php @@ -48,9 +48,9 @@ public function server(Server $server): JsonResponse $server->getRelationValue('gameMod'); $server->getRelationValue('settings'); - $fieldSiffix = 'win'; + $fieldSiffix = 'windows'; if($isLinux) { - $fieldSiffix = 'nix'; + $fieldSiffix = 'linux'; } $arFields = [ 'game' => [ @@ -63,8 +63,8 @@ public function server(Server $server): JsonResponse foreach($arFields as $relationName => $arRelationFields){ foreach($arRelationFields as $gameField){ $server->{$relationName}->{$gameField} = $server->{$relationName}->{$gameField . '_' . $fieldSiffix}; - unset($server->{$relationName}->{$gameField . '_nix'}); - unset($server->{$relationName}->{$gameField . '_win'}); + unset($server->{$relationName}->{$gameField . '_linux'}); + unset($server->{$relationName}->{$gameField . '_windows'}); } } diff --git a/app/Http/Requests/Admin/GameModRequest.php b/app/Http/Requests/Admin/GameModRequest.php index 0ce177d6..d862b3c8 100644 --- a/app/Http/Requests/Admin/GameModRequest.php +++ b/app/Http/Requests/Admin/GameModRequest.php @@ -17,8 +17,8 @@ public function rules() 'name' => 'required|string|max:255', 'game_code' => 'sometimes|string|max:255|exists:games,code', - 'start_cmd_nix' => 'nullable|string|max:1000', - 'start_cmd_win' => 'nullable|string|max:1000', + 'start_cmd_linux' => 'nullable|string|max:1000', + 'start_cmd_windows' => 'nullable|string|max:1000', 'vars.*.var' => 'max:16', 'vars.*.default' => 'max:64', diff --git a/app/Http/Requests/Admin/GameRequest.php b/app/Http/Requests/Admin/GameRequest.php index 95ee6976..3c8da55d 100644 --- a/app/Http/Requests/Admin/GameRequest.php +++ b/app/Http/Requests/Admin/GameRequest.php @@ -14,13 +14,13 @@ public function rules() 'name' => 'required|min:2', 'engine' => 'required|min:2', 'engine_version' => 'required', - 'steam_app_id_nix' => 'nullable|integer', - 'steam_app_id_win' => 'nullable|integer', + 'steam_app_id_linux' => 'nullable|integer', + 'steam_app_id_windows' => 'nullable|integer', 'steam_app_set_config' => '', - 'local_repository_nix' => '', - 'local_repository_win' => '', - 'remote_repository_nix' => '', - 'remote_repository_win' => '', + 'local_repository_linux' => '', + 'local_repository_windows' => '', + 'remote_repository_linux' => '', + 'remote_repository_windows' => '', ]; } } diff --git a/app/Models/Game.php b/app/Models/Game.php index 1af87fe4..b955bdc8 100644 --- a/app/Models/Game.php +++ b/app/Models/Game.php @@ -13,10 +13,13 @@ * @property string $name * @property string $engine * @property string $engine_version - * @property integer $steam_app_id + * @property integer $steam_app_id_linux + * @property integer $steam_app_id_windows * @property string $steam_app_set_config - * @property string $remote_repository - * @property string $local_repository + * @property string $remote_repository_linux + * @property string $remote_repository_windows + * @property string $local_repository_linux + * @property string $local_repository_windows */ class Game extends Model { @@ -54,10 +57,10 @@ class Game extends Model protected $fillable = [ 'code', 'start_code', 'name', 'engine', 'engine_version', - 'steam_app_id_nix', 'steam_app_id_win', + 'steam_app_id_linux', 'steam_app_id_windows', 'steam_app_set_config', - 'remote_repository_nix', 'remote_repository_win', - 'local_repository_nix', 'local_repository_win' + 'remote_repository_linux', 'remote_repository_windows', + 'local_repository_linux', 'local_repository_windows' ]; /** diff --git a/app/Models/GameMod.php b/app/Models/GameMod.php index 5f08bdd0..54bd3c43 100644 --- a/app/Models/GameMod.php +++ b/app/Models/GameMod.php @@ -13,10 +13,12 @@ * @property string $name * @property array $fast_rcon * @property array $vars - * @property string $remote_repository - * @property string $local_repository - * @property string $start_cmd_nix - * @property string $start_cmd_win + * @property string $remote_repository_linux + * @property string $remote_repository_windows + * @property string $local_repository_linux + * @property string $local_repository_windows + * @property string $start_cmd_linux + * @property string $start_cmd_windows * @property string $kick_cmd * @property string $ban_cmd * @property string $chname_cmd @@ -40,9 +42,9 @@ class GameMod extends Model protected $fillable = [ 'name', 'game_code', 'fast_rcon', 'vars', - 'remote_repository_nix', 'remote_repository_win', - 'local_repository_nix', 'local_repository_win', - 'start_cmd_nix', 'start_cmd_win', + 'remote_repository_linux', 'remote_repository_windows', + 'local_repository_linux', 'local_repository_windows', + 'start_cmd_linux', 'start_cmd_windows', 'kick_cmd', 'ban_cmd', 'chname_cmd', 'srestart_cmd', 'chmap_cmd', 'sendmsg_cmd', 'passwd_cmd', ]; @@ -55,8 +57,8 @@ class GameMod extends Model 'name' => 'required|string|max:255', 'game_code' => 'sometimes|string|max:255|exists:games,code', - 'start_cmd_nix' => 'nullable|string|max:1000', - 'start_cmd_win' => 'nullable|string|max:1000', + 'start_cmd_linux' => 'nullable|string|max:1000', + 'start_cmd_windows' => 'nullable|string|max:1000', 'vars.*.var' => 'max:16', 'vars.*.default' => 'max:64', diff --git a/app/UseCases/CreateGameServer.php b/app/UseCases/CreateGameServer.php index fedf274b..a39c9a87 100644 --- a/app/UseCases/CreateGameServer.php +++ b/app/UseCases/CreateGameServer.php @@ -67,8 +67,8 @@ public function __invoke(CreateGameServerCommand $command) $server->start_command = $node->isLinux() - ? $gameMod->start_cmd_nix - : $gameMod->start_cmd_win; + ? $gameMod->start_cmd_linux + : $gameMod->start_cmd_windows; } else { $server->start_command = $command->startCommand; } diff --git a/database/factories/GameModFactory.php b/database/factories/GameModFactory.php index 0871254a..6ea1ec16 100644 --- a/database/factories/GameModFactory.php +++ b/database/factories/GameModFactory.php @@ -15,10 +15,12 @@ 'name' => $faker->name, 'fast_rcon' => '', 'vars' => '', - 'remote_repository' => '', - 'local_repository' => '', - 'start_cmd_nix' => '', - 'start_cmd_win' => '', + 'remote_repository_linux' => '', + 'remote_repository_windows' => '', + 'local_repository_linux' => '', + 'local_repository_windows' => '', + 'start_cmd_linux' => '', + 'start_cmd_windows' => '', 'kick_cmd' => '', 'ban_cmd' => '', 'chname_cmd' => '', diff --git a/database/migrations/2022_06_13_191501_change_games_table.php b/database/migrations/2022_06_13_191501_change_games_table.php index 8f348dae..d0a81ba3 100644 --- a/database/migrations/2022_06_13_191501_change_games_table.php +++ b/database/migrations/2022_06_13_191501_change_games_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -class CreateGameModsTable extends Migration +class ChangeGamesTable extends Migration { /** * Run the migrations. @@ -13,13 +13,15 @@ class CreateGameModsTable extends Migration */ public function up() { - Schema::table('game_mods', function (Blueprint $table) { + Schema::table('games', function (Blueprint $table) { $table->renameColumn('steam_app_id', 'steam_app_id_linux'); $table->renameColumn('remote_repository', 'remote_repository_linux'); $table->renameColumn('local_repository', 'local_repository_linux'); - $table->integer('steam_app_id_windows')->unsigned()->nullable(); - $table->string('remote_repository_windows')->nullable(); - $table->string('local_repository_windows')->nullable(); + }); + Schema::table('games', function (Blueprint $table) { + $table->integer('steam_app_id_windows')->after('steam_app_id_linux')->unsigned()->nullable(); + $table->string('remote_repository_windows')->after('remote_repository_linux')->nullable(); + $table->string('local_repository_windows')->after('local_repository_linux')->nullable(); }); } @@ -30,7 +32,7 @@ public function up() */ public function down() { - Schema::table('game_mods', function (Blueprint $table) { + Schema::table('games', function (Blueprint $table) { $table->renameColumn('steam_app_id_linux', 'steam_app_id'); $table->renameColumn('remote_repository_linux', 'remote_repository'); $table->renameColumn('local_repository_linux', 'local_repository'); diff --git a/database/migrations/2022_06_13_191643_change_game_mods_table.php b/database/migrations/2022_06_13_191643_change_game_mods_table.php index 8f04e8fa..3af26242 100644 --- a/database/migrations/2022_06_13_191643_change_game_mods_table.php +++ b/database/migrations/2022_06_13_191643_change_game_mods_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -class CreateGameModsTable extends Migration +class ChangeGameModsTable extends Migration { /** * Run the migrations. @@ -18,8 +18,10 @@ public function up() $table->renameColumn('local_repository', 'local_repository_linux'); $table->renameColumn('default_start_cmd_linux', 'start_cmd_linux'); $table->renameColumn('default_start_cmd_windows', 'start_cmd_windows'); - $table->text('remote_repository_windows')->nullable(); - $table->text('local_repository_windows')->nullable(); + }); + Schema::table('game_mods', function (Blueprint $table) { + $table->text('remote_repository_windows')->after('remote_repository_linux')->nullable(); + $table->text('local_repository_windows')->after('local_repository_linux')->nullable(); }); } diff --git a/database/seeds/GameModsTableSeeder.php b/database/seeds/GameModsTableSeeder.php index bf7e4fcd..6fe4bc8d 100644 --- a/database/seeds/GameModsTableSeeder.php +++ b/database/seeds/GameModsTableSeeder.php @@ -51,8 +51,8 @@ public function run() 'name' => 'Default', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars()), - 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), - 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'valve'), + 'start_cmd_linux' => self::getDefaultGoldSourceStartCmd('linux', 'valve'), + 'start_cmd_windows' => self::getDefaultGoldSourceStartCmd('windows', 'valve'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -65,10 +65,10 @@ public function run() 'name' => 'Classic (AMX Mod)', 'fast_rcon' => json_encode($defaultGoldSourceAmxFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars()), - 'remote_repository_nix' => $gapRepoBaseUrl . '/half-life/amxx.tar.xz', - 'remote_repository_win' => $gapRepoBaseUrl . '/half-life/amxx.tar.xz', - 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), - 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'valve'), + 'remote_repository_linux' => $gapRepoBaseUrl . '/half-life/amxx.tar.xz', + 'remote_repository_windows' => $gapRepoBaseUrl . '/half-life/amxx.tar.xz', + 'start_cmd_linux' => self::getDefaultGoldSourceStartCmd('linux', 'valve'), + 'start_cmd_windows' => self::getDefaultGoldSourceStartCmd('windows', 'valve'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'amx_say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -83,10 +83,10 @@ public function run() 'name' => 'Classic (ReHLDS)', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars()), - 'remote_repository_nix' => $gapRepoBaseUrl . '/half-life/rehlds-amxx-reunion.tar.xz', - 'remote_repository_win' => $gapRepoBaseUrl . '/half-life/rehlds-amxx-reunion.tar.xz', - 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), - 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'valve'), + 'remote_repository_linux' => $gapRepoBaseUrl . '/half-life/rehlds-amxx-reunion.tar.xz', + 'remote_repository_windows' => $gapRepoBaseUrl . '/half-life/rehlds-amxx-reunion.tar.xz', + 'start_cmd_linux' => self::getDefaultGoldSourceStartCmd('linux', 'valve'), + 'start_cmd_windows' => self::getDefaultGoldSourceStartCmd('windows', 'valve'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -101,8 +101,8 @@ public function run() 'name' => 'Default', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars()), - 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'valve'), - 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'valve'), + 'start_cmd_linux' => self::getDefaultGoldSourceStartCmd('linux', 'valve'), + 'start_cmd_windows' => self::getDefaultGoldSourceStartCmd('windows', 'valve'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -116,8 +116,8 @@ public function run() 'game_code' => 'hl2mp', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars()), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', ''), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', ''), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', ''), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', ''), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -131,8 +131,8 @@ public function run() 'game_code' => 'bms', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars()), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'bms'), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'bms'), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'bms'), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'bms'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -151,8 +151,8 @@ public function run() 'name' => 'Default', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars('de_dust2')), - 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'cstrike'), - 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'cstrike'), + 'start_cmd_linux' => self::getDefaultGoldSourceStartCmd('linux', 'cstrike'), + 'start_cmd_windows' => self::getDefaultGoldSourceStartCmd('windows', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -165,10 +165,10 @@ public function run() 'name' => 'Classic (AMX Mod)', 'fast_rcon' => json_encode($defaultGoldSourceAmxFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars('de_dust2')), - 'remote_repository_nix' => $gapRepoBaseUrl . '/cstrike-1.6/amxx.tar.xz', - 'remote_repository_win' => $gapRepoBaseUrl . '/cstrike-1.6/amxx.tar.xz', - 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'cstrike'), - 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'cstrike'), + 'remote_repository_linux' => $gapRepoBaseUrl . '/cstrike-1.6/amxx.tar.xz', + 'remote_repository_windows' => $gapRepoBaseUrl . '/cstrike-1.6/amxx.tar.xz', + 'start_cmd_linux' => self::getDefaultGoldSourceStartCmd('linux', 'cstrike'), + 'start_cmd_windows' => self::getDefaultGoldSourceStartCmd('windows', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'amx_say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -183,10 +183,10 @@ public function run() 'name' => 'Classic (ReHLDS)', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars('de_dust2')), - 'remote_repository_nix' => $gapRepoBaseUrl . '/cstrike-1.6/rehlds-amxx-reunion.tar.xz', - 'remote_repository_win' => $gapRepoBaseUrl . '/cstrike-1.6/rehlds-amxx-reunion.tar.xz', - 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'cstrike'), - 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'cstrike'), + 'remote_repository_linux' => $gapRepoBaseUrl . '/cstrike-1.6/rehlds-amxx-reunion.tar.xz', + 'remote_repository_windows' => $gapRepoBaseUrl . '/cstrike-1.6/rehlds-amxx-reunion.tar.xz', + 'start_cmd_linux' => self::getDefaultGoldSourceStartCmd('linux', 'cstrike'), + 'start_cmd_windows' => self::getDefaultGoldSourceStartCmd('windows', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -201,8 +201,8 @@ public function run() 'name' => 'Default', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars('de_dust')), - 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'czero'), - 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'czero'), + 'start_cmd_linux' => self::getDefaultGoldSourceStartCmd('linux', 'czero'), + 'start_cmd_windows' => self::getDefaultGoldSourceStartCmd('windows', 'czero'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -216,8 +216,8 @@ public function run() 'game_code' => 'cssv34', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('de_dust2')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'cstrike'), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'cstrike'), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'cstrike'), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -231,8 +231,8 @@ public function run() 'game_code' => 'cssource', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('de_dust2')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'cstrike'), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'cstrike'), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'cstrike'), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'cstrike'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -257,8 +257,8 @@ public function run() 'info' => 'Steam account token', ], ])), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 0', - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 0', + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 0', + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 0', 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -281,8 +281,8 @@ public function run() 'info' => 'Steam account token', ], ])), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 1', - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 1', + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 1', + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 0 +game_mode 1', 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -305,8 +305,8 @@ public function run() 'info' => 'Steam account token', ], ])), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 0', - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 0', + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 0', + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 0', 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -329,8 +329,8 @@ public function run() 'info' => 'Steam account token', ], ])), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 1', - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 1', + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 1', + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 1', 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -353,8 +353,8 @@ public function run() 'info' => 'Steam account token', ], ])), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 2', - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 2', + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 2', + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'csgo') . ' +sv_setsteamaccount {steamaccount} +mapgroup {mapgroup} +game_type 1 +game_mode 2', 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -372,8 +372,8 @@ public function run() 'game_code' => 'tfc', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('2fort')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'tfc'), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'tfc'), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'tfc'), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'tfc'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -387,8 +387,8 @@ public function run() 'game_code' => 'tf2', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('ctf_2fort')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'tf'), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'tf'), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'tf'), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'tf'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -406,8 +406,8 @@ public function run() 'game_code' => 'dod', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('dod_anzio')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'dod'), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'dod'), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'dod'), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'dod'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -421,8 +421,8 @@ public function run() 'game_code' => 'dods', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('dod_anzio')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'dods'), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'dods'), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'dods'), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'dods'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -441,8 +441,8 @@ public function run() 'name' => 'Default', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultGoldSourceVars('l4d_farm04_barn')), - 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', 'left4dead'), - 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', 'left4dead'), + 'start_cmd_linux' => self::getDefaultGoldSourceStartCmd('linux', 'left4dead'), + 'start_cmd_windows' => self::getDefaultGoldSourceStartCmd('windows', 'left4dead'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -457,8 +457,8 @@ public function run() 'name' => 'Default', 'fast_rcon' => json_encode($defaultGoldSourceFastRcon), 'vars' => json_encode(self::getDefaultSourceVars('c2m1_highway')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'left4dead2'), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'left4dead2'), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'left4dead2'), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'left4dead2'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -476,8 +476,8 @@ public function run() 'game_code' => 'dmc', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', ''), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', ''), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', ''), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', ''), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -491,8 +491,8 @@ public function run() 'game_code' => 'ricochet', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', ''), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', ''), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', ''), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', ''), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -506,8 +506,8 @@ public function run() 'game_code' => 'svencoop', 'name' => 'Default', 'vars' => json_encode(self::getDefaultGoldSourceVars('stadium4')), - 'start_cmd_nix' => self::getDefaultGoldSourceStartCmd('nix', '', './svends_run'), - 'start_cmd_win' => self::getDefaultGoldSourceStartCmd('win', '', 'svends.exe'), + 'start_cmd_linux' => self::getDefaultGoldSourceStartCmd('linux', '', './svends_run'), + 'start_cmd_windows' => self::getDefaultGoldSourceStartCmd('windows', '', 'svends.exe'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -525,8 +525,8 @@ public function run() 'game_code' => 'insurgency', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('ministry')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix'), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win'), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux'), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -540,8 +540,8 @@ public function run() 'game_code' => 'garrysmod', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('gm_construct')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'garrysmod'), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'garrysmod'), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'garrysmod'), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'garrysmod'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -555,8 +555,8 @@ public function run() 'game_code' => 'nmrih', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', ''), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', ''), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', ''), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', ''), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -570,8 +570,8 @@ public function run() 'game_code' => 'pvk2', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', ''), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', ''), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', ''), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', ''), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -585,8 +585,8 @@ public function run() 'game_code' => 'synergy', 'name' => 'Default', 'vars' => json_encode(self::getDefaultSourceVars('d1_trainstation_01')), - 'start_cmd_nix' => self::getDefaultSourceStartCmd('nix', 'synergy'), - 'start_cmd_win' => self::getDefaultSourceStartCmd('win', 'synergy'), + 'start_cmd_linux' => self::getDefaultSourceStartCmd('linux', 'synergy'), + 'start_cmd_windows' => self::getDefaultSourceStartCmd('windows', 'synergy'), 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say "{msg}"', 'chmap_cmd' => 'changelevel {map}', @@ -622,10 +622,10 @@ public function run() 'admin_var' => true, ], ]), - 'remote_repository_nix' => 'https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar', - 'remote_repository_win' => 'https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar', - 'start_cmd_nix' => 'java -Xms{java_xms} -Xmx{java_xms} -jar server.jar --port {port} --world {world} --nogui', - 'start_cmd_win' => 'java -Xms{java_xms} -Xmx{java_xms} -jar server.jar --port {port} --world {world} --nogui', + 'remote_repository_linux' => 'https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar', + 'remote_repository_windows' => 'https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar', + 'start_cmd_linux' => 'java -Xms{java_xms} -Xmx{java_xms} -jar server.jar --port {port} --world {world} --nogui', + 'start_cmd_windows' => 'java -Xms{java_xms} -Xmx{java_xms} -jar server.jar --port {port} --world {world} --nogui', ]); DB::table('game_mods')->insert([ @@ -648,9 +648,9 @@ public function run() 'info' => 'Core mod version', ], ]), - 'remote_repository_nix' => $gapRepoBaseUrl . '/minecraft/minecraft-runner.tar.gz', - 'remote_repository_win' => $gapRepoBaseUrl . '/minecraft/minecraft-runner.tar.gz', - 'start_cmd_nix' => './mcrun.sh run --version={version} --core-mod={core_mod} --core-mod-version={core_mod_version} --ip={ip} --port={port} --query-port={query_port} --rcon-port={rcon_port} --rcon-password={rcon_password}', + 'remote_repository_linux' => $gapRepoBaseUrl . '/minecraft/minecraft-runner.tar.gz', + 'remote_repository_windows' => $gapRepoBaseUrl . '/minecraft/minecraft-runner.tar.gz', + 'start_cmd_linux' => './mcrun.sh run --version={version} --core-mod={core_mod} --core-mod-version={core_mod_version} --ip={ip} --port={port} --query-port={query_port} --rcon-port={rcon_port} --rcon-password={rcon_password}', ]); /* PMMP (MinecraftPE) */ @@ -658,10 +658,10 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'pmmp', 'name' => 'Default', - 'remote_repository_nix' => 'https://github.com/pmmp/PocketMine-MP/releases/download/4.2.7/PocketMine-MP.phar', - 'remote_repository_win' => 'https://github.com/pmmp/PocketMine-MP/releases/download/4.2.7/PocketMine-MP.phar', - 'start_cmd_nix' => './bin/php7/bin/php ./PocketMine-MP.phar', - 'start_cmd_win' => '', + 'remote_repository_linux' => 'https://github.com/pmmp/PocketMine-MP/releases/download/4.2.7/PocketMine-MP.phar', + 'remote_repository_windows' => 'https://github.com/pmmp/PocketMine-MP/releases/download/4.2.7/PocketMine-MP.phar', + 'start_cmd_linux' => './bin/php7/bin/php ./PocketMine-MP.phar', + 'start_cmd_windows' => '', 'passwd_cmd' => 'password {password}', 'sendmsg_cmd' => 'say {msg}', 'srestart_cmd' => 'reload', @@ -679,10 +679,10 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'samp', 'name' => 'Default (Freeroam)', - 'remote_repository_nix' => 'http://files.sa-mp.com/samp037svr_R2-1.tar.gz', - 'remote_repository_win' => 'http://files.sa-mp.com/samp037_svr_R2-1-1_win32.zip', - 'start_cmd_nix' => './samp03svr', - 'start_cmd_win' => 'samp-server.exe', + 'remote_repository_linux' => 'http://files.sa-mp.com/samp037svr_R2-1.tar.gz', + 'remote_repository_windows' => 'http://files.sa-mp.com/samp037_svr_R2-1-1_win32.zip', + 'start_cmd_linux' => './samp03svr', + 'start_cmd_windows' => 'samp-server.exe', ]); /* Multi Theft Auto (MTA) */ @@ -697,10 +697,10 @@ public function run() 'info' => 'Maximum players on server', ] ]), - 'remote_repository_nix' => $gapRepoBaseUrl . '/mta/default-deathmatch.tar.xz', - 'remote_repository_win' => $gapRepoBaseUrl . '/mta/default-deathmatch.tar.xz', - 'start_cmd_nix' => './mta-server64 -t -n --ip {ip} --port {port} --maxplayers {maxplayers}', - 'start_cmd_win' => '', + 'remote_repository_linux' => $gapRepoBaseUrl . '/mta/default-deathmatch.tar.xz', + 'remote_repository_windows' => $gapRepoBaseUrl . '/mta/default-deathmatch.tar.xz', + 'start_cmd_linux' => './mta-server64 -t -n --ip {ip} --port {port} --maxplayers {maxplayers}', + 'start_cmd_windows' => '', ]); /* FiveM */ @@ -721,10 +721,10 @@ public function run() 'admin_var' => true, ], ]), - 'remote_repository_nix' => $gapRepoBaseUrl . '/fivem/fivem.tar.xz', - 'remote_repository_win' => $gapRepoBaseUrl . '/fivem/fivem.tar.xz', - 'start_cmd_nix' => './fivem_run.sh --ip={ip} --port={port} --hostname="{hostname}" --rcon-password="{rcon_password}" --license-key="{license_key}"', - 'start_cmd_win' => 'run.cmd +exec server.cfg', + 'remote_repository_linux' => $gapRepoBaseUrl . '/fivem/fivem.tar.xz', + 'remote_repository_windows' => $gapRepoBaseUrl . '/fivem/fivem.tar.xz', + 'start_cmd_linux' => './fivem_run.sh --ip={ip} --port={port} --hostname="{hostname}" --rcon-password="{rcon_password}" --license-key="{license_key}"', + 'start_cmd_windows' => 'run.cmd +exec server.cfg', 'sendmsg_cmd' => 'say {msg}', 'kick_cmd' => 'clientkick {id}', ]); @@ -734,10 +734,10 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'ragemp', 'name' => 'Default', - 'remote_repository_nix' => 'https://cdn.rage.mp/updater/prerelease/server-files/linux_x64.tar.gz', - 'remote_repository_win' => '', - 'start_cmd_nix' => './ragemp-server', - 'start_cmd_win' => '', + 'remote_repository_linux' => 'https://cdn.rage.mp/updater/prerelease/server-files/linux_x64.tar.gz', + 'remote_repository_windows' => '', + 'start_cmd_linux' => './ragemp-server', + 'start_cmd_windows' => '', ]); ### @@ -749,8 +749,8 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'justcause2', 'name' => 'Default', - 'start_cmd_nix' => './Jcmp-Server', - 'start_cmd_win' => '', + 'start_cmd_linux' => './Jcmp-Server', + 'start_cmd_windows' => '', ]); /* Just cause 3 */ @@ -758,8 +758,8 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'justcause3', 'name' => 'Default', - 'start_cmd_nix' => './Server', - 'start_cmd_win' => '', + 'start_cmd_linux' => './Server', + 'start_cmd_windows' => '', ]); ### @@ -782,8 +782,8 @@ public function run() 'info' => 'Config file name', ], ]), - 'start_cmd_nix' => './arma2server -name={server_name} -config={config_file}', - 'start_cmd_win' => '', + 'start_cmd_linux' => './arma2server -name={server_name} -config={config_file}', + 'start_cmd_windows' => '', ]); /* Arma 2 OA */ @@ -802,8 +802,8 @@ public function run() 'info' => 'Config file name', ], ]), - 'start_cmd_nix' => './arma2server -name={server_name} -config={config_file}', - 'start_cmd_win' => '', + 'start_cmd_linux' => './arma2server -name={server_name} -config={config_file}', + 'start_cmd_windows' => '', ]); /* Arma 3 */ @@ -822,8 +822,8 @@ public function run() 'info' => 'Config file name', ], ]), - 'start_cmd_nix' => './arma3server -name={server_name} -config={config_file}', - 'start_cmd_win' => '', + 'start_cmd_linux' => './arma3server -name={server_name} -config={config_file}', + 'start_cmd_windows' => '', ]); ### @@ -852,8 +852,8 @@ public function run() // 'info' => 'Is VAC enabled?', // ], // ]), -// 'start_cmd_nix' => './ucc-bin server {default_map}.rom?game=KFmod.KFGameType?VACSecured={is_vac}?MaxPlayers={maxplayers} -nohomedir', -// 'start_cmd_win' => 'ucc server {default_map}.rom?game=KFmod.KFGameType?VACSecured={is_vac}?MaxPlayers={maxplayers}', +// 'start_cmd_linux' => './ucc-bin server {default_map}.rom?game=KFmod.KFGameType?VACSecured={is_vac}?MaxPlayers={maxplayers} -nohomedir', +// 'start_cmd_windows' => 'ucc server {default_map}.rom?game=KFmod.KFGameType?VACSecured={is_vac}?MaxPlayers={maxplayers}', // ]); /* Killing floor 2 */ @@ -866,8 +866,8 @@ public function run() 'default' => 'kf-bioticslab', 'info' => 'Default Map', ]), - 'start_cmd_nix' => './Binaries/Win64/KFGameSteamServer.bin.x86_64 {default_map}', - 'start_cmd_win' => 'Binaries\win64\kfserver {default_map}', + 'start_cmd_linux' => './Binaries/Win64/KFGameSteamServer.bin.x86_64 {default_map}', + 'start_cmd_windows' => 'Binaries\win64\kfserver {default_map}', ]); ### @@ -891,8 +891,8 @@ public function run() 'info' => 'Session name', ], ]), - 'start_cmd_nix' => './ShooterGameServer TheIsland?listen?SessionName={session_name}?Port={port}?QueryPort={query_port}?MaxPlayers={maxplayers}?ServerPassword={server_password}?ServerAdminPassword={rcon_password} -server -log', - 'start_cmd_win' => 'ShooterGameServer.exe TheIsland?listen?SessionName={session_name}?Port={port}?QueryPort={query_port}?MaxPlayers={maxplayers}?ServerPassword={server_password}?ServerAdminPassword={rcon_password} exit', + 'start_cmd_linux' => './ShooterGameServer TheIsland?listen?SessionName={session_name}?Port={port}?QueryPort={query_port}?MaxPlayers={maxplayers}?ServerPassword={server_password}?ServerAdminPassword={rcon_password} -server -log', + 'start_cmd_windows' => 'ShooterGameServer.exe TheIsland?listen?SessionName={session_name}?Port={port}?QueryPort={query_port}?MaxPlayers={maxplayers}?ServerPassword={server_password}?ServerAdminPassword={rcon_password} exit', ]); /* HurtWorld */ @@ -917,8 +917,8 @@ public function run() 'info' => 'Log file name', ], ]), - 'start_cmd_nix' => '', - 'start_cmd_win' => 'Hurtworld.exe -batchmode -nographics -exec "host {port};queryport {query_port};servername {server_name};addadmin admin_uid" -logfile "{log_file}"', + 'start_cmd_linux' => '', + 'start_cmd_windows' => 'Hurtworld.exe -batchmode -nographics -exec "host {port};queryport {query_port};servername {server_name};addadmin admin_uid" -logfile "{log_file}"', ]); /* Rust */ @@ -938,8 +938,8 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'rok', 'name' => 'Default', - 'start_cmd_nix' => '', - 'start_cmd_win' => '', + 'start_cmd_linux' => '', + 'start_cmd_windows' => '', ]); /* 7 Day to Die */ @@ -947,8 +947,8 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => '7d2d', 'name' => 'Default', - 'start_cmd_nix' => './startserver.sh -configfile=serverconfig.xml', - 'start_cmd_win' => 'startdedicated.bat', + 'start_cmd_linux' => './startserver.sh -configfile=serverconfig.xml', + 'start_cmd_windows' => 'startdedicated.bat', ]); /* Don`t Starve Together */ @@ -956,8 +956,8 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'dst', 'name' => 'Default', - 'start_cmd_nix' => './dontstarve_dedicated_server_nullrenderer', - 'start_cmd_win' => '', + 'start_cmd_linux' => './dontstarve_dedicated_server_nullrenderer', + 'start_cmd_windows' => '', ]); /* The Forest */ @@ -1020,7 +1020,7 @@ public function run() 'admin_var' => true, ], ]), - 'start_cmd_win' => 'TheForestDedicatedServer.exe -serverip {ip} -servergameport {port} -serverqueryport {query_port} -serversteamport {steamport} -serverplayers {maxplayers} -servername "{servername}" -serverpassword {password} -serverpassword_admin {password_admin} -enableVAC {enableVAC} -serverautosaveinterval {serverautosaveinterval} -difficulty {difficulty} -slot {slot} ', + 'start_cmd_windows' => 'TheForestDedicatedServer.exe -serverip {ip} -servergameport {port} -serverqueryport {query_port} -serversteamport {steamport} -serverplayers {maxplayers} -servername "{servername}" -serverpassword {password} -serverpassword_admin {password_admin} -enableVAC {enableVAC} -serverautosaveinterval {serverautosaveinterval} -difficulty {difficulty} -slot {slot} ', ]); /* Teeworlds */ @@ -1030,19 +1030,19 @@ public function run() DB::table('game_mods')->insert([ 'game_code' => 'teeworlds', 'name' => 'Default', - 'start_cmd_nix' => './teeworlds-0.7.5-linux_x86_64/teeworlds_srv -f server.cfg', - 'start_cmd_win' => 'teeworlds-0.7.5-win64\teeworlds_srv.exe -f server.cfg', - 'remote_repository_nix' => 'https://github.com/teeworlds/teeworlds/releases/download/0.7.5/teeworlds-0.7.5-linux_x86_64.tar.gz', - 'remote_repository_win' => 'https://github.com/teeworlds/teeworlds/releases/download/0.7.5/teeworlds-0.7.5-win64.zip', + 'start_cmd_linux' => './teeworlds-0.7.5-linux_x86_64/teeworlds_srv -f server.cfg', + 'start_cmd_windows' => 'teeworlds-0.7.5-win64\teeworlds_srv.exe -f server.cfg', + 'remote_repository_linux' => 'https://github.com/teeworlds/teeworlds/releases/download/0.7.5/teeworlds-0.7.5-linux_x86_64.tar.gz', + 'remote_repository_windows' => 'https://github.com/teeworlds/teeworlds/releases/download/0.7.5/teeworlds-0.7.5-win64.zip', ]); DB::table('game_mods')->insert([ 'game_code' => 'teeworlds', 'name' => 'DDrace', - 'start_cmd_nix' => './DDNet-16.0.3-linux_x86_64/DDNet-Server -f server.cfg', - 'start_cmd_win' => 'DDNet-16.0.3-win64\DDNet-Server.exe -f server.cfg', - 'remote_repository_nix' => 'https://ddnet.tw/downloads/DDNet-16.0.3-linux_x86_64.tar.xz', - 'remote_repository_win' => 'https://ddnet.tw/downloads/DDNet-16.0.3-win64.zip', + 'start_cmd_linux' => './DDNet-16.0.3-linux_x86_64/DDNet-Server -f server.cfg', + 'start_cmd_windows' => 'DDNet-16.0.3-win64\DDNet-Server.exe -f server.cfg', + 'remote_repository_linux' => 'https://ddnet.tw/downloads/DDNet-16.0.3-linux_x86_64.tar.xz', + 'remote_repository_windows' => 'https://ddnet.tw/downloads/DDNet-16.0.3-win64.zip', ]); ### @@ -1062,10 +1062,10 @@ public function run() // 'admin_var' => true, // ], // ]), -// 'start_cmd_nix' => './teamspeak3-server_linux_amd64/ts3server_minimal_runscript.sh voice_ip={ip} default_voice_port={port} query_ip={ip} query_port={query_port} filetransfer_ip={ip} filetransfer_port={filetransfer_port} license_accepted=1', -// 'start_cmd_win' => 'teamspeak3-server_win64\ts3server.exe', -// 'remote_repository_nix' => 'https://files.teamspeak-services.com/releases/server/3.13.6/teamspeak3-server_linux_amd64-3.13.6.tar.bz2', -// 'remote_repository_win' => 'https://files.teamspeak-services.com/releases/server/3.13.6/teamspeak3-server_win64-3.13.6.zip', +// 'start_cmd_linux' => './teamspeak3-server_linux_amd64/ts3server_minimal_runscript.sh voice_ip={ip} default_voice_port={port} query_ip={ip} query_port={query_port} filetransfer_ip={ip} filetransfer_port={filetransfer_port} license_accepted=1', +// 'start_cmd_windows' => 'teamspeak3-server_win64\ts3server.exe', +// 'remote_repository_linux' => 'https://files.teamspeak-services.com/releases/server/3.13.6/teamspeak3-server_linux_amd64-3.13.6.tar.bz2', +// 'remote_repository_windows' => 'https://files.teamspeak-services.com/releases/server/3.13.6/teamspeak3-server_win64-3.13.6.zip', // ]); } @@ -1110,13 +1110,13 @@ private static function getDefaultGoldSourceStartCmd($os, $game = '', $file = '' $game = ' -game ' . $game; } switch ($os) { - case 'nix': + case 'linux': if(empty($file)){ $file = './hlds_run'; } $cmd = $file . ' -console' . $game . ' +ip {ip} +port {port} +map {default_map} +maxplayers {maxplayers} +sys_ticrate {fps} +rcon_password {rcon_password}'; break; - case 'win': + case 'windows': if(empty($file)){ $file = 'hlds.exe'; } @@ -1166,13 +1166,13 @@ private static function getDefaultSourceStartCmd($os, $game = '', $file = '') $game = ' -game ' . $game; } switch ($os) { - case 'nix': + case 'linux': if(empty($file)){ $file = './srcds_run'; } $cmd = $file . ' -console' . $game . ' +ip {ip} +port {port} +maxplayers {maxplayers} +map {default_map} -tickrate {tickrate} +rcon_password {rcon_password}'; break; - case 'win': + case 'windows': if(empty($file)){ $file = 'srcds.exe'; } diff --git a/database/seeds/GamesTableSeeder.php b/database/seeds/GamesTableSeeder.php index 6a3d7de0..e2c5e39e 100644 --- a/database/seeds/GamesTableSeeder.php +++ b/database/seeds/GamesTableSeeder.php @@ -25,8 +25,8 @@ public function run() 'name' => 'Half-Life 1', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id_nix' => 90, - 'steam_app_id_win' => 90, + 'steam_app_id_linux' => 90, + 'steam_app_id_windows' => 90, ]); DB::table('games')->insert([ @@ -35,8 +35,8 @@ public function run() 'name' => 'Half-Life: Opposing Force', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id_nix' => 90, - 'steam_app_id_win' => 90, + 'steam_app_id_linux' => 90, + 'steam_app_id_windows' => 90, 'steam_app_set_config' => "90 mod gearbox", ]); @@ -46,8 +46,8 @@ public function run() 'name' => 'Half-Life 2', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id_nix' => 232370, - 'steam_app_id_win' => 232370, + 'steam_app_id_linux' => 232370, + 'steam_app_id_windows' => 232370, ]); DB::table('games')->insert([ @@ -56,8 +56,8 @@ public function run() 'name' => 'Black Mesa: Deathmatch', 'engine' => 'Source', 'engine_version' => '4', - 'steam_app_id_nix' => 346680, - 'steam_app_id_win' => 346680, + 'steam_app_id_linux' => 346680, + 'steam_app_id_windows' => 346680, ]); /* @@ -78,8 +78,8 @@ public function run() 'name' => 'Counter-Strike 1.6', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id_nix' => 90, - 'steam_app_id_win' => 90, + 'steam_app_id_linux' => 90, + 'steam_app_id_windows' => 90, ]); DB::table('games')->insert([ @@ -88,8 +88,8 @@ public function run() 'name' => "Counter-Strike: Condition Zero", 'engine' => "GoldSource", 'engine_version' => "1", - 'steam_app_id_nix' => 90, - 'steam_app_id_win' => 90, + 'steam_app_id_linux' => 90, + 'steam_app_id_windows' => 90, 'steam_app_set_config' => "90 mod czero", ]); @@ -99,8 +99,8 @@ public function run() 'name' => "Counter-Strike: Source v34", 'engine' => "Source", 'engine_version' => "34", - 'steam_app_id_nix' => 232330, - 'steam_app_id_win' => 232330, + 'steam_app_id_linux' => 232330, + 'steam_app_id_windows' => 232330, ]); DB::table('games')->insert([ @@ -109,8 +109,8 @@ public function run() 'name' => "Counter-Strike: Source", 'engine' => "Source", 'engine_version' => "1", - 'steam_app_id_nix' => 232330, - 'steam_app_id_win' => 232330, + 'steam_app_id_linux' => 232330, + 'steam_app_id_windows' => 232330, ]); DB::table('games')->insert([ @@ -119,8 +119,8 @@ public function run() 'name' => "Counter-Strike: Global Offensive", 'engine' => "Source", 'engine_version' => "1", - 'steam_app_id_nix' => 740, - 'steam_app_id_win' => 740, + 'steam_app_id_linux' => 740, + 'steam_app_id_windows' => 740, ]); /* @@ -133,8 +133,8 @@ public function run() 'name' => 'Team Fortress Classic', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id_nix' => 90, - 'steam_app_id_win' => 90, + 'steam_app_id_linux' => 90, + 'steam_app_id_windows' => 90, 'steam_app_set_config' => "90 mod tfc", ]); @@ -144,8 +144,8 @@ public function run() 'name' => 'Team Fortress 2', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id_nix' => 232250, - 'steam_app_id_win' => 232250, + 'steam_app_id_linux' => 232250, + 'steam_app_id_windows' => 232250, ]); /* @@ -158,8 +158,8 @@ public function run() 'name' => 'Day of Defeat', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id_nix' => 90, - 'steam_app_id_win' => 90, + 'steam_app_id_linux' => 90, + 'steam_app_id_windows' => 90, 'steam_app_set_config' => "90 mod dod", ]); @@ -169,8 +169,8 @@ public function run() 'name' => 'Day of Defeat: Source', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id_nix' => 232290, - 'steam_app_id_win' => 232290, + 'steam_app_id_linux' => 232290, + 'steam_app_id_windows' => 232290, ]); /* @@ -183,8 +183,8 @@ public function run() 'name' => 'Left 4 Dead', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id_nix' => 222840, - 'steam_app_id_win' => 222840, + 'steam_app_id_linux' => 222840, + 'steam_app_id_windows' => 222840, ]); DB::table('games')->insert([ @@ -193,8 +193,8 @@ public function run() 'name' => 'Left 4 Dead 2', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id_nix' => 222860, - 'steam_app_id_win' => 222860, + 'steam_app_id_linux' => 222860, + 'steam_app_id_windows' => 222860, ]); /* @@ -207,8 +207,8 @@ public function run() 'name' => 'Deathmatch Classic', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id_nix' => 90, - 'steam_app_id_win' => 90, + 'steam_app_id_linux' => 90, + 'steam_app_id_windows' => 90, 'steam_app_set_config' => "90 mod dmc", ]); @@ -218,8 +218,8 @@ public function run() 'name' => 'Ricochet', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id_nix' => 90, - 'steam_app_id_win' => 90, + 'steam_app_id_linux' => 90, + 'steam_app_id_windows' => 90, 'steam_app_set_config' => "90 mod ricochet", ]); @@ -229,8 +229,8 @@ public function run() 'name' => 'Sven Co-op', 'engine' => 'GoldSource', 'engine_version' => '1', - 'steam_app_id_nix' => 276060, - 'steam_app_id_win' => 276060, + 'steam_app_id_linux' => 276060, + 'steam_app_id_windows' => 276060, ]); /* @@ -243,8 +243,8 @@ public function run() 'name' => 'Insurgency', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id_nix' => 237410, - 'steam_app_id_win' => 237410, + 'steam_app_id_linux' => 237410, + 'steam_app_id_windows' => 237410, ]); DB::table('games')->insert([ @@ -253,8 +253,8 @@ public function run() 'name' => 'Garry`s Mod', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id_nix' => 4020, - 'steam_app_id_win' => 4020, + 'steam_app_id_linux' => 4020, + 'steam_app_id_windows' => 4020, ]); DB::table('games')->insert([ @@ -263,8 +263,8 @@ public function run() 'name' => 'Pirates, Vikings, and Knights II', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id_nix' => 17575, - 'steam_app_id_win' => 17575, + 'steam_app_id_linux' => 17575, + 'steam_app_id_windows' => 17575, ]); DB::table('games')->insert([ @@ -273,8 +273,8 @@ public function run() 'name' => 'No More Room In Hell', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id_nix' => 317670, - 'steam_app_id_win' => 317670, + 'steam_app_id_linux' => 317670, + 'steam_app_id_windows' => 317670, ]); DB::table('games')->insert([ @@ -283,8 +283,8 @@ public function run() 'name' => 'Synergy', 'engine' => 'Source', 'engine_version' => '1', - 'steam_app_id_nix' => 17525, - 'steam_app_id_win' => 17525, + 'steam_app_id_linux' => 17525, + 'steam_app_id_windows' => 17525, ]); // DB::table('games')->insert([ @@ -293,7 +293,7 @@ public function run() // 'name' => 'Dota 2', // 'engine' => 'Source', // 'engine_version' => '1', -// 'steam_app_id_nix' => 570, +// 'steam_app_id_linux' => 570, // ]); /* @@ -324,7 +324,7 @@ public function run() 'name' => 'Arma 2', 'engine' => 'RealVirtuality', 'engine_version' => '3', - 'steam_app_id_win' => 33905, + 'steam_app_id_windows' => 33905, ]); DB::table('games')->insert([ @@ -333,7 +333,7 @@ public function run() 'name' => 'Arma 2: Operation Arrowhead', 'engine' => 'RealVirtuality', 'engine_version' => '3', - 'steam_app_id_win' => 33935, + 'steam_app_id_windows' => 33935, ]); DB::table('games')->insert([ @@ -342,8 +342,8 @@ public function run() 'name' => 'Arma 3', 'engine' => 'RealVirtuality', 'engine_version' => '4', - 'steam_app_id_nix' => 233780, - 'steam_app_id_win' => 233780, + 'steam_app_id_linux' => 233780, + 'steam_app_id_windows' => 233780, ]); /* @@ -355,7 +355,7 @@ public function run() 'start_code' => 'cod3', 'name' => 'Call of Duty 3', 'engine' => 'Treyarch NGL', - 'steam_app_id_win' => 42750, + 'steam_app_id_windows' => 42750, ]); DB::table('games')->insert([ @@ -408,8 +408,8 @@ public function run() 'name' => 'Just Cause 2', 'engine' => 'AvalancheEngine', 'engine_version' => '2.0', - 'steam_app_id_nix' => 261140, - 'steam_app_id_win' => 261140, + 'steam_app_id_linux' => 261140, + 'steam_app_id_windows' => 261140, ]); DB::table('games')->insert([ @@ -430,8 +430,8 @@ public function run() // 'name' => 'Killing Floor', // 'engine' => 'UnrealEngine', // 'engine_version' => '2.5', -// 'steam_app_id_nix' => 215360, -// 'steam_app_id_win' => 215350, +// 'steam_app_id_linux' => 215360, +// 'steam_app_id_windows' => 215350, // ]); DB::table('games')->insert([ @@ -440,8 +440,8 @@ public function run() 'name' => 'Killing Floor 2', 'engine' => 'UnrealEngine', 'engine_version' => '3', - 'steam_app_id_nix' => 232130, - 'steam_app_id_win' => 232130, + 'steam_app_id_linux' => 232130, + 'steam_app_id_windows' => 232130, ]); /* @@ -454,8 +454,8 @@ public function run() 'name' => 'ARK: Survival Evolved', 'engine' => 'Unreal Engine', 'engine_version' => '4', - 'steam_app_id_nix' => 376030, - 'steam_app_id_win' => 376030, + 'steam_app_id_linux' => 376030, + 'steam_app_id_windows' => 376030, ]); DB::table('games')->insert([ @@ -463,7 +463,7 @@ public function run() 'start_code' => 'rust', 'name' => 'Rust', 'engine' => 'Unity', - 'steam_app_id_win' => 258550, + 'steam_app_id_windows' => 258550, ]); DB::table('games')->insert([ @@ -471,8 +471,8 @@ public function run() 'start_code' => 'hurtworld', 'name' => 'HurtWorld', 'engine' => 'Unity', - 'steam_app_id_nix' => 405100, - 'steam_app_id_win' => 405100, + 'steam_app_id_linux' => 405100, + 'steam_app_id_windows' => 405100, ]); DB::table('games')->insert([ @@ -480,8 +480,8 @@ public function run() 'start_code' => '7d2d', 'name' => '7 Days to Die', 'engine' => 'Unity', - 'steam_app_id_nix' => 294420, - 'steam_app_id_win' => 294420, + 'steam_app_id_linux' => 294420, + 'steam_app_id_windows' => 294420, ]); DB::table('games')->insert([ @@ -489,7 +489,7 @@ public function run() 'start_code' => 'the-forest', 'name' => 'The Forest', 'engine' => 'Unity', - 'steam_app_id_win' => 556450, + 'steam_app_id_windows' => 556450, ]); DB::table('games')->insert([ @@ -497,7 +497,7 @@ public function run() 'start_code' => 'rok', 'name' => 'Reign Of Kings', 'engine' => 'Unity', - 'steam_app_id_win' => 344760, + 'steam_app_id_windows' => 344760, ]); DB::table('games')->insert([ @@ -506,7 +506,7 @@ public function run() 'name' => 'Don`t Starve Together', 'engine' => 'Don`t Starve', 'engine_version' => '1', - 'steam_app_id_nix' => 343050, + 'steam_app_id_linux' => 343050, ]); DB::table('games')->insert([ @@ -521,7 +521,7 @@ public function run() // 'start_code' => 'terraria', // 'name' => 'Terraria', // 'engine' => 'Terraria', -// 'steam_app_id_nix' => 105600, +// 'steam_app_id_linux' => 105600, // ]); // DB::table('games')->insert([ @@ -529,7 +529,7 @@ public function run() // 'start_code' => 'unturned', // 'name' => 'Unturned', // 'engine' => 'Unturned', -// 'steam_app_id_nix' => 1110390, +// 'steam_app_id_linux' => 1110390, // ]); /* diff --git a/resources/lang/en/labels.php b/resources/lang/en/labels.php index cf6f6699..56040f55 100644 --- a/resources/lang/en/labels.php +++ b/resources/lang/en/labels.php @@ -45,18 +45,18 @@ 'start_code' => 'Start Code', 'engine' => 'Engine', 'engine_version' => 'Engine Version', - 'steam_app_id_nix' => 'Steam App ID (Linux)', - 'steam_app_id_win' => 'Steam App ID (Windows)', + 'steam_app_id_linux' => 'Steam App ID (Linux)', + 'steam_app_id_windows' => 'Steam App ID (Windows)', 'steam_app_set_config' => 'Steam App Set Config', // GameMod 'game_code' => 'Game Code', 'fast_rcon' => 'Fast RCON', 'vars' => 'Vars', - 'remote_repository_nix' => 'Remote Repository (Linux)', - 'remote_repository_win' => 'Remote Repository (Windows)', - 'local_repository_nix' => 'Local Repository (Linux)', - 'local_repository_win' => 'Local Repository (Windows)', + 'remote_repository_linux' => 'Remote Repository (Linux)', + 'remote_repository_windows' => 'Remote Repository (Windows)', + 'local_repository_linux' => 'Local Repository (Linux)', + 'local_repository_windows' => 'Local Repository (Windows)', 'kick_cmd' => 'Kick Command', 'ban_cmd' => 'Ban Command', 'chname_cmd' => 'Change Name Command', @@ -64,8 +64,8 @@ 'chmap_cmd' => 'Change Map Command', 'sendmsg_cmd' => 'Send Message Command', 'passwd_cmd' => 'Set/Change Password Command', - 'start_cmd_nix' => 'Start Command (Linux)', - 'start_cmd_win' => 'Start Command (Windows)', + 'start_cmd_linux' => 'Start Command (Linux)', + 'start_cmd_windows' => 'Start Command (Windows)', // Server 'game_server' => 'Game server', diff --git a/resources/lang/ru/labels.php b/resources/lang/ru/labels.php index 76241ceb..40b40388 100644 --- a/resources/lang/ru/labels.php +++ b/resources/lang/ru/labels.php @@ -45,18 +45,18 @@ 'start_code' => 'Старт код', 'engine' => 'Движок', 'engine_version' => 'Версия движка', - 'steam_app_id_nix' => 'Steam App ID (Linux)', - 'steam_app_id_win' => 'Steam App ID (Windows)', + 'steam_app_id_linux' => 'Steam App ID (Linux)', + 'steam_app_id_windows' => 'Steam App ID (Windows)', 'steam_app_set_config' => 'Steam App Set Config', // GameMod 'game_code' => 'Код игры', 'fast_rcon' => 'Fast RCON', 'vars' => 'Переменные', - 'remote_repository_nix' => 'Удалённый репозиторий (Linux)', - 'remote_repository_win' => 'Удалённый репозиторий (Windows)', - 'local_repository_nix' => 'Локальный репозиторий (Linux)', - 'local_repository_win' => 'Локальный репозиторий (Windows)', + 'remote_repository_linux' => 'Удалённый репозиторий (Linux)', + 'remote_repository_windows' => 'Удалённый репозиторий (Windows)', + 'local_repository_linux' => 'Локальный репозиторий (Linux)', + 'local_repository_windows' => 'Локальный репозиторий (Windows)', 'kick_cmd' => 'Команда кика', 'ban_cmd' => 'Команда бана', 'chname_cmd' => 'Команда смены имени (ника)', @@ -64,8 +64,8 @@ 'chmap_cmd' => 'Команда смены карты', 'sendmsg_cmd' => 'Команда отправки сообщения', 'passwd_cmd' => 'Команда установки/смены пароля', - 'start_cmd_nix' => 'Команда запуска (Linux)', - 'start_cmd_win' => 'Команда запуска (Windows)', + 'start_cmd_linux' => 'Команда запуска (Linux)', + 'start_cmd_windows' => 'Команда запуска (Windows)', // Server 'game_server' => 'Игровой сервер', diff --git a/resources/views/admin/game_mods/create.blade.php b/resources/views/admin/game_mods/create.blade.php index b1b8af9f..ae2af585 100644 --- a/resources/views/admin/game_mods/create.blade.php +++ b/resources/views/admin/game_mods/create.blade.php @@ -27,10 +27,10 @@ {{ Form::bsText('name') }} - {{ Form::bsText('remote_repository_nix') }} - {{ Form::bsText('remote_repository_win') }} - {{ Form::bsText('local_repository_nix') }} - {{ Form::bsText('local_repository_win') }} + {{ Form::bsText('remote_repository_linux') }} + {{ Form::bsText('remote_repository_windows') }} + {{ Form::bsText('local_repository_linux') }} + {{ Form::bsText('local_repository_windows') }} diff --git a/resources/views/admin/game_mods/edit.blade.php b/resources/views/admin/game_mods/edit.blade.php index fbf31775..017d9da2 100644 --- a/resources/views/admin/game_mods/edit.blade.php +++ b/resources/views/admin/game_mods/edit.blade.php @@ -48,8 +48,8 @@ {{ __('games.run_commands') }}
                                                    - {{ Form::bsText('start_cmd_nix') }} - {{ Form::bsText('start_cmd_win') }} + {{ Form::bsText('start_cmd_linux') }} + {{ Form::bsText('start_cmd_windows') }}
                                                    @@ -60,8 +60,8 @@ {{ __('games.repositories_local') }}
                                                    - {{ Form::bsText('local_repository_nix') }} - {{ Form::bsText('local_repository_win') }} + {{ Form::bsText('local_repository_linux') }} + {{ Form::bsText('local_repository_windows') }}
                                                    @@ -70,8 +70,8 @@ {{ __('games.repositories_remote') }}
                                                    - {{ Form::bsText('remote_repository_nix') }} - {{ Form::bsText('remote_repository_win') }} + {{ Form::bsText('remote_repository_linux') }} + {{ Form::bsText('remote_repository_windows') }}
                                                    diff --git a/resources/views/admin/games/create.blade.php b/resources/views/admin/games/create.blade.php index 4649d40a..6a10c66c 100644 --- a/resources/views/admin/games/create.blade.php +++ b/resources/views/admin/games/create.blade.php @@ -30,23 +30,23 @@
                                                    - {{ Form::bsText('steam_app_id_nix') }} - {{ Form::bsText('steam_app_id_win') }} + {{ Form::bsText('steam_app_id_linux') }} + {{ Form::bsText('steam_app_id_windows') }} {{ Form::bsText('steam_app_set_config') }}
                                                    - {{ Form::bsText('local_repository_nix') }} - {{ Form::bsText('local_repository_win') }} + {{ Form::bsText('local_repository_linux') }} + {{ Form::bsText('local_repository_windows') }}
                                                    - {{ Form::bsText('local_repository_nix') }} - {{ Form::bsText('local_repository_win') }} + {{ Form::bsText('local_repository_linux') }} + {{ Form::bsText('local_repository_windows') }}
                                                    diff --git a/resources/views/admin/games/edit.blade.php b/resources/views/admin/games/edit.blade.php index 0b997be7..0d4d1ac8 100644 --- a/resources/views/admin/games/edit.blade.php +++ b/resources/views/admin/games/edit.blade.php @@ -57,8 +57,8 @@ {{ __('games.steam_info') }}
                                                    - {{ Form::bsText('steam_app_id_nix') }} - {{ Form::bsText('steam_app_id_win') }} + {{ Form::bsText('steam_app_id_linux') }} + {{ Form::bsText('steam_app_id_windows') }} {{ Form::bsText('steam_app_set_config') }}
                                                    @@ -68,8 +68,8 @@ {{ __('games.repositories_local') }}
                                                    - {{ Form::bsText('local_repository_nix') }} - {{ Form::bsText('local_repository_win') }} + {{ Form::bsText('local_repository_linux') }} + {{ Form::bsText('local_repository_windows') }}
                                                    @@ -78,8 +78,8 @@ {{ __('games.repositories_remote') }}
                                                    - {{ Form::bsText('remote_repository_nix') }} - {{ Form::bsText('remote_repository_win') }} + {{ Form::bsText('remote_repository_linux') }} + {{ Form::bsText('remote_repository_windows') }}
                                                    diff --git a/tests/Feature/Permissions/Controllers/Admin/GameModsControllerTest.php b/tests/Feature/Permissions/Controllers/Admin/GameModsControllerTest.php index 21c33043..6e370ff8 100644 --- a/tests/Feature/Permissions/Controllers/Admin/GameModsControllerTest.php +++ b/tests/Feature/Permissions/Controllers/Admin/GameModsControllerTest.php @@ -54,10 +54,12 @@ public function testAllow() 'name' => 'Secure Test Mod', 'fast_rcon' => null, 'vars' => null, - 'remote_repository' => null, - 'local_repository' => null, - 'start_cmd_nix' => '', - 'start_cmd_win' => '', + 'remote_repository_linux' => null, + 'remote_repository_windows' => null, + 'local_repository_linux' => null, + 'local_repository_windows' => null, + 'start_cmd_linux' => '', + 'start_cmd_windows' => '', 'kick_cmd' => null, 'ban_cmd' => null, 'chname_cmd' => null, @@ -102,10 +104,12 @@ public function testForbidden() 'name' => 'Secure Test Mod', 'fast_rcon' => null, 'vars' => null, - 'remote_repository' => null, - 'local_repository' => null, - 'start_cmd_nix' => '', - 'start_cmd_win' => '', + 'remote_repository_linux' => null, + 'remote_repository_windows' => null, + 'local_repository_linux' => null, + 'local_repository_windows' => null, + 'start_cmd_linux' => '', + 'start_cmd_windows' => '', 'kick_cmd' => null, 'ban_cmd' => null, 'chname_cmd' => null, @@ -149,10 +153,12 @@ public function testForbiddenUser() 'name' => 'Secure Test Mod', 'fast_rcon' => null, 'vars' => null, - 'remote_repository' => null, - 'local_repository' => null, - 'start_cmd_nix' => '', - 'start_cmd_win' => '', + 'remote_repository_linux' => null, + 'remote_repository_windows' => null, + 'local_repository_linux' => null, + 'local_repository_windows' => null, + 'start_cmd_linux' => '', + 'start_cmd_windows' => '', 'kick_cmd' => null, 'ban_cmd' => null, 'chname_cmd' => null, From 0abe664b22d5c8cf3e4b742b07d2235272546807 Mon Sep 17 00:00:00 2001 From: Nikita Kuznetsov Date: Fri, 17 Jun 2022 22:17:06 +0200 Subject: [PATCH 18/37] field fixes --- .dev/docker/php/entrypoint | 20 +++++++++---------- docker-compose.yml | 17 ++-------------- tests/Browser/Admin/GamesTest.php | 4 ++-- .../Browser/Models/GameContextTrait.php | 6 +++--- 4 files changed, 17 insertions(+), 30 deletions(-) diff --git a/.dev/docker/php/entrypoint b/.dev/docker/php/entrypoint index 1bf88800..b4610d5a 100755 --- a/.dev/docker/php/entrypoint +++ b/.dev/docker/php/entrypoint @@ -16,11 +16,11 @@ if (getenv('DB_CONNECTION') == 'sqlite') { system('php artisan migrate --force'); - system('php artisan db:seed --class=ClientCertificatesTableSeeder'); - system('php artisan db:seed --class=GamesTableSeeder'); - system('php artisan db:seed --class=GameModsTableSeeder'); - system('php artisan db:seed --class=UsersTableSeeder'); - system('php artisan db:seed --class=PermissionsSeeder'); + system('php artisan db:seed --class=ClientCertificatesTableSeeder --force'); + system('php artisan db:seed --class=GamesTableSeeder --force'); + system('php artisan db:seed --class=GameModsTableSeeder --force'); + system('php artisan db:seed --class=UsersTableSeeder --force'); + system('php artisan db:seed --class=PermissionsSeeder --force'); } else { system('php artisan migrate --force'); } @@ -57,11 +57,11 @@ else if (getenv('DB_CONNECTION') == 'mysql') { $count = $pdo->query("SELECT COUNT(*) as count FROM users;")->fetch(PDO::FETCH_ASSOC)['count']; if ($count == 0) { - system('php artisan db:seed --class=ClientCertificatesTableSeeder'); - system('php artisan db:seed --class=GamesTableSeeder'); - system('php artisan db:seed --class=GameModsTableSeeder'); - system('php artisan db:seed --class=UsersTableSeeder'); - system('php artisan db:seed --class=PermissionsSeeder'); + system('php artisan db:seed --class=ClientCertificatesTableSeeder --force'); + system('php artisan db:seed --class=GamesTableSeeder --force'); + system('php artisan db:seed --class=GameModsTableSeeder --force'); + system('php artisan db:seed --class=UsersTableSeeder --force'); + system('php artisan db:seed --class=PermissionsSeeder --force'); } } diff --git a/docker-compose.yml b/docker-compose.yml index bb7a8957..3f39fb6e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: container_name: gameap_nginx hostname: gameap.web ports: - - "127.0.0.1:2080:80" + - "0.0.0.0:2080:80" volumes: - ./:/var/www - ./.dev/nginx-configs/default.conf:/etc/nginx/conf.d/default.conf @@ -40,22 +40,9 @@ services: PHP_IDE_CONFIG: "serverName=gameap-develop" ADMIN_PASSWORD: fpwPOuZD DAEMON_SETUP_TOKEN: test_auto_setup_token + APP_KEY: eefeiQuaeti0Eeshoh7Efei1paizee1i links: - mysql:db restart: always depends_on: - mysql - daemon: - build: ./.dev/docker/gdaemon - container_name: gameap_daemon - ports: - - "127.0.0.1:2022:22" - cap_add: - - sys_ptrace - restart: always - links: - - nginx:gameap - depends_on: - - php - - nginx - - mysql diff --git a/tests/Browser/Admin/GamesTest.php b/tests/Browser/Admin/GamesTest.php index 849f0c36..327bfc45 100644 --- a/tests/Browser/Admin/GamesTest.php +++ b/tests/Browser/Admin/GamesTest.php @@ -31,7 +31,7 @@ public function testCreateGame() ->type('name', 'Test') ->type('engine', 'Test') ->type('engine_version', '2.0') - ->type('remote_repository', 'http://files.gameap.ru/test/test.tar.xz') + ->type('remote_repository_linux', 'http://files.gameap.ru/test/test.tar.xz') ->scrollIntoView('input[type=submit]') ->press(__('main.create')) ->assertPathIs('/admin/games') @@ -43,7 +43,7 @@ public function testCreateGame() 'name' => 'Test', 'engine' => 'Test', 'engine_version' => '2.0', - 'remote_repository' => 'http://files.gameap.ru/test/test.tar.xz', + 'remote_repository_linux' => 'http://files.gameap.ru/test/test.tar.xz', ]); } diff --git a/tests/Context/Browser/Models/GameContextTrait.php b/tests/Context/Browser/Models/GameContextTrait.php index c6cd4744..a85cf63f 100644 --- a/tests/Context/Browser/Models/GameContextTrait.php +++ b/tests/Context/Browser/Models/GameContextTrait.php @@ -9,9 +9,9 @@ trait GameContextTrait private function givenGame(): Game { $game = factory(Game::class)->create([ - 'code' => 'test', - 'name' => 'Test', - 'remote_repository' => 'https://files.gameap.ru/test/test.tar.xz', + 'code' => 'test', + 'name' => 'Test', + 'remote_repository_linux' => 'https://files.gameap.ru/test/test.tar.xz', ]); return $game; From 95d7dda388acc09313314e75d9b90c92921c7586 Mon Sep 17 00:00:00 2001 From: et-nik Date: Fri, 17 Jun 2022 22:48:16 +0200 Subject: [PATCH 19/37] field fixes --- resources/views/admin/games/create.blade.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/resources/views/admin/games/create.blade.php b/resources/views/admin/games/create.blade.php index 6a10c66c..dedbd6e9 100644 --- a/resources/views/admin/games/create.blade.php +++ b/resources/views/admin/games/create.blade.php @@ -29,6 +29,9 @@
                                                    +
                                                    + {{ __('games.steam_info') }} +
                                                    {{ Form::bsText('steam_app_id_linux') }} {{ Form::bsText('steam_app_id_windows') }} @@ -37,21 +40,27 @@
                                                    +
                                                    + {{ __('games.repositories_local') }} +
                                                    {{ Form::bsText('local_repository_linux') }} {{ Form::bsText('local_repository_windows') }}
                                                    - +
                                                    +
                                                    + {{ __('games.repositories_remote') }} +
                                                    - {{ Form::bsText('local_repository_linux') }} - {{ Form::bsText('local_repository_windows') }} + {{ Form::bsText('remote_repository_linux') }} + {{ Form::bsText('remote_repository_windows') }}
                                                    - +
                                                    {{ Form::submit(__('main.create'), ['class' => 'btn btn-success']) }} From ebaed75b0e22f9a33309ba39e0372c242a7dd826 Mon Sep 17 00:00:00 2001 From: et-nik Date: Sat, 18 Jun 2022 11:20:13 +0200 Subject: [PATCH 20/37] fix test --- tests/Browser/Admin/GamesTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Browser/Admin/GamesTest.php b/tests/Browser/Admin/GamesTest.php index 327bfc45..ded315d0 100644 --- a/tests/Browser/Admin/GamesTest.php +++ b/tests/Browser/Admin/GamesTest.php @@ -84,7 +84,8 @@ public function testCreateMod() ->assertPathIs('/admin/game_mods/create') ->select('game_code', 'test') ->type('name', 'Default') - ->press('Create') + ->scrollIntoView('input[type=submit]') + ->press(__('main.create')) ->assertPathIs('/admin/games') ->assertSee(__('games.mod_create_success_msg')); }); From 84fc644d0f4a7adaa8f1fe20d7d0dad788d87322 Mon Sep 17 00:00:00 2001 From: et-nik Date: Sat, 18 Jun 2022 11:33:39 +0200 Subject: [PATCH 21/37] update guzzlehttp/guzzle --- composer.json | 2 +- composer.lock | 2214 ++++++++++++++++--------------------------------- 2 files changed, 731 insertions(+), 1485 deletions(-) diff --git a/composer.json b/composer.json index 671d6bad..5a2ff85a 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "fakerphp/faker": "^1.13.0", "fideloper/proxy": "~4.0", "gameap/gameap-file-manager": "^1.0", - "guzzlehttp/guzzle": "^7.0.1", + "guzzlehttp/guzzle": "^7.4.4", "joshbrw/laravel-module-installer": "^1.0.1", "knik/flysystem-gameap": "*", "knik/g-rcon": "*", diff --git a/composer.lock b/composer.lock index 7c5222d7..960979db 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "08466a0555836080a3064f87c458cb0d", + "content-hash": "b8a868c74ed602dc31e6b7da7c018ca1", "packages": [ { "name": "brick/math", @@ -137,16 +137,16 @@ }, { "name": "doctrine/cache", - "version": "2.1.1", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "331b4d5dbaeab3827976273e9356b3b453c300ce" + "reference": "1ca8f21980e770095a31456042471a57bc4c68fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/331b4d5dbaeab3827976273e9356b3b453c300ce", - "reference": "331b4d5dbaeab3827976273e9356b3b453c300ce", + "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb", + "reference": "1ca8f21980e770095a31456042471a57bc4c68fb", "shasum": "" }, "require": { @@ -156,18 +156,12 @@ "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "alcaeus/mongo-php-adapter": "^1.1", "cache/integration-tests": "dev-master", - "doctrine/coding-standard": "^8.0", - "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "predis/predis": "~1.0", + "doctrine/coding-standard": "^9", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "psr/cache": "^1.0 || ^2.0 || ^3.0", - "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev", - "symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev" - }, - "suggest": { - "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" + "symfony/cache": "^4.4 || ^5.4 || ^6", + "symfony/var-exporter": "^4.4 || ^5.4 || ^6" }, "type": "library", "autoload": { @@ -216,7 +210,7 @@ ], "support": { "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/2.1.1" + "source": "https://github.com/doctrine/cache/tree/2.2.0" }, "funding": [ { @@ -232,25 +226,25 @@ "type": "tidelift" } ], - "time": "2021-07-17T14:49:29+00:00" + "time": "2022-05-20T20:07:39+00:00" }, { "name": "doctrine/dbal", - "version": "2.13.6", + "version": "2.13.9", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "67ef6d0327ccbab1202b39e0222977a47ed3ef2f" + "reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/67ef6d0327ccbab1202b39e0222977a47ed3ef2f", - "reference": "67ef6d0327ccbab1202b39e0222977a47ed3ef2f", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/c480849ca3ad6706a39c970cdfe6888fa8a058b8", + "reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8", "shasum": "" }, "require": { "doctrine/cache": "^1.0|^2.0", - "doctrine/deprecations": "^0.5.3", + "doctrine/deprecations": "^0.5.3|^1", "doctrine/event-manager": "^1.0", "ext-pdo": "*", "php": "^7.1 || ^8" @@ -258,13 +252,13 @@ "require-dev": { "doctrine/coding-standard": "9.0.0", "jetbrains/phpstorm-stubs": "2021.1", - "phpstan/phpstan": "1.2.0", - "phpunit/phpunit": "^7.5.20|^8.5|9.5.10", + "phpstan/phpstan": "1.4.6", + "phpunit/phpunit": "^7.5.20|^8.5|9.5.16", "psalm/plugin-phpunit": "0.16.1", - "squizlabs/php_codesniffer": "3.6.1", + "squizlabs/php_codesniffer": "3.6.2", "symfony/cache": "^4.4", "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", - "vimeo/psalm": "4.13.0" + "vimeo/psalm": "4.22.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -325,7 +319,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/2.13.6" + "source": "https://github.com/doctrine/dbal/tree/2.13.9" }, "funding": [ { @@ -341,29 +335,29 @@ "type": "tidelift" } ], - "time": "2021-11-26T20:11:05+00:00" + "time": "2022-05-02T20:28:55+00:00" }, { "name": "doctrine/deprecations", - "version": "v0.5.3", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "9504165960a1f83cc1480e2be1dd0a0478561314" + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314", - "reference": "9504165960a1f83cc1480e2be1dd0a0478561314", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", "shasum": "" }, "require": { "php": "^7.1|^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0|^7.0|^8.0", - "phpunit/phpunit": "^7.0|^8.0|^9.0", - "psr/log": "^1.0" + "doctrine/coding-standard": "^9", + "phpunit/phpunit": "^7.5|^8.5|^9.5", + "psr/log": "^1|^2|^3" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -382,9 +376,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v0.5.3" + "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" }, - "time": "2021-03-21T12:59:47+00:00" + "time": "2022-05-02T15:47:09+00:00" }, { "name": "doctrine/event-manager", @@ -573,32 +567,28 @@ }, { "name": "doctrine/lexer", - "version": "1.2.1", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" + "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229", + "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11.8", - "phpunit/phpunit": "^8.2" + "doctrine/coding-standard": "^9.0", + "phpstan/phpstan": "^1.3", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.11" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" @@ -633,7 +623,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.1" + "source": "https://github.com/doctrine/lexer/tree/1.2.3" }, "funding": [ { @@ -649,33 +639,33 @@ "type": "tidelift" } ], - "time": "2020-05-25T17:44:05+00:00" + "time": "2022-02-28T11:07:21+00:00" }, { "name": "dragonmantank/cron-expression", - "version": "v3.1.0", + "version": "v3.3.1", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c" + "reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c", - "reference": "7a8c6e56ab3ffcc538d05e8155bb42269abf1a0c", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/be85b3f05b46c39bbc0d95f6c071ddff669510fa", + "reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa", "shasum": "" }, "require": { "php": "^7.2|^8.0", - "webmozart/assert": "^1.7.0" + "webmozart/assert": "^1.0" }, "replace": { "mtdowling/cron-expression": "^1.0" }, "require-dev": { "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-webmozart-assert": "^0.12.7", + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-webmozart-assert": "^1.0", "phpunit/phpunit": "^7.0|^8.0|^9.0" }, "type": "library", @@ -702,7 +692,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.1.0" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.1" }, "funding": [ { @@ -710,7 +700,7 @@ "type": "github" } ], - "time": "2020-11-24T19:55:57+00:00" + "time": "2022-01-18T15:43:28+00:00" }, { "name": "egulias/email-validator", @@ -782,16 +772,16 @@ }, { "name": "fakerphp/faker", - "version": "v1.17.0", + "version": "v1.19.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "b85e9d44eae8c52cca7aa0939483611f7232b669" + "reference": "d7f08a622b3346766325488aa32ddc93ccdecc75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/b85e9d44eae8c52cca7aa0939483611f7232b669", - "reference": "b85e9d44eae8c52cca7aa0939483611f7232b669", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/d7f08a622b3346766325488aa32ddc93ccdecc75", + "reference": "d7f08a622b3346766325488aa32ddc93ccdecc75", "shasum": "" }, "require": { @@ -804,10 +794,12 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.4.1", + "doctrine/persistence": "^1.3 || ^2.0", "ext-intl": "*", "symfony/phpunit-bridge": "^4.4 || ^5.2" }, "suggest": { + "doctrine/orm": "Required to use Faker\\ORM\\Doctrine", "ext-curl": "Required by Faker\\Provider\\Image to download images.", "ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.", "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.", @@ -816,7 +808,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "v1.17-dev" + "dev-main": "v1.19-dev" } }, "autoload": { @@ -841,9 +833,9 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.17.0" + "source": "https://github.com/FakerPHP/Faker/tree/v1.19.0" }, - "time": "2021-12-05T17:14:47+00:00" + "time": "2022-02-02T17:38:57+00:00" }, { "name": "fideloper/proxy", @@ -1033,16 +1025,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.4.1", + "version": "7.4.4", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79" + "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ee0a041b1760e6a53d2a39c8c34115adc2af2c79", - "reference": "ee0a041b1760e6a53d2a39c8c34115adc2af2c79", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/e3ff079b22820c2029d4c2a87796b6a0b8716ad8", + "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8", "shasum": "" }, "require": { @@ -1075,12 +1067,12 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1137,7 +1129,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.1" + "source": "https://github.com/guzzle/guzzle/tree/7.4.4" }, "funding": [ { @@ -1153,7 +1145,7 @@ "type": "tidelift" } ], - "time": "2021-12-06T18:43:05+00:00" + "time": "2022-06-09T21:39:15+00:00" }, { "name": "guzzlehttp/promises", @@ -1182,12 +1174,12 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1241,16 +1233,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.1.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72" + "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/089edd38f5b8abba6cb01567c2a8aaa47cec4c72", - "reference": "089edd38f5b8abba6cb01567c2a8aaa47cec4c72", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/83260bb50b8fc753c72d14dc1621a2dac31877ee", + "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee", "shasum": "" }, "require": { @@ -1274,7 +1266,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.3-dev" } }, "autoload": { @@ -1336,7 +1328,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.1.0" + "source": "https://github.com/guzzle/psr7/tree/2.3.0" }, "funding": [ { @@ -1352,20 +1344,20 @@ "type": "tidelift" } ], - "time": "2021-10-06T17:43:30+00:00" + "time": "2022-06-09T08:26:02+00:00" }, { "name": "intervention/image", - "version": "2.7.1", + "version": "2.7.2", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "744ebba495319501b873a4e48787759c72e3fb8c" + "reference": "04be355f8d6734c826045d02a1079ad658322dad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/744ebba495319501b873a4e48787759c72e3fb8c", - "reference": "744ebba495319501b873a4e48787759c72e3fb8c", + "url": "https://api.github.com/repos/Intervention/image/zipball/04be355f8d6734c826045d02a1079ad658322dad", + "reference": "04be355f8d6734c826045d02a1079ad658322dad", "shasum": "" }, "require": { @@ -1408,8 +1400,8 @@ "authors": [ { "name": "Oliver Vogel", - "email": "oliver@olivervogel.com", - "homepage": "http://olivervogel.com/" + "email": "oliver@intervention.io", + "homepage": "https://intervention.io/" } ], "description": "Image handling and manipulation library with support for Laravel integration", @@ -1424,11 +1416,11 @@ ], "support": { "issues": "https://github.com/Intervention/image/issues", - "source": "https://github.com/Intervention/image/tree/2.7.1" + "source": "https://github.com/Intervention/image/tree/2.7.2" }, "funding": [ { - "url": "https://www.paypal.me/interventionphp", + "url": "https://paypal.me/interventionio", "type": "custom" }, { @@ -1436,29 +1428,29 @@ "type": "github" } ], - "time": "2021-12-16T16:49:26+00:00" + "time": "2022-05-21T17:30:32+00:00" }, { "name": "intervention/imagecache", - "version": "2.5.1", + "version": "2.5.2", "source": { "type": "git", "url": "https://github.com/Intervention/imagecache.git", - "reference": "e714f13298ecaf9b2d11cb7106a0415d5615cbe5" + "reference": "270d1e72ddff2fc0a6d3c7e6cbc9d23c9ec1e3e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/imagecache/zipball/e714f13298ecaf9b2d11cb7106a0415d5615cbe5", - "reference": "e714f13298ecaf9b2d11cb7106a0415d5615cbe5", + "url": "https://api.github.com/repos/Intervention/imagecache/zipball/270d1e72ddff2fc0a6d3c7e6cbc9d23c9ec1e3e4", + "reference": "270d1e72ddff2fc0a6d3c7e6cbc9d23c9ec1e3e4", "shasum": "" }, "require": { - "illuminate/cache": "^5.5|~6|~7|~8", - "illuminate/filesystem": "^5.5|~6|~7|~8", - "intervention/image": ">=2.2.0", + "illuminate/cache": "^5.5|~6|~7|~8|~9", + "illuminate/filesystem": "^5.5|~6|~7|~8|~9", + "intervention/image": "~2.2", "nesbot/carbon": "^2.39", "opis/closure": "^3.5", - "php": ">=7.2" + "php": "~7.2|~8" }, "require-dev": { "phpunit/phpunit": "^8.0" @@ -1476,12 +1468,12 @@ "authors": [ { "name": "Oliver Vogel", - "email": "oliver@olivervogel.com", - "homepage": "http://olivervogel.com/" + "email": "oliver@intervention.io", + "homepage": "http://intervention.io/" } ], "description": "Caching extension for the Intervention Image Class", - "homepage": "http://image.intervention.io", + "homepage": "https://image.intervention.io", "keywords": [ "cache", "gd", @@ -1491,11 +1483,11 @@ ], "support": { "issues": "https://github.com/Intervention/imagecache/issues", - "source": "https://github.com/Intervention/imagecache/tree/2.5.1" + "source": "https://github.com/Intervention/imagecache/tree/2.5.2" }, "funding": [ { - "url": "https://www.paypal.me/interventionphp", + "url": "https://paypal.me/interventionio", "type": "custom" }, { @@ -1503,7 +1495,7 @@ "type": "github" } ], - "time": "2020-12-07T15:07:18+00:00" + "time": "2022-01-22T11:14:47+00:00" }, { "name": "joshbrw/laravel-module-installer", @@ -1907,16 +1899,16 @@ }, { "name": "laravel/framework", - "version": "v8.77.1", + "version": "v8.83.16", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "994dbac5c6da856c77c81a411cff5b7d31519ca8" + "reference": "6be5abd144faf517879af7298e9d79f06f250f75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/994dbac5c6da856c77c81a411cff5b7d31519ca8", - "reference": "994dbac5c6da856c77c81a411cff5b7d31519ca8", + "url": "https://api.github.com/repos/laravel/framework/zipball/6be5abd144faf517879af7298e9d79f06f250f75", + "reference": "6be5abd144faf517879af7298e9d79f06f250f75", "shasum": "" }, "require": { @@ -1948,8 +1940,8 @@ "symfony/routing": "^5.4", "symfony/var-dumper": "^5.4", "tijsverkoyen/css-to-inline-styles": "^2.2.2", - "vlucas/phpdotenv": "^5.2", - "voku/portable-ascii": "^1.4.8" + "vlucas/phpdotenv": "^5.4.1", + "voku/portable-ascii": "^1.6.1" }, "conflict": { "tightenco/collect": "<5.5.33" @@ -2005,6 +1997,7 @@ "symfony/cache": "^5.4" }, "suggest": { + "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).", "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.198.1).", "brianium/paratest": "Required to run tests in parallel (^6.0).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).", @@ -2075,24 +2068,24 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2021-12-21T20:22:29+00:00" + "time": "2022-06-07T15:09:06+00:00" }, { "name": "laravel/helpers", - "version": "v1.4.1", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/laravel/helpers.git", - "reference": "febb10d8daaf86123825de2cb87f789a3371f0ac" + "reference": "c28b0ccd799d58564c41a62395ac9511a1e72931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/helpers/zipball/febb10d8daaf86123825de2cb87f789a3371f0ac", - "reference": "febb10d8daaf86123825de2cb87f789a3371f0ac", + "url": "https://api.github.com/repos/laravel/helpers/zipball/c28b0ccd799d58564c41a62395ac9511a1e72931", + "reference": "c28b0ccd799d58564c41a62395ac9511a1e72931", "shasum": "" }, "require": { - "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0", + "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0", "php": "^7.1.3|^8.0" }, "require-dev": { @@ -2120,7 +2113,7 @@ }, { "name": "Dries Vints", - "email": "dries.vints@gmail.com" + "email": "dries@laravel.com" } ], "description": "Provides backwards compatibility for helpers in the latest Laravel release.", @@ -2129,28 +2122,28 @@ "laravel" ], "support": { - "source": "https://github.com/laravel/helpers/tree/v1.4.1" + "source": "https://github.com/laravel/helpers/tree/v1.5.0" }, - "time": "2021-02-16T15:27:11+00:00" + "time": "2022-01-12T15:58:51+00:00" }, { "name": "laravel/legacy-factories", - "version": "v1.1.1", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/laravel/legacy-factories.git", - "reference": "8091d6d64e0e6ea22fb3326ef0b21936d0a0217c" + "reference": "5edc7e7eb76e7b4b29221f32139bcbf806c8870f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/legacy-factories/zipball/8091d6d64e0e6ea22fb3326ef0b21936d0a0217c", - "reference": "8091d6d64e0e6ea22fb3326ef0b21936d0a0217c", + "url": "https://api.github.com/repos/laravel/legacy-factories/zipball/5edc7e7eb76e7b4b29221f32139bcbf806c8870f", + "reference": "5edc7e7eb76e7b4b29221f32139bcbf806c8870f", "shasum": "" }, "require": { - "illuminate/macroable": "^8.0", + "illuminate/macroable": "^8.0|^9.0", "php": "^7.3|^8.0", - "symfony/finder": "^3.4|^4.0|^5.0" + "symfony/finder": "^3.4|^4.0|^5.0|^6.0" }, "type": "library", "extra": { @@ -2187,20 +2180,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2021-10-19T13:10:37+00:00" + "time": "2022-01-13T08:45:08+00:00" }, { "name": "laravel/serializable-closure", - "version": "v1.0.5", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "25de3be1bca1b17d52ff0dc02b646c667ac7266c" + "reference": "09f0e9fb61829f628205b7c94906c28740ff9540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/25de3be1bca1b17d52ff0dc02b646c667ac7266c", - "reference": "25de3be1bca1b17d52ff0dc02b646c667ac7266c", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540", + "reference": "09f0e9fb61829f628205b7c94906c28740ff9540", "shasum": "" }, "require": { @@ -2246,36 +2239,36 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2021-11-30T15:53:04+00:00" + "time": "2022-05-16T17:09:47+00:00" }, { "name": "laravel/tinker", - "version": "v2.6.3", + "version": "v2.7.2", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "a9ddee4761ec8453c584e393b393caff189a3e42" + "reference": "dff39b661e827dae6e092412f976658df82dbac5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/a9ddee4761ec8453c584e393b393caff189a3e42", - "reference": "a9ddee4761ec8453c584e393b393caff189a3e42", + "url": "https://api.github.com/repos/laravel/tinker/zipball/dff39b661e827dae6e092412f976658df82dbac5", + "reference": "dff39b661e827dae6e092412f976658df82dbac5", "shasum": "" }, "require": { - "illuminate/console": "^6.0|^7.0|^8.0", - "illuminate/contracts": "^6.0|^7.0|^8.0", - "illuminate/support": "^6.0|^7.0|^8.0", + "illuminate/console": "^6.0|^7.0|^8.0|^9.0", + "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0", "php": "^7.2.5|^8.0", - "psy/psysh": "^0.10.4", - "symfony/var-dumper": "^4.3.4|^5.0" + "psy/psysh": "^0.10.4|^0.11.1", + "symfony/var-dumper": "^4.3.4|^5.0|^6.0" }, "require-dev": { "mockery/mockery": "~1.3.3|^1.4.2", "phpunit/phpunit": "^8.5.8|^9.3.3" }, "suggest": { - "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0)." + "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0)." }, "type": "library", "extra": { @@ -2312,28 +2305,28 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.6.3" + "source": "https://github.com/laravel/tinker/tree/v2.7.2" }, - "time": "2021-12-07T16:41:42+00:00" + "time": "2022-03-23T12:38:24+00:00" }, { "name": "laravel/ui", - "version": "v3.4.1", + "version": "v3.4.6", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "9a1e52442dd238647905b98d773d59e438eb9f9d" + "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/9a1e52442dd238647905b98d773d59e438eb9f9d", - "reference": "9a1e52442dd238647905b98d773d59e438eb9f9d", + "url": "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c", + "reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c", "shasum": "" }, "require": { "illuminate/console": "^8.42|^9.0", "illuminate/filesystem": "^8.42|^9.0", - "illuminate/support": "^8.42|^9.0", + "illuminate/support": "^8.82|^9.0", "illuminate/validation": "^8.42|^9.0", "php": "^7.3|^8.0" }, @@ -2373,36 +2366,36 @@ "ui" ], "support": { - "source": "https://github.com/laravel/ui/tree/v3.4.1" + "source": "https://github.com/laravel/ui/tree/v3.4.6" }, - "time": "2021-12-22T10:40:50+00:00" + "time": "2022-05-20T13:38:08+00:00" }, { "name": "laravelcollective/html", - "version": "v6.2.1", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "ae15b9c4bf918ec3a78f092b8555551dd693fde3" + "reference": "78c3cb516ac9e6d3d76cad9191f81d217302dea6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/ae15b9c4bf918ec3a78f092b8555551dd693fde3", - "reference": "ae15b9c4bf918ec3a78f092b8555551dd693fde3", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/78c3cb516ac9e6d3d76cad9191f81d217302dea6", + "reference": "78c3cb516ac9e6d3d76cad9191f81d217302dea6", "shasum": "" }, "require": { - "illuminate/http": "^6.0|^7.0|^8.0", - "illuminate/routing": "^6.0|^7.0|^8.0", - "illuminate/session": "^6.0|^7.0|^8.0", - "illuminate/support": "^6.0|^7.0|^8.0", - "illuminate/view": "^6.0|^7.0|^8.0", + "illuminate/http": "^6.0|^7.0|^8.0|^9.0", + "illuminate/routing": "^6.0|^7.0|^8.0|^9.0", + "illuminate/session": "^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0", + "illuminate/view": "^6.0|^7.0|^8.0|^9.0", "php": ">=7.2.5" }, "require-dev": { - "illuminate/database": "^6.0|^7.0|^8.0", + "illuminate/database": "^6.0|^7.0|^8.0|^9.0", "mockery/mockery": "~1.0", - "phpunit/phpunit": "~8.5" + "phpunit/phpunit": "~8.5|^9.5.10" }, "type": "library", "extra": { @@ -2420,12 +2413,12 @@ } }, "autoload": { - "psr-4": { - "Collective\\Html\\": "src/" - }, "files": [ "src/helpers.php" - ] + ], + "psr-4": { + "Collective\\Html\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2447,20 +2440,20 @@ "issues": "https://github.com/LaravelCollective/html/issues", "source": "https://github.com/LaravelCollective/html" }, - "time": "2020-12-15T20:20:05+00:00" + "time": "2022-02-08T21:02:54+00:00" }, { "name": "league/commonmark", - "version": "1.6.6", + "version": "1.6.7", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "c4228d11e30d7493c6836d20872f9582d8ba6dcf" + "reference": "2b8185c13bc9578367a5bf901881d1c1b5bbd09b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c4228d11e30d7493c6836d20872f9582d8ba6dcf", - "reference": "c4228d11e30d7493c6836d20872f9582d8ba6dcf", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2b8185c13bc9578367a5bf901881d1c1b5bbd09b", + "reference": "2b8185c13bc9578367a5bf901881d1c1b5bbd09b", "shasum": "" }, "require": { @@ -2523,10 +2516,6 @@ "source": "https://github.com/thephpleague/commonmark" }, "funding": [ - { - "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark", - "type": "custom" - }, { "url": "https://www.colinodell.com/sponsor", "type": "custom" @@ -2539,16 +2528,12 @@ "url": "https://github.com/colinodell", "type": "github" }, - { - "url": "https://www.patreon.com/colinodell", - "type": "patreon" - }, { "url": "https://tidelift.com/funding/github/packagist/league/commonmark", "type": "tidelift" } ], - "time": "2021-07-17T17:13:23+00:00" + "time": "2022-01-13T17:18:13+00:00" }, { "name": "league/flysystem", @@ -2646,16 +2631,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.9.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "aa70e813a6ad3d1558fc927863d47309b4c23e69" + "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/aa70e813a6ad3d1558fc927863d47309b4c23e69", - "reference": "aa70e813a6ad3d1558fc927863d47309b4c23e69", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", + "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", "shasum": "" }, "require": { @@ -2686,7 +2671,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.9.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0" }, "funding": [ { @@ -2698,20 +2683,20 @@ "type": "tidelift" } ], - "time": "2021-11-21T11:48:40+00:00" + "time": "2022-04-17T13:12:02+00:00" }, { "name": "mavinoo/laravel-batch", - "version": "v2.3.1", + "version": "v2.3.4", "source": { "type": "git", "url": "https://github.com/mavinoo/laravelBatch.git", - "reference": "91e8a8e283f80a677822607efedaea8ac0fa9ff1" + "reference": "126f077dec4ecabb67331694e71bf28b427daa60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mavinoo/laravelBatch/zipball/91e8a8e283f80a677822607efedaea8ac0fa9ff1", - "reference": "91e8a8e283f80a677822607efedaea8ac0fa9ff1", + "url": "https://api.github.com/repos/mavinoo/laravelBatch/zipball/126f077dec4ecabb67331694e71bf28b427daa60", + "reference": "126f077dec4ecabb67331694e71bf28b427daa60", "shasum": "" }, "require": { @@ -2732,12 +2717,12 @@ } }, "autoload": { - "psr-4": { - "Mavinoo\\Batch\\": "src/" - }, "files": [ "src/Common/Helpers.php" - ] + ], + "psr-4": { + "Mavinoo\\Batch\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2752,22 +2737,22 @@ "description": "Insert and update batch (bulk) in laravel", "support": { "issues": "https://github.com/mavinoo/laravelBatch/issues", - "source": "https://github.com/mavinoo/laravelBatch/tree/v2.3.1" + "source": "https://github.com/mavinoo/laravelBatch/tree/v2.3.4" }, - "time": "2021-12-19T05:34:14+00:00" + "time": "2022-04-20T12:04:23+00:00" }, { "name": "monolog/monolog", - "version": "2.3.5", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "fd4380d6fc37626e2f799f29d91195040137eba9" + "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9", - "reference": "fd4380d6fc37626e2f799f29d91195040137eba9", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524", + "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524", "shasum": "" }, "require": { @@ -2780,18 +2765,23 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "elasticsearch/elasticsearch": "^7", + "elasticsearch/elasticsearch": "^7 || ^8", + "ext-json": "*", "graylog2/gelf-php": "^1.4.2", + "guzzlehttp/guzzle": "^7.4", + "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", "php-console/php-console": "^3.1.3", - "phpspec/prophecy": "^1.6.1", + "phpspec/prophecy": "^1.15", "phpstan/phpstan": "^0.12.91", - "phpunit/phpunit": "^8.5", + "phpunit/phpunit": "^8.5.14", "predis/predis": "^1.1", - "rollbar/rollbar": "^1.3", - "ruflin/elastica": ">=0.90@dev", - "swiftmailer/swiftmailer": "^5.3|^6.0" + "rollbar/rollbar": "^1.3 || ^2 || ^3", + "ruflin/elastica": "^7", + "swiftmailer/swiftmailer": "^5.3|^6.0", + "symfony/mailer": "^5.4 || ^6", + "symfony/mime": "^5.4 || ^6" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", @@ -2841,7 +2831,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.3.5" + "source": "https://github.com/Seldaek/monolog/tree/2.7.0" }, "funding": [ { @@ -2853,7 +2843,7 @@ "type": "tidelift" } ], - "time": "2021-10-01T21:08:31+00:00" + "time": "2022-06-09T08:59:12+00:00" }, { "name": "moontoast/math", @@ -2912,16 +2902,16 @@ }, { "name": "nesbot/carbon", - "version": "2.55.2", + "version": "2.58.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "8c2a18ce3e67c34efc1b29f64fe61304368259a2" + "reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8c2a18ce3e67c34efc1b29f64fe61304368259a2", - "reference": "8c2a18ce3e67c34efc1b29f64fe61304368259a2", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/97a34af22bde8d0ac20ab34b29d7bfe360902055", + "reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055", "shasum": "" }, "require": { @@ -2938,8 +2928,9 @@ "kylekatarnls/multi-tester": "^2.0", "phpmd/phpmd": "^2.9", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.54", - "phpunit/phpunit": "^7.5.20 || ^8.5.14", + "phpstan/phpstan": "^0.12.54 || ^1.0", + "phpunit/php-file-iterator": "^2.0.5", + "phpunit/phpunit": "^7.5.20 || ^8.5.23", "squizlabs/php_codesniffer": "^3.4" }, "bin": [ @@ -3004,20 +2995,20 @@ "type": "tidelift" } ], - "time": "2021-12-03T14:59:52+00:00" + "time": "2022-04-25T19:31:17+00:00" }, { "name": "nikic/php-parser", - "version": "v4.13.2", + "version": "v4.14.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077" + "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1", + "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1", "shasum": "" }, "require": { @@ -3058,9 +3049,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0" }, - "time": "2021-11-30T19:35:32+00:00" + "time": "2022-05-31T20:59:12+00:00" }, { "name": "nwidart/laravel-modules", @@ -3104,12 +3095,12 @@ } }, "autoload": { - "psr-4": { - "Nwidart\\Modules\\": "src" - }, "files": [ "src/helpers.php" - ] + ], + "psr-4": { + "Nwidart\\Modules\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3139,16 +3130,16 @@ }, { "name": "opis/closure", - "version": "3.6.2", + "version": "3.6.3", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "06e2ebd25f2869e54a306dda991f7db58066f7f6" + "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/06e2ebd25f2869e54a306dda991f7db58066f7f6", - "reference": "06e2ebd25f2869e54a306dda991f7db58066f7f6", + "url": "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad", + "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad", "shasum": "" }, "require": { @@ -3165,12 +3156,12 @@ } }, "autoload": { - "psr-4": { - "Opis\\Closure\\": "src/" - }, "files": [ "functions.php" - ] + ], + "psr-4": { + "Opis\\Closure\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3198,9 +3189,9 @@ ], "support": { "issues": "https://github.com/opis/closure/issues", - "source": "https://github.com/opis/closure/tree/3.6.2" + "source": "https://github.com/opis/closure/tree/3.6.3" }, - "time": "2021-04-09T13:42:10+00:00" + "time": "2022-01-27T09:35:39+00:00" }, { "name": "phpoption/phpoption", @@ -3337,16 +3328,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "2.0.35", + "version": "2.0.37", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "4e16cf3f5f927a7d3f5317820af795c0366c0420" + "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/4e16cf3f5f927a7d3f5317820af795c0366c0420", - "reference": "4e16cf3f5f927a7d3f5317820af795c0366c0420", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c812fbb4d6b4d7f30235ab7298a12f09ba13b37c", + "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c", "shasum": "" }, "require": { @@ -3426,7 +3417,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/2.0.35" + "source": "https://github.com/phpseclib/phpseclib/tree/2.0.37" }, "funding": [ { @@ -3442,7 +3433,7 @@ "type": "tidelift" } ], - "time": "2021-11-28T23:30:39+00:00" + "time": "2022-04-04T04:57:45+00:00" }, { "name": "psr/container", @@ -3805,36 +3796,37 @@ }, { "name": "psy/psysh", - "version": "v0.10.12", + "version": "v0.11.5", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d" + "reference": "c23686f9c48ca202710dbb967df8385a952a2daf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a0d9981aa07ecfcbea28e4bfa868031cca121e7d", - "reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/c23686f9c48ca202710dbb967df8385a952a2daf", + "reference": "c23686f9c48ca202710dbb967df8385a952a2daf", "shasum": "" }, "require": { "ext-json": "*", "ext-tokenizer": "*", - "nikic/php-parser": "~4.0|~3.0|~2.0|~1.3", - "php": "^8.0 || ^7.0 || ^5.5.9", - "symfony/console": "~5.0|~4.0|~3.0|^2.4.2|~2.3.10", - "symfony/var-dumper": "~5.0|~4.0|~3.0|~2.7" + "nikic/php-parser": "^4.0 || ^3.1", + "php": "^8.0 || ^7.0.8", + "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4", + "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4" + }, + "conflict": { + "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.2", - "hoa/console": "3.17.*" + "bamarni/composer-bin-plugin": "^1.2" }, "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", "ext-pdo-sqlite": "The doc command requires SQLite to work.", "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history.", - "hoa/console": "A pure PHP readline implementation. You'll want this if your PHP install doesn't already support readline or libedit." + "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history." }, "bin": [ "bin/psysh" @@ -3842,7 +3834,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "0.10.x-dev" + "dev-main": "0.11.x-dev" } }, "autoload": { @@ -3874,9 +3866,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.10.12" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.5" }, - "time": "2021-11-30T14:05:36+00:00" + "time": "2022-05-27T18:03:49+00:00" }, { "name": "ralouphie/getallheaders", @@ -4066,12 +4058,12 @@ } }, "autoload": { - "psr-4": { - "Ramsey\\Uuid\\": "src/" - }, "files": [ "src/functions.php" - ] + ], + "psr-4": { + "Ramsey\\Uuid\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4452,16 +4444,16 @@ }, { "name": "spatie/laravel-query-builder", - "version": "3.6.1", + "version": "3.6.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-query-builder.git", - "reference": "b78b14d60271e4f3a803d0707adb73006730d781" + "reference": "3768381e9f2f80b01f0088eca49f061c269e0e8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/b78b14d60271e4f3a803d0707adb73006730d781", - "reference": "b78b14d60271e4f3a803d0707adb73006730d781", + "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/3768381e9f2f80b01f0088eca49f061c269e0e8b", + "reference": "3768381e9f2f80b01f0088eca49f061c269e0e8b", "shasum": "" }, "require": { @@ -4518,24 +4510,24 @@ "type": "custom" } ], - "time": "2021-11-17T15:39:59+00:00" + "time": "2022-01-09T15:39:13+00:00" }, { "name": "splitbrain/php-archive", - "version": "1.2.1", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/splitbrain/php-archive.git", - "reference": "211a2198b73b233d7d2b6159462e11cd9a91348a" + "reference": "d274e5190ba309777926348900cf9578d9e533c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/211a2198b73b233d7d2b6159462e11cd9a91348a", - "reference": "211a2198b73b233d7d2b6159462e11cd9a91348a", + "url": "https://api.github.com/repos/splitbrain/php-archive/zipball/d274e5190ba309777926348900cf9578d9e533c9", + "reference": "d274e5190ba309777926348900cf9578d9e533c9", "shasum": "" }, "require": { - "php": ">=5.4" + "php": ">=7.0" }, "require-dev": { "ext-bz2": "*", @@ -4544,8 +4536,10 @@ "phpunit/phpunit": "^8" }, "suggest": { + "ext-bz2": "For bz2 compression", "ext-iconv": "Used for proper filename encode handling", - "ext-mbstring": "Can be used alternatively for handling filename encoding" + "ext-mbstring": "Can be used alternatively for handling filename encoding", + "ext-zlib": "For zlib compression" }, "type": "library", "autoload": { @@ -4574,9 +4568,9 @@ ], "support": { "issues": "https://github.com/splitbrain/php-archive/issues", - "source": "https://github.com/splitbrain/php-archive/tree/1.2.1" + "source": "https://github.com/splitbrain/php-archive/tree/1.3.1" }, - "time": "2021-02-22T17:59:24+00:00" + "time": "2022-03-23T09:21:55+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -4656,16 +4650,16 @@ }, { "name": "symfony/console", - "version": "v5.4.1", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4" + "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4", - "reference": "9130e1a0fc93cb0faadca4ee917171bd2ca9e5f4", + "url": "https://api.github.com/repos/symfony/console/zipball/829d5d1bf60b2efeb0887b7436873becc71a45eb", + "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb", "shasum": "" }, "require": { @@ -4735,7 +4729,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.1" + "source": "https://github.com/symfony/console/tree/v5.4.9" }, "funding": [ { @@ -4751,20 +4745,20 @@ "type": "tidelift" } ], - "time": "2021-12-09T11:22:43+00:00" + "time": "2022-05-18T06:17:34+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.0", + "version": "v5.4.3", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "44b933f98bb4b5220d10bed9ce5662f8c2d13dcc" + "reference": "b0a190285cd95cb019237851205b8140ef6e368e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/44b933f98bb4b5220d10bed9ce5662f8c2d13dcc", - "reference": "44b933f98bb4b5220d10bed9ce5662f8c2d13dcc", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/b0a190285cd95cb019237851205b8140ef6e368e", + "reference": "b0a190285cd95cb019237851205b8140ef6e368e", "shasum": "" }, "require": { @@ -4801,7 +4795,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.0" + "source": "https://github.com/symfony/css-selector/tree/v5.4.3" }, "funding": [ { @@ -4817,20 +4811,20 @@ "type": "tidelift" } ], - "time": "2021-09-09T08:06:01+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", - "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", "shasum": "" }, "require": { @@ -4868,7 +4862,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1" }, "funding": [ { @@ -4884,20 +4878,20 @@ "type": "tidelift" } ], - "time": "2021-07-12T14:48:14+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/error-handler", - "version": "v5.4.1", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "1e3cb3565af49cd5f93e5787500134500a29f0d9" + "reference": "c116cda1f51c678782768dce89a45f13c949455d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/1e3cb3565af49cd5f93e5787500134500a29f0d9", - "reference": "1e3cb3565af49cd5f93e5787500134500a29f0d9", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/c116cda1f51c678782768dce89a45f13c949455d", + "reference": "c116cda1f51c678782768dce89a45f13c949455d", "shasum": "" }, "require": { @@ -4939,7 +4933,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v5.4.1" + "source": "https://github.com/symfony/error-handler/tree/v5.4.9" }, "funding": [ { @@ -4955,20 +4949,20 @@ "type": "tidelift" } ], - "time": "2021-12-01T15:04:08+00:00" + "time": "2022-05-21T13:57:48+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.0", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb" + "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb", - "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", + "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", "shasum": "" }, "require": { @@ -5024,7 +5018,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.0" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9" }, "funding": [ { @@ -5040,20 +5034,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-05-05T16:45:39+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a" + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", - "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", "shasum": "" }, "require": { @@ -5103,7 +5097,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.1" }, "funding": [ { @@ -5119,20 +5113,20 @@ "type": "tidelift" } ], - "time": "2021-07-12T14:48:14+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/finder", - "version": "v5.4.0", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "d2f29dac98e96a98be467627bd49c2efb1bc2590" + "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/d2f29dac98e96a98be467627bd49c2efb1bc2590", - "reference": "d2f29dac98e96a98be467627bd49c2efb1bc2590", + "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9", + "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9", "shasum": "" }, "require": { @@ -5166,7 +5160,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.0" + "source": "https://github.com/symfony/finder/tree/v5.4.8" }, "funding": [ { @@ -5182,20 +5176,20 @@ "type": "tidelift" } ], - "time": "2021-11-28T15:25:38+00:00" + "time": "2022-04-15T08:07:45+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.4.1", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "5dad3780023a707f4c24beac7d57aead85c1ce3c" + "reference": "6b0d0e4aca38d57605dcd11e2416994b38774522" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5dad3780023a707f4c24beac7d57aead85c1ce3c", - "reference": "5dad3780023a707f4c24beac7d57aead85c1ce3c", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6b0d0e4aca38d57605dcd11e2416994b38774522", + "reference": "6b0d0e4aca38d57605dcd11e2416994b38774522", "shasum": "" }, "require": { @@ -5239,7 +5233,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.1" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.9" }, "funding": [ { @@ -5255,20 +5249,20 @@ "type": "tidelift" } ], - "time": "2021-12-09T12:46:57+00:00" + "time": "2022-05-17T15:07:29+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.4.1", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "2bdace75c9d6a6eec7e318801b7dc87a72375052" + "reference": "34b121ad3dc761f35fe1346d2f15618f8cbf77f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2bdace75c9d6a6eec7e318801b7dc87a72375052", - "reference": "2bdace75c9d6a6eec7e318801b7dc87a72375052", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/34b121ad3dc761f35fe1346d2f15618f8cbf77f8", + "reference": "34b121ad3dc761f35fe1346d2f15618f8cbf77f8", "shasum": "" }, "require": { @@ -5351,7 +5345,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v5.4.1" + "source": "https://github.com/symfony/http-kernel/tree/v5.4.9" }, "funding": [ { @@ -5367,20 +5361,20 @@ "type": "tidelift" } ], - "time": "2021-12-09T13:36:09+00:00" + "time": "2022-05-27T07:09:08+00:00" }, { "name": "symfony/mime", - "version": "v5.4.0", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "d4365000217b67c01acff407573906ff91bcfb34" + "reference": "2b3802a24e48d0cfccf885173d2aac91e73df92e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/d4365000217b67c01acff407573906ff91bcfb34", - "reference": "d4365000217b67c01acff407573906ff91bcfb34", + "url": "https://api.github.com/repos/symfony/mime/zipball/2b3802a24e48d0cfccf885173d2aac91e73df92e", + "reference": "2b3802a24e48d0cfccf885173d2aac91e73df92e", "shasum": "" }, "require": { @@ -5434,7 +5428,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.0" + "source": "https://github.com/symfony/mime/tree/v5.4.9" }, "funding": [ { @@ -5450,32 +5444,35 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-05-21T10:24:18+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.23.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-ctype": "*" + }, "suggest": { "ext-ctype": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5483,12 +5480,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5513,7 +5510,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" }, "funding": [ { @@ -5529,32 +5526,35 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.23.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933" + "reference": "143f1881e655bebca1312722af8068de235ae5dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933", - "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc", + "reference": "143f1881e655bebca1312722af8068de235ae5dc", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-iconv": "*" + }, "suggest": { "ext-iconv": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5562,12 +5562,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Iconv\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Iconv\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5593,7 +5593,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.26.0" }, "funding": [ { @@ -5609,20 +5609,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.23.1", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "16880ba9c5ebe3642d1995ab866db29270b36535" + "reference": "433d05519ce6990bf3530fba6957499d327395c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535", - "reference": "16880ba9c5ebe3642d1995ab866db29270b36535", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", + "reference": "433d05519ce6990bf3530fba6957499d327395c2", "shasum": "" }, "require": { @@ -5634,7 +5634,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5642,12 +5642,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5674,7 +5674,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" }, "funding": [ { @@ -5690,20 +5690,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.23.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65" + "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8", + "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8", "shasum": "" }, "require": { @@ -5717,7 +5717,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5725,12 +5725,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5761,7 +5761,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0" }, "funding": [ { @@ -5777,20 +5777,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.23.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" + "reference": "219aa369ceff116e673852dce47c3a41794c14bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", - "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", + "reference": "219aa369ceff116e673852dce47c3a41794c14bd", "shasum": "" }, "require": { @@ -5802,7 +5802,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5810,12 +5810,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -5845,7 +5845,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" }, "funding": [ { @@ -5861,32 +5861,35 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.1", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-mbstring": "*" + }, "suggest": { "ext-mbstring": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5894,12 +5897,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5925,7 +5928,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" }, "funding": [ { @@ -5941,20 +5944,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.23.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" + "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", + "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", "shasum": "" }, "require": { @@ -5963,7 +5966,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5971,12 +5974,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -6001,7 +6004,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0" }, "funding": [ { @@ -6017,20 +6020,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:17:38+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.23.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" + "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", + "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", "shasum": "" }, "require": { @@ -6039,7 +6042,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6047,12 +6050,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -6080,7 +6083,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0" }, "funding": [ { @@ -6096,20 +6099,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.23.1", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", "shasum": "" }, "require": { @@ -6118,7 +6121,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6126,12 +6129,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -6163,7 +6166,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" }, "funding": [ { @@ -6179,20 +6182,20 @@ "type": "tidelift" } ], - "time": "2021-07-28T13:41:28+00:00" + "time": "2022-05-10T07:21:04+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.23.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "e66119f3de95efc359483f810c4c3e6436279436" + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436", - "reference": "e66119f3de95efc359483f810c4c3e6436279436", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", "shasum": "" }, "require": { @@ -6201,7 +6204,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6209,12 +6212,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -6242,7 +6245,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" }, "funding": [ { @@ -6258,20 +6261,20 @@ "type": "tidelift" } ], - "time": "2021-05-21T13:25:03+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/process", - "version": "v5.4.0", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "5be20b3830f726e019162b26223110c8f47cf274" + "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/5be20b3830f726e019162b26223110c8f47cf274", - "reference": "5be20b3830f726e019162b26223110c8f47cf274", + "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", + "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", "shasum": "" }, "require": { @@ -6304,7 +6307,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.0" + "source": "https://github.com/symfony/process/tree/v5.4.8" }, "funding": [ { @@ -6320,20 +6323,20 @@ "type": "tidelift" } ], - "time": "2021-11-28T15:25:38+00:00" + "time": "2022-04-08T05:07:18+00:00" }, { "name": "symfony/property-access", - "version": "v5.4.0", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "07db4e9d1f0bf4b8a0c60a25b2672f20ab8f3562" + "reference": "fe501d498d6ec7e9efe928c90fabedf629116495" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/07db4e9d1f0bf4b8a0c60a25b2672f20ab8f3562", - "reference": "07db4e9d1f0bf4b8a0c60a25b2672f20ab8f3562", + "url": "https://api.github.com/repos/symfony/property-access/zipball/fe501d498d6ec7e9efe928c90fabedf629116495", + "reference": "fe501d498d6ec7e9efe928c90fabedf629116495", "shasum": "" }, "require": { @@ -6385,7 +6388,7 @@ "reflection" ], "support": { - "source": "https://github.com/symfony/property-access/tree/v5.4.0" + "source": "https://github.com/symfony/property-access/tree/v5.4.8" }, "funding": [ { @@ -6401,20 +6404,20 @@ "type": "tidelift" } ], - "time": "2021-11-28T15:25:38+00:00" + "time": "2022-04-12T15:48:08+00:00" }, { "name": "symfony/property-info", - "version": "v5.4.0", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "c21b4221522779537e9693d51536d8174579b1fd" + "reference": "6f0a452aaba45e763f89e328df437f73a720e18e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/c21b4221522779537e9693d51536d8174579b1fd", - "reference": "c21b4221522779537e9693d51536d8174579b1fd", + "url": "https://api.github.com/repos/symfony/property-info/zipball/6f0a452aaba45e763f89e328df437f73a720e18e", + "reference": "6f0a452aaba45e763f89e328df437f73a720e18e", "shasum": "" }, "require": { @@ -6476,7 +6479,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v5.4.0" + "source": "https://github.com/symfony/property-info/tree/v5.4.9" }, "funding": [ { @@ -6492,20 +6495,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-05-17T09:47:20+00:00" }, { "name": "symfony/routing", - "version": "v5.4.0", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "9eeae93c32ca86746e5d38f3679e9569981038b1" + "reference": "e07817bb6244ea33ef5ad31abc4a9288bef3f2f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/9eeae93c32ca86746e5d38f3679e9569981038b1", - "reference": "9eeae93c32ca86746e5d38f3679e9569981038b1", + "url": "https://api.github.com/repos/symfony/routing/zipball/e07817bb6244ea33ef5ad31abc4a9288bef3f2f7", + "reference": "e07817bb6244ea33ef5ad31abc4a9288bef3f2f7", "shasum": "" }, "require": { @@ -6566,7 +6569,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v5.4.0" + "source": "https://github.com/symfony/routing/tree/v5.4.8" }, "funding": [ { @@ -6582,20 +6585,20 @@ "type": "tidelift" } ], - "time": "2021-11-23T10:19:22+00:00" + "time": "2022-04-18T21:45:37+00:00" }, { "name": "symfony/serializer", - "version": "v5.4.0", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "66942cf6bf412ca72c39353596f4d37ee0f9059b" + "reference": "b54815117a06a8120604bdf00219e3a55288ee1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/66942cf6bf412ca72c39353596f4d37ee0f9059b", - "reference": "66942cf6bf412ca72c39353596f4d37ee0f9059b", + "url": "https://api.github.com/repos/symfony/serializer/zipball/b54815117a06a8120604bdf00219e3a55288ee1e", + "reference": "b54815117a06a8120604bdf00219e3a55288ee1e", "shasum": "" }, "require": { @@ -6610,7 +6613,8 @@ "phpdocumentor/type-resolver": "<1.4.0", "symfony/dependency-injection": "<4.4", "symfony/property-access": "<5.4", - "symfony/property-info": "<5.3", + "symfony/property-info": "<5.3.13", + "symfony/uid": "<5.3", "symfony/yaml": "<4.4" }, "require-dev": { @@ -6626,8 +6630,8 @@ "symfony/http-kernel": "^4.4|^5.0|^6.0", "symfony/mime": "^4.4|^5.0|^6.0", "symfony/property-access": "^5.4|^6.0", - "symfony/property-info": "^5.3|^6.0", - "symfony/uid": "^5.1|^6.0", + "symfony/property-info": "^5.3.13|^6.0", + "symfony/uid": "^5.3|^6.0", "symfony/validator": "^4.4|^5.0|^6.0", "symfony/var-dumper": "^4.4|^5.0|^6.0", "symfony/var-exporter": "^4.4|^5.0|^6.0", @@ -6668,7 +6672,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v5.4.0" + "source": "https://github.com/symfony/serializer/tree/v5.4.9" }, "funding": [ { @@ -6684,26 +6688,26 @@ "type": "tidelift" } ], - "time": "2021-11-28T15:25:38+00:00" + "time": "2022-05-10T09:18:46+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" + "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", - "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c", + "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c", "shasum": "" }, "require": { "php": ">=7.2.5", "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1" + "symfony/deprecation-contracts": "^2.1|^3" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -6751,7 +6755,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.1" }, "funding": [ { @@ -6767,20 +6771,20 @@ "type": "tidelift" } ], - "time": "2021-11-04T16:48:04+00:00" + "time": "2022-03-13T20:07:29+00:00" }, { "name": "symfony/string", - "version": "v5.4.0", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d" + "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d", - "reference": "9ffaaba53c61ba75a3c7a3a779051d1e9ec4fd2d", + "url": "https://api.github.com/repos/symfony/string/zipball/985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", + "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", "shasum": "" }, "require": { @@ -6802,12 +6806,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Symfony\\Component\\String\\": "" - }, "files": [ "Resources/functions.php" ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, "exclude-from-classmap": [ "/Tests/" ] @@ -6837,7 +6841,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.0" + "source": "https://github.com/symfony/string/tree/v5.4.9" }, "funding": [ { @@ -6853,20 +6857,20 @@ "type": "tidelift" } ], - "time": "2021-11-24T10:02:00+00:00" + "time": "2022-04-19T10:40:37+00:00" }, { "name": "symfony/translation", - "version": "v5.4.1", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "8c82cd35ed861236138d5ae1c78c0c7ebcd62107" + "reference": "1639abc1177d26bcd4320e535e664cef067ab0ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/8c82cd35ed861236138d5ae1c78c0c7ebcd62107", - "reference": "8c82cd35ed861236138d5ae1c78c0c7ebcd62107", + "url": "https://api.github.com/repos/symfony/translation/zipball/1639abc1177d26bcd4320e535e664cef067ab0ca", + "reference": "1639abc1177d26bcd4320e535e664cef067ab0ca", "shasum": "" }, "require": { @@ -6934,7 +6938,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v5.4.1" + "source": "https://github.com/symfony/translation/tree/v5.4.9" }, "funding": [ { @@ -6950,20 +6954,20 @@ "type": "tidelift" } ], - "time": "2021-12-05T20:33:52+00:00" + "time": "2022-05-06T12:33:37+00:00" }, { "name": "symfony/translation-contracts", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e" + "reference": "1211df0afa701e45a04253110e959d4af4ef0f07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/d28150f0f44ce854e942b671fc2620a98aae1b1e", - "reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07", + "reference": "1211df0afa701e45a04253110e959d4af4ef0f07", "shasum": "" }, "require": { @@ -7012,7 +7016,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/translation-contracts/tree/v2.5.1" }, "funding": [ { @@ -7028,20 +7032,20 @@ "type": "tidelift" } ], - "time": "2021-08-17T14:20:01+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.4.1", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "2366ac8d8abe0c077844613c1a4f0c0a9f522dcc" + "reference": "af52239a330fafd192c773795520dc2dd62b5657" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2366ac8d8abe0c077844613c1a4f0c0a9f522dcc", - "reference": "2366ac8d8abe0c077844613c1a4f0c0a9f522dcc", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657", + "reference": "af52239a330fafd192c773795520dc2dd62b5657", "shasum": "" }, "require": { @@ -7101,7 +7105,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.1" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.9" }, "funding": [ { @@ -7117,7 +7121,7 @@ "type": "tidelift" } ], - "time": "2021-12-01T15:04:08+00:00" + "time": "2022-05-21T10:24:18+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -7254,16 +7258,16 @@ }, { "name": "voku/portable-ascii", - "version": "1.5.6", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/voku/portable-ascii.git", - "reference": "80953678b19901e5165c56752d087fc11526017c" + "reference": "87337c91b9dfacee02452244ee14ab3c43bc485a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-ascii/zipball/80953678b19901e5165c56752d087fc11526017c", - "reference": "80953678b19901e5165c56752d087fc11526017c", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/87337c91b9dfacee02452244ee14ab3c43bc485a", + "reference": "87337c91b9dfacee02452244ee14ab3c43bc485a", "shasum": "" }, "require": { @@ -7300,7 +7304,7 @@ ], "support": { "issues": "https://github.com/voku/portable-ascii/issues", - "source": "https://github.com/voku/portable-ascii/tree/1.5.6" + "source": "https://github.com/voku/portable-ascii/tree/1.6.1" }, "funding": [ { @@ -7324,25 +7328,25 @@ "type": "tidelift" } ], - "time": "2020-11-12T00:07:28+00:00" + "time": "2022-01-24T18:55:24+00:00" }, { "name": "webmozart/assert", - "version": "1.10.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", - "symfony/polyfill-ctype": "^1.8" + "ext-ctype": "*", + "php": "^7.2 || ^8.0" }, "conflict": { "phpstan/phpstan": "<0.12.20", @@ -7380,38 +7384,38 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.10.0" + "source": "https://github.com/webmozarts/assert/tree/1.11.0" }, - "time": "2021-03-09T10:59:23+00:00" + "time": "2022-06-03T18:03:27+00:00" } ], "packages-dev": [ { "name": "barryvdh/laravel-debugbar", - "version": "v3.6.5", + "version": "v3.6.7", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "ccf109f8755dcc7e58779d1aeb1051b04e0b4bef" + "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/ccf109f8755dcc7e58779d1aeb1051b04e0b4bef", - "reference": "ccf109f8755dcc7e58779d1aeb1051b04e0b4bef", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b96f9820aaf1ff9afe945207883149e1c7afb298", + "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298", "shasum": "" }, "require": { - "illuminate/routing": "^6|^7|^8", - "illuminate/session": "^6|^7|^8", - "illuminate/support": "^6|^7|^8", + "illuminate/routing": "^6|^7|^8|^9", + "illuminate/session": "^6|^7|^8|^9", + "illuminate/support": "^6|^7|^8|^9", "maximebf/debugbar": "^1.17.2", "php": ">=7.2", - "symfony/debug": "^4.3|^5", - "symfony/finder": "^4.3|^5" + "symfony/debug": "^4.3|^5|^6", + "symfony/finder": "^4.3|^5|^6" }, "require-dev": { "mockery/mockery": "^1.3.3", - "orchestra/testbench-dusk": "^4|^5|^6", + "orchestra/testbench-dusk": "^4|^5|^6|^7", "phpunit/phpunit": "^8.5|^9.0", "squizlabs/php_codesniffer": "^3.5" }, @@ -7430,12 +7434,12 @@ } }, "autoload": { - "psr-4": { - "Barryvdh\\Debugbar\\": "src/" - }, "files": [ "src/helpers.php" - ] + ], + "psr-4": { + "Barryvdh\\Debugbar\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -7457,7 +7461,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-debugbar/issues", - "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.5" + "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.7" }, "funding": [ { @@ -7469,30 +7473,30 @@ "type": "github" } ], - "time": "2021-12-14T14:45:18+00:00" + "time": "2022-02-09T07:52:32+00:00" }, { "name": "barryvdh/laravel-ide-helper", - "version": "v2.10.0", + "version": "v2.12.3", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "73b1012b927633a1b4cd623c2e6b1678e6faef08" + "reference": "3ba1e2573b38f72107b8aacc4ee177fcab30a550" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/73b1012b927633a1b4cd623c2e6b1678e6faef08", - "reference": "73b1012b927633a1b4cd623c2e6b1678e6faef08", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/3ba1e2573b38f72107b8aacc4ee177fcab30a550", + "reference": "3ba1e2573b38f72107b8aacc4ee177fcab30a550", "shasum": "" }, "require": { "barryvdh/reflection-docblock": "^2.0.6", - "composer/composer": "^1.6 || ^2", + "composer/pcre": "^1 || ^2 || ^3", "doctrine/dbal": "^2.6 || ^3", "ext-json": "*", - "illuminate/console": "^8", - "illuminate/filesystem": "^8", - "illuminate/support": "^8", + "illuminate/console": "^8 || ^9", + "illuminate/filesystem": "^8 || ^9", + "illuminate/support": "^8 || ^9", "nikic/php-parser": "^4.7", "php": "^7.3 || ^8.0", "phpdocumentor/type-resolver": "^1.1.0" @@ -7500,21 +7504,21 @@ "require-dev": { "ext-pdo_sqlite": "*", "friendsofphp/php-cs-fixer": "^2", - "illuminate/config": "^8", - "illuminate/view": "^8", + "illuminate/config": "^8 || ^9", + "illuminate/view": "^8 || ^9", "mockery/mockery": "^1.4", - "orchestra/testbench": "^6", + "orchestra/testbench": "^6 || ^7", "phpunit/phpunit": "^8.5 || ^9", "spatie/phpunit-snapshot-assertions": "^3 || ^4", "vimeo/psalm": "^3.12" }, "suggest": { - "illuminate/events": "Required for automatic helper generation (^6|^7|^8)." + "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.9-dev" + "dev-master": "2.12-dev" }, "laravel": { "providers": [ @@ -7551,15 +7555,19 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-ide-helper/issues", - "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v2.10.0" + "source": "https://github.com/barryvdh/laravel-ide-helper/tree/v2.12.3" }, "funding": [ + { + "url": "https://fruitcake.nl", + "type": "custom" + }, { "url": "https://github.com/barryvdh", "type": "github" } ], - "time": "2021-04-09T06:17:55+00:00" + "time": "2022-03-06T14:33:42+00:00" }, { "name": "barryvdh/reflection-docblock", @@ -7614,39 +7622,36 @@ "time": "2018-12-13T10:34:14+00:00" }, { - "name": "composer/ca-bundle", - "version": "1.3.1", + "name": "composer/pcre", + "version": "2.0.0", "source": { "type": "git", - "url": "https://github.com/composer/ca-bundle.git", - "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b" + "url": "https://github.com/composer/pcre.git", + "reference": "c8e9d27cfc5ed22643c19c160455b473ffd8aabe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b", - "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b", + "url": "https://api.github.com/repos/composer/pcre/zipball/c8e9d27cfc5ed22643c19c160455b473ffd8aabe", + "reference": "c8e9d27cfc5ed22643c19c160455b473ffd8aabe", "shasum": "" }, "require": { - "ext-openssl": "*", - "ext-pcre": "*", - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", - "psr/log": "^1.0", - "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0" + "phpstan/phpstan": "^1.3", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^5" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.x-dev" + "dev-main": "2.x-dev" } }, "autoload": { "psr-4": { - "Composer\\CaBundle\\": "src" + "Composer\\Pcre\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -7660,18 +7665,16 @@ "homepage": "http://seld.be" } ], - "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.", + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", "keywords": [ - "cabundle", - "cacert", - "certificate", - "ssl", - "tls" + "PCRE", + "preg", + "regex", + "regular expression" ], "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.3.1" + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/2.0.0" }, "funding": [ { @@ -7687,61 +7690,39 @@ "type": "tidelift" } ], - "time": "2021-10-28T20:44:15+00:00" + "time": "2022-02-25T20:05:29+00:00" }, { - "name": "composer/composer", - "version": "2.2.1", + "name": "doctrine/instantiator", + "version": "1.4.1", "source": { "type": "git", - "url": "https://github.com/composer/composer.git", - "reference": "bbc265e16561ab8e0f5e7cac395ea72640251f0c" + "url": "https://github.com/doctrine/instantiator.git", + "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/bbc265e16561ab8e0f5e7cac395ea72640251f0c", - "reference": "bbc265e16561ab8e0f5e7cac395ea72640251f0c", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", + "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", "shasum": "" }, "require": { - "composer/ca-bundle": "^1.0", - "composer/metadata-minifier": "^1.0", - "composer/pcre": "^1.0", - "composer/semver": "^3.0", - "composer/spdx-licenses": "^1.2", - "composer/xdebug-handler": "^2.0", - "justinrainbow/json-schema": "^5.2.11", - "php": "^5.3.2 || ^7.0 || ^8.0", - "psr/log": "^1.0 || ^2.0", - "react/promise": "^1.2 || ^2.7", - "seld/jsonlint": "^1.4", - "seld/phar-utils": "^1.0", - "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", - "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", - "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", - "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0" + "php": "^7.1 || ^8.0" }, "require-dev": { - "phpspec/prophecy": "^1.10", - "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" - }, - "suggest": { - "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", - "ext-zip": "Enabling the zip extension allows you to unzip archives", - "ext-zlib": "Allow gzip compression of HTTP requests" + "doctrine/coding-standard": "^9", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^0.16 || ^1", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.22" }, - "bin": [ - "bin/composer" - ], "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.2-dev" - } - }, "autoload": { "psr-4": { - "Composer\\": "src/Composer" + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" } }, "notification-url": "https://packagist.org/downloads/", @@ -7750,497 +7731,54 @@ ], "authors": [ { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "https://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "https://seld.be" + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "https://ocramius.github.io/" } ], - "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.", - "homepage": "https://getcomposer.org/", + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", "keywords": [ - "autoload", - "dependency", - "package" + "constructor", + "instantiate" ], "support": { - "irc": "ircs://irc.libera.chat:6697/composer", - "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.2.1" + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/1.4.1" }, "funding": [ { - "url": "https://packagist.com", + "url": "https://www.doctrine-project.org/sponsorship.html", "type": "custom" }, { - "url": "https://github.com/composer", - "type": "github" + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" }, { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", "type": "tidelift" } ], - "time": "2021-12-22T21:21:31+00:00" + "time": "2022-03-03T08:28:38+00:00" }, { - "name": "composer/metadata-minifier", - "version": "1.0.0", + "name": "filp/whoops", + "version": "2.14.5", "source": { "type": "git", - "url": "https://github.com/composer/metadata-minifier.git", - "reference": "c549d23829536f0d0e984aaabbf02af91f443207" + "url": "https://github.com/filp/whoops.git", + "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/metadata-minifier/zipball/c549d23829536f0d0e984aaabbf02af91f443207", - "reference": "c549d23829536f0d0e984aaabbf02af91f443207", + "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", + "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" - }, - "require-dev": { - "composer/composer": "^2", - "phpstan/phpstan": "^0.12.55", - "symfony/phpunit-bridge": "^4.2 || ^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\MetadataMinifier\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "Small utility library that handles metadata minification and expansion.", - "keywords": [ - "composer", - "compression" - ], - "support": { - "issues": "https://github.com/composer/metadata-minifier/issues", - "source": "https://github.com/composer/metadata-minifier/tree/1.0.0" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2021-04-07T13:37:33+00:00" - }, - { - "name": "composer/pcre", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/composer/pcre.git", - "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", - "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^1", - "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\Pcre\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "PCRE wrapping library that offers type-safe preg_* replacements.", - "keywords": [ - "PCRE", - "preg", - "regex", - "regular expression" - ], - "support": { - "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/1.0.0" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2021-12-06T15:17:27+00:00" - }, - { - "name": "composer/semver", - "version": "3.2.6", - "source": { - "type": "git", - "url": "https://github.com/composer/semver.git", - "reference": "83e511e247de329283478496f7a1e114c9517506" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506", - "reference": "83e511e247de329283478496f7a1e114c9517506", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^0.12.54", - "symfony/phpunit-bridge": "^4.2 || ^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\Semver\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - }, - { - "name": "Rob Bast", - "email": "rob.bast@gmail.com", - "homepage": "http://robbast.nl" - } - ], - "description": "Semver library that offers utilities, version constraint parsing and validation.", - "keywords": [ - "semantic", - "semver", - "validation", - "versioning" - ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.6" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2021-10-25T11:34:17+00:00" - }, - { - "name": "composer/spdx-licenses", - "version": "1.5.6", - "source": { - "type": "git", - "url": "https://github.com/composer/spdx-licenses.git", - "reference": "a30d487169d799745ca7280bc90fdfa693536901" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a30d487169d799745ca7280bc90fdfa693536901", - "reference": "a30d487169d799745ca7280bc90fdfa693536901", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^0.12.55", - "symfony/phpunit-bridge": "^4.2 || ^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\Spdx\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - }, - { - "name": "Rob Bast", - "email": "rob.bast@gmail.com", - "homepage": "http://robbast.nl" - } - ], - "description": "SPDX licenses list and validation library.", - "keywords": [ - "license", - "spdx", - "validator" - ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/spdx-licenses/issues", - "source": "https://github.com/composer/spdx-licenses/tree/1.5.6" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2021-11-18T10:14:14+00:00" - }, - { - "name": "composer/xdebug-handler", - "version": "2.0.3", - "source": { - "type": "git", - "url": "https://github.com/composer/xdebug-handler.git", - "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6555461e76962fd0379c444c46fd558a0fcfb65e", - "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e", - "shasum": "" - }, - "require": { - "composer/pcre": "^1", - "php": "^5.3.2 || ^7.0 || ^8.0", - "psr/log": "^1 || ^2 || ^3" - }, - "require-dev": { - "phpstan/phpstan": "^1.0", - "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Composer\\XdebugHandler\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "John Stevenson", - "email": "john-stevenson@blueyonder.co.uk" - } - ], - "description": "Restarts a process without Xdebug.", - "keywords": [ - "Xdebug", - "performance" - ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.3" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2021-12-08T13:07:32+00:00" - }, - { - "name": "doctrine/instantiator", - "version": "1.4.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^8.0", - "ext-pdo": "*", - "ext-phar": "*", - "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", - "keywords": [ - "constructor", - "instantiate" - ], - "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], - "time": "2020-11-10T18:47:58+00:00" - }, - { - "name": "filp/whoops", - "version": "2.14.4", - "source": { - "type": "git", - "url": "https://github.com/filp/whoops.git", - "reference": "f056f1fe935d9ed86e698905a957334029899895" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/f056f1fe935d9ed86e698905a957334029899895", - "reference": "f056f1fe935d9ed86e698905a957334029899895", - "shasum": "" - }, - "require": { - "php": "^5.5.9 || ^7.0 || ^8.0", - "psr/log": "^1.0.1 || ^2.0 || ^3.0" + "php": "^5.5.9 || ^7.0 || ^8.0", + "psr/log": "^1.0.1 || ^2.0 || ^3.0" }, "require-dev": { "mockery/mockery": "^0.9 || ^1.0", @@ -8285,7 +7823,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.14.4" + "source": "https://github.com/filp/whoops/tree/2.14.5" }, "funding": [ { @@ -8293,7 +7831,7 @@ "type": "github" } ], - "time": "2021-10-03T12:00:00+00:00" + "time": "2022-01-07T12:00:00+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -8346,106 +7884,36 @@ }, "time": "2020-07-09T08:09:16+00:00" }, - { - "name": "justinrainbow/json-schema", - "version": "5.2.11", - "source": { - "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa", - "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", - "json-schema/json-schema-test-suite": "1.2.0", - "phpunit/phpunit": "^4.8.35" - }, - "bin": [ - "bin/validate-json" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "JsonSchema\\": "src/JsonSchema/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bruno Prieto Reis", - "email": "bruno.p.reis@gmail.com" - }, - { - "name": "Justin Rainbow", - "email": "justin.rainbow@gmail.com" - }, - { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch" - }, - { - "name": "Robert Schönthal", - "email": "seroscho@googlemail.com" - } - ], - "description": "A library to validate a json schema.", - "homepage": "https://github.com/justinrainbow/json-schema", - "keywords": [ - "json", - "schema" - ], - "support": { - "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.11" - }, - "time": "2021-07-22T09:24:00+00:00" - }, { "name": "laravel/dusk", - "version": "v6.19.2", + "version": "v6.24.0", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "c042f8d389b8fdcd9543032d1ef8dbe47c8a245f" + "reference": "7fed3695741787d9998c5f04c94adfd62d70e766" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/c042f8d389b8fdcd9543032d1ef8dbe47c8a245f", - "reference": "c042f8d389b8fdcd9543032d1ef8dbe47c8a245f", + "url": "https://api.github.com/repos/laravel/dusk/zipball/7fed3695741787d9998c5f04c94adfd62d70e766", + "reference": "7fed3695741787d9998c5f04c94adfd62d70e766", "shasum": "" }, "require": { "ext-json": "*", "ext-zip": "*", - "illuminate/console": "^6.0|^7.0|^8.0", - "illuminate/support": "^6.0|^7.0|^8.0", + "illuminate/console": "^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0", "nesbot/carbon": "^2.0", "php": "^7.2|^8.0", "php-webdriver/webdriver": "^1.9.0", - "symfony/console": "^4.3|^5.0", - "symfony/finder": "^4.3|^5.0", - "symfony/process": "^4.3|^5.0", - "vlucas/phpdotenv": "^3.0|^4.0|^5.0" + "symfony/console": "^4.3|^5.0|^6.0", + "symfony/finder": "^4.3|^5.0|^6.0", + "symfony/process": "^4.3|^5.0|^6.0", + "vlucas/phpdotenv": "^3.0|^4.0|^5.2" }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench": "^4.16|^5.17.1|^6.12.1", + "orchestra/testbench": "^4.16|^5.17.1|^6.12.1|^7.0", "phpunit/phpunit": "^7.5.15|^8.4|^9.0" }, "suggest": { @@ -8485,31 +7953,32 @@ ], "support": { "issues": "https://github.com/laravel/dusk/issues", - "source": "https://github.com/laravel/dusk/tree/v6.19.2" + "source": "https://github.com/laravel/dusk/tree/v6.24.0" }, - "time": "2021-10-20T10:10:26+00:00" + "time": "2022-05-09T13:43:52+00:00" }, { "name": "maximebf/debugbar", - "version": "v1.17.3", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "e8ac3499af0ea5b440908e06cc0abe5898008b3c" + "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/e8ac3499af0ea5b440908e06cc0abe5898008b3c", - "reference": "e8ac3499af0ea5b440908e06cc0abe5898008b3c", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", + "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", "shasum": "" }, "require": { "php": "^7.1|^8", "psr/log": "^1|^2|^3", - "symfony/var-dumper": "^2.6|^3|^4|^5" + "symfony/var-dumper": "^2.6|^3|^4|^5|^6" }, "require-dev": { - "phpunit/phpunit": "^7.5.20 || ^9.4.2" + "phpunit/phpunit": "^7.5.20 || ^9.4.2", + "twig/twig": "^1.38|^2.7|^3.0" }, "suggest": { "kriswallsmith/assetic": "The best way to manage assets", @@ -8550,9 +8019,9 @@ ], "support": { "issues": "https://github.com/maximebf/php-debugbar/issues", - "source": "https://github.com/maximebf/php-debugbar/tree/v1.17.3" + "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.0" }, - "time": "2021-10-19T12:33:27+00:00" + "time": "2021-12-27T18:49:48+00:00" }, { "name": "mockery/mockery", @@ -8625,37 +8094,38 @@ }, { "name": "myclabs/deep-copy", - "version": "1.10.2", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" + "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", + "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, - "replace": { - "myclabs/deep-copy": "self.version" + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3,<3.2.2" }, "require-dev": { - "doctrine/collections": "^1.0", - "doctrine/common": "^2.6", - "phpunit/phpunit": "^7.1" + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, "files": [ "src/DeepCopy/deep_copy.php" - ] + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -8671,7 +8141,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" }, "funding": [ { @@ -8679,7 +8149,7 @@ "type": "tidelift" } ], - "time": "2020-11-13T09:40:50+00:00" + "time": "2022-03-03T13:19:32+00:00" }, { "name": "phar-io/manifest", @@ -8743,16 +8213,16 @@ }, { "name": "phar-io/version", - "version": "3.1.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/phar-io/version.git", - "reference": "bae7c545bef187884426f042434e561ab1ddb182" + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182", - "reference": "bae7c545bef187884426f042434e561ab1ddb182", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", "shasum": "" }, "require": { @@ -8788,22 +8258,22 @@ "description": "Library for handling version information and constraints", "support": { "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.1.0" + "source": "https://github.com/phar-io/version/tree/3.2.1" }, - "time": "2021-02-23T14:00:09+00:00" + "time": "2022-02-21T01:04:05+00:00" }, { "name": "php-webdriver/webdriver", - "version": "1.12.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/php-webdriver/php-webdriver.git", - "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb" + "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/99d4856ed7dffcdf6a52eccd6551e83d8d557ceb", - "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/b27ddf458d273c7d4602106fcaf978aa0b7fe15a", + "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a", "shasum": "" }, "require": { @@ -8831,12 +8301,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Facebook\\WebDriver\\": "lib/" - }, "files": [ "lib/Exception/TimeoutException.php" - ] + ], + "psr-4": { + "Facebook\\WebDriver\\": "lib/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -8853,9 +8323,9 @@ ], "support": { "issues": "https://github.com/php-webdriver/php-webdriver/issues", - "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.0" + "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.1" }, - "time": "2021-10-14T09:30:02+00:00" + "time": "2022-05-03T12:16:34+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -8969,16 +8439,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.5.1", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae" + "reference": "77a32518733312af16a44300404e945338981de3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae", - "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", + "reference": "77a32518733312af16a44300404e945338981de3", "shasum": "" }, "require": { @@ -9013,9 +8483,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" }, - "time": "2021-10-02T14:08:47+00:00" + "time": "2022-03-15T21:29:03+00:00" }, { "name": "phpspec/prophecy", @@ -9086,16 +8556,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.10", + "version": "9.2.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687" + "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687", - "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f", + "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f", "shasum": "" }, "require": { @@ -9151,7 +8621,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15" }, "funding": [ { @@ -9159,7 +8629,7 @@ "type": "github" } ], - "time": "2021-12-05T09:12:13+00:00" + "time": "2022-03-07T09:28:20+00:00" }, { "name": "phpunit/php-file-iterator", @@ -9404,16 +8874,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.11", + "version": "9.5.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "2406855036db1102126125537adb1406f7242fdd" + "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2406855036db1102126125537adb1406f7242fdd", - "reference": "2406855036db1102126125537adb1406f7242fdd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba", + "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba", "shasum": "" }, "require": { @@ -9429,7 +8899,7 @@ "phar-io/version": "^3.0.2", "php": ">=7.3", "phpspec/prophecy": "^1.12.1", - "phpunit/php-code-coverage": "^9.2.7", + "phpunit/php-code-coverage": "^9.2.13", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -9443,7 +8913,7 @@ "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^2.3.4", + "sebastian/type": "^3.0", "sebastian/version": "^3.0.2" }, "require-dev": { @@ -9464,11 +8934,11 @@ } }, "autoload": { - "classmap": [ - "src/" - ], "files": [ "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -9491,7 +8961,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.11" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20" }, "funding": [ { @@ -9503,57 +8973,7 @@ "type": "github" } ], - "time": "2021-12-25T07:07:57+00:00" - }, - { - "name": "react/promise", - "version": "v2.8.0", - "source": { - "type": "git", - "url": "https://github.com/reactphp/promise.git", - "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4", - "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36" - }, - "type": "library", - "autoload": { - "psr-4": { - "React\\Promise\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jan Sorgalla", - "email": "jsorgalla@gmail.com" - } - ], - "description": "A lightweight implementation of CommonJS Promises/A for PHP", - "keywords": [ - "promise", - "promises" - ], - "support": { - "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v2.8.0" - }, - "time": "2020-05-12T15:16:56+00:00" + "time": "2022-04-01T12:37:26+00:00" }, { "name": "sebastian/cli-parser", @@ -9921,16 +9341,16 @@ }, { "name": "sebastian/environment", - "version": "5.1.3", + "version": "5.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "388b6ced16caa751030f6a69e588299fa09200ac" + "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac", - "reference": "388b6ced16caa751030f6a69e588299fa09200ac", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", "shasum": "" }, "require": { @@ -9972,7 +9392,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" }, "funding": [ { @@ -9980,7 +9400,7 @@ "type": "github" } ], - "time": "2020-09-28T05:52:38+00:00" + "time": "2022-04-03T09:37:03+00:00" }, { "name": "sebastian/exporter", @@ -10061,16 +9481,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.3", + "version": "5.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49" + "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49", - "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", "shasum": "" }, "require": { @@ -10113,7 +9533,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" }, "funding": [ { @@ -10121,7 +9541,7 @@ "type": "github" } ], - "time": "2021-06-11T13:31:12+00:00" + "time": "2022-02-14T08:28:10+00:00" }, { "name": "sebastian/lines-of-code", @@ -10412,28 +9832,28 @@ }, { "name": "sebastian/type", - "version": "2.3.4", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914" + "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914", - "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", + "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", "shasum": "" }, "require": { "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -10456,7 +9876,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/2.3.4" + "source": "https://github.com/sebastianbergmann/type/tree/3.0.0" }, "funding": [ { @@ -10464,7 +9884,7 @@ "type": "github" } ], - "time": "2021-06-15T12:49:02+00:00" + "time": "2022-03-15T09:54:48+00:00" }, { "name": "sebastian/version", @@ -10519,129 +9939,18 @@ ], "time": "2020-09-28T06:39:44+00:00" }, - { - "name": "seld/jsonlint", - "version": "1.8.3", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "9ad6ce79c342fbd44df10ea95511a1b24dee5b57" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9ad6ce79c342fbd44df10ea95511a1b24dee5b57", - "reference": "9ad6ce79c342fbd44df10ea95511a1b24dee5b57", - "shasum": "" - }, - "require": { - "php": "^5.3 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" - }, - "bin": [ - "bin/jsonlint" - ], - "type": "library", - "autoload": { - "psr-4": { - "Seld\\JsonLint\\": "src/Seld/JsonLint/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "JSON Linter", - "keywords": [ - "json", - "linter", - "parser", - "validator" - ], - "support": { - "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.8.3" - }, - "funding": [ - { - "url": "https://github.com/Seldaek", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", - "type": "tidelift" - } - ], - "time": "2020-11-11T09:19:24+00:00" - }, - { - "name": "seld/phar-utils", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/phar-utils.git", - "reference": "9f3452c93ff423469c0d56450431562ca423dcee" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/9f3452c93ff423469c0d56450431562ca423dcee", - "reference": "9f3452c93ff423469c0d56450431562ca423dcee", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Seld\\PharUtils\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" - } - ], - "description": "PHAR file format utilities, for when PHP phars you up", - "keywords": [ - "phar" - ], - "support": { - "issues": "https://github.com/Seldaek/phar-utils/issues", - "source": "https://github.com/Seldaek/phar-utils/tree/1.2.0" - }, - "time": "2021-12-10T11:20:11+00:00" - }, { "name": "symfony/debug", - "version": "v4.4.31", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "43ede438d4cb52cd589ae5dc070e9323866ba8e0" + "reference": "6637e62480b60817b9a6984154a533e8e64c6bd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/43ede438d4cb52cd589ae5dc070e9323866ba8e0", - "reference": "43ede438d4cb52cd589ae5dc070e9323866ba8e0", + "url": "https://api.github.com/repos/symfony/debug/zipball/6637e62480b60817b9a6984154a533e8e64c6bd5", + "reference": "6637e62480b60817b9a6984154a533e8e64c6bd5", "shasum": "" }, "require": { @@ -10680,71 +9989,7 @@ "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.31" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-09-24T13:30:14+00:00" - }, - { - "name": "symfony/filesystem", - "version": "v5.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/731f917dc31edcffec2c6a777f3698c33bea8f01", - "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8", - "symfony/polyfill-php80": "^1.16" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides basic utilities for the filesystem", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.0" + "source": "https://github.com/symfony/debug/tree/v4.4.41" }, "funding": [ { @@ -10760,7 +10005,8 @@ "type": "tidelift" } ], - "time": "2021-10-28T13:39:27+00:00" + "abandoned": "symfony/error-handler", + "time": "2022-04-12T15:19:55+00:00" }, { "name": "symplify/easy-coding-standard", From 67f52469c7616c6360d3e65029d1ca1350a5b311 Mon Sep 17 00:00:00 2001 From: et-nik Date: Sat, 18 Jun 2022 11:36:11 +0200 Subject: [PATCH 22/37] remove shm_size drone io --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 48e2f663..de65ae69 100644 --- a/.drone.yml +++ b/.drone.yml @@ -274,7 +274,6 @@ services: - name: selenium image: selenium/standalone-chrome:4.1.0 - shm_size: 2000000000 environment: HUB_PORT: 4444 SCREEN_WIDTH: 1280 From 7bf4d9c9d333d98f7a8b15bd3ad1f4a1dae818a2 Mon Sep 17 00:00:00 2001 From: et-nik Date: Sat, 18 Jun 2022 11:49:08 +0200 Subject: [PATCH 23/37] remove shm_size drone io --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index de65ae69..20b489e6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -134,7 +134,6 @@ steps: - rm -rf storage/framework/views/* - rm -rf storage/debugbar/* - rm -rf storage/logs/* - shm_size: 2000000000 volumes: - name: daemon_logs path: /var/log/gameap-daemon From 24868287862e943f491c6f457eb83a610b5358b1 Mon Sep 17 00:00:00 2001 From: et-nik Date: Sat, 18 Jun 2022 19:25:19 +0200 Subject: [PATCH 24/37] add gdaemon_api tests --- .dev/docker/gdaemon/Dockerfile | 6 +- .dev/docker/gdaemon/entrypoint | 5 +- .../GdaemonAPI/InvalidApiKeyException.php | 14 +- .../GdaemonAPI/DedicatedServersController.php | 2 +- .../GdaemonAPI/ServersController.php | 55 ++--- .../Responses/GdaemonAPI/GameModResponse.php | 46 ++++ .../Responses/GdaemonAPI/GameResponse.php | 48 ++++ .../Responses/GdaemonAPI/ServerResponse.php | 62 +++++ database/factories/DedicatedServerFactory.php | 28 +-- database/factories/GameFactory.php | 1 + database/factories/GameModFactory.php | 12 +- docker-compose.yml | 14 +- tests/API/APITestCase.php | 22 -- tests/API/Admin/Servers/CreateTest.php | 2 +- tests/DaemonAPI/GetInitDataTest.php | 55 +++++ tests/DaemonAPI/GetTokenTest.php | 34 +++ tests/DaemonAPI/ServersTest.php | 231 ++++++++++++++++++ tests/DaemonAPI/TestCase.php | 19 ++ tests/TestCase.php | 51 ++++ 19 files changed, 615 insertions(+), 92 deletions(-) create mode 100644 app/Http/Responses/GdaemonAPI/GameModResponse.php create mode 100644 app/Http/Responses/GdaemonAPI/GameResponse.php create mode 100644 app/Http/Responses/GdaemonAPI/ServerResponse.php create mode 100644 tests/DaemonAPI/GetInitDataTest.php create mode 100644 tests/DaemonAPI/GetTokenTest.php create mode 100644 tests/DaemonAPI/ServersTest.php create mode 100644 tests/DaemonAPI/TestCase.php diff --git a/.dev/docker/gdaemon/Dockerfile b/.dev/docker/gdaemon/Dockerfile index 3f8eaecb..f531b72f 100644 --- a/.dev/docker/gdaemon/Dockerfile +++ b/.dev/docker/gdaemon/Dockerfile @@ -1,11 +1,11 @@ -FROM knik/gdaemon-build:buster +FROM debian:latest ARG ROOT_SSH_PASSWORD=password RUN apt-get -y update && apt-get -y install \ ssh \ - gdb \ - clang \ + curl \ + wget \ rsync \ tar \ python \ diff --git a/.dev/docker/gdaemon/entrypoint b/.dev/docker/gdaemon/entrypoint index eefa2a2a..2ecd0a55 100755 --- a/.dev/docker/gdaemon/entrypoint +++ b/.dev/docker/gdaemon/entrypoint @@ -9,7 +9,4 @@ then sleep 5 fi -service ssh start -service gameap-daemon start - -tail -f /var/log/gameap-daemon/output.log +gameap-daemon diff --git a/app/Exceptions/GdaemonAPI/InvalidApiKeyException.php b/app/Exceptions/GdaemonAPI/InvalidApiKeyException.php index 2c552ee3..30322858 100644 --- a/app/Exceptions/GdaemonAPI/InvalidApiKeyException.php +++ b/app/Exceptions/GdaemonAPI/InvalidApiKeyException.php @@ -3,7 +3,19 @@ namespace Gameap\Exceptions\GdaemonAPI; use Gameap\Exceptions\GameapException; +use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface; -class InvalidApiKeyException extends GameapException +class InvalidApiKeyException extends GameapException implements HttpExceptionInterface { + public function getStatusCode() + { + return Response::HTTP_UNAUTHORIZED; + } + + public function getHeaders() + { + return []; + } + } diff --git a/app/Http/Controllers/GdaemonAPI/DedicatedServersController.php b/app/Http/Controllers/GdaemonAPI/DedicatedServersController.php index acab724c..59916fbd 100644 --- a/app/Http/Controllers/GdaemonAPI/DedicatedServersController.php +++ b/app/Http/Controllers/GdaemonAPI/DedicatedServersController.php @@ -30,7 +30,7 @@ public function getInitData(DedicatedServer $dedicatedServer) 'script_restart' => $dedicatedServer->script_restart, 'script_status' => $dedicatedServer->script_status, 'script_get_console' => $dedicatedServer->script_get_console, - 'script_send_command' => $dedicatedServer->script_get_console, + 'script_send_command' => $dedicatedServer->script_send_command, 'script_delete' => $dedicatedServer->script_delete, ]; } diff --git a/app/Http/Controllers/GdaemonAPI/ServersController.php b/app/Http/Controllers/GdaemonAPI/ServersController.php index 64fa8b18..4140f82b 100644 --- a/app/Http/Controllers/GdaemonAPI/ServersController.php +++ b/app/Http/Controllers/GdaemonAPI/ServersController.php @@ -4,6 +4,7 @@ use Gameap\Http\Requests\GdaemonAPI\JsonServerBulkRequest; use Gameap\Http\Requests\GdaemonAPI\ServerRequest; +use Gameap\Http\Responses\GdaemonAPI\ServerResponse; use Gameap\Models\DedicatedServer; use Gameap\Models\Server; use Gameap\Repositories\ServerRepository; @@ -27,48 +28,26 @@ public function __construct(ServerRepository $serverRepository) public function index(DedicatedServer $dedicatedServer): JsonResponse { - return response()->json( - QueryBuilder::for(Server::where('ds_id', '=', $dedicatedServer->id)) - ->allowedFilters('id') - ->with('dedicatedServer') - ->with('game') - ->with('gameMod') - ->with('settings') - ->get() - ); - } + $servers = QueryBuilder::for(Server::where('ds_id', '=', $dedicatedServer->id)) + ->allowedFilters('id') + ->with('dedicatedServer') + ->with('game') + ->with('gameMod') + ->with('settings') + ->get(); - public function server(Server $server): JsonResponse - { - $server->getRelationValue('dedicatedServer'); - $isLinux = $server->dedicatedServer->isLinux(); - $server->unsetRelation('dedicatedServer'); + $serversResponse = []; - $server->getRelationValue('game'); - $server->getRelationValue('gameMod'); - $server->getRelationValue('settings'); - - $fieldSiffix = 'windows'; - if($isLinux) { - $fieldSiffix = 'linux'; - } - $arFields = [ - 'game' => [ - 'remote_repository', 'local_repository', 'steam_app_id', - ], - 'gameMod' => [ - 'remote_repository', 'local_repository', 'start_cmd', - ], - ]; - foreach($arFields as $relationName => $arRelationFields){ - foreach($arRelationFields as $gameField){ - $server->{$relationName}->{$gameField} = $server->{$relationName}->{$gameField . '_' . $fieldSiffix}; - unset($server->{$relationName}->{$gameField . '_linux'}); - unset($server->{$relationName}->{$gameField . '_windows'}); - } + foreach ($servers as $server) { + $serversResponse[] = new ServerResponse($server); } - return response()->json($server); + return response()->json($serversResponse); + } + + public function server(Server $server): JsonResponse + { + return response()->json(new ServerResponse($server)); } public function update(ServerRequest $request, Server $server): JsonResponse diff --git a/app/Http/Responses/GdaemonAPI/GameModResponse.php b/app/Http/Responses/GdaemonAPI/GameModResponse.php new file mode 100644 index 00000000..52e799d2 --- /dev/null +++ b/app/Http/Responses/GdaemonAPI/GameModResponse.php @@ -0,0 +1,46 @@ +gameMod = $gameMod; + $this->os = $os; + } + + public function jsonSerialize() + { + $remoteRepository = ''; + $localRepository = ''; + $defaultStartCmd = ''; + if ($this->os === 'linux') { + $remoteRepository = $this->gameMod->remote_repository_linux; + $localRepository = $this->gameMod->local_repository_linux; + $defaultStartCmd = $this->gameMod->start_cmd_linux; + } elseif ($this->os === 'windows') { + $remoteRepository = $this->gameMod->remote_repository_windows; + $localRepository = $this->gameMod->local_repository_windows; + $defaultStartCmd = $this->gameMod->start_cmd_windows; + } + + return [ + 'id' => $this->gameMod->id, + 'game_code' => $this->gameMod->game_code, + 'name' => $this->gameMod->name, + 'vars' => $this->gameMod->vars, + 'remote_repository' => $remoteRepository, + 'local_repository' => $localRepository, + 'default_start_cmd' => $defaultStartCmd, + 'default_start_cmd_linux' => $this->gameMod->start_cmd_linux, + 'default_start_cmd_windows' => $this->gameMod->start_cmd_windows, + ]; + } +} diff --git a/app/Http/Responses/GdaemonAPI/GameResponse.php b/app/Http/Responses/GdaemonAPI/GameResponse.php new file mode 100644 index 00000000..57f8c124 --- /dev/null +++ b/app/Http/Responses/GdaemonAPI/GameResponse.php @@ -0,0 +1,48 @@ +game = $game; + $this->os = $os; + } + + public function jsonSerialize() + { + $remoteRepository = ''; + $localRepository = ''; + $steamAppId = ''; + + if ($this->os === 'linux') { + $remoteRepository = $this->game->remote_repository_linux; + $localRepository = $this->game->local_repository_linux; + $steamAppId = $this->game->steam_app_id_linux; + } elseif ($this->os === 'windows') { + $remoteRepository = $this->game->remote_repository_windows; + $localRepository = $this->game->local_repository_windows; + $steamAppId = $this->game->steam_app_id_windows; + } + + return [ + 'code' => $this->game->code, + 'start_code' => $this->game->start_code, + 'name' => $this->game->name, + 'engine' => $this->game->engine, + 'engine_version' => $this->game->engine_version, + 'remote_repository' => $remoteRepository, + 'local_repository' => $localRepository, + 'steam_app_id' => $steamAppId, + 'steam_app_set_config' => $this->game->steam_app_set_config, + ]; + } +} diff --git a/app/Http/Responses/GdaemonAPI/ServerResponse.php b/app/Http/Responses/GdaemonAPI/ServerResponse.php new file mode 100644 index 00000000..9c25b50e --- /dev/null +++ b/app/Http/Responses/GdaemonAPI/ServerResponse.php @@ -0,0 +1,62 @@ +server = $server; + } + + public function jsonSerialize() + { + $gameModResponse = new GameModResponse($this->server->gameMod, $this->server->dedicatedServer->os); + $gameResponse = new GameResponse($this->server->game, $this->server->dedicatedServer->os); + + return [ + 'id' => $this->server->id, + 'uuid' => $this->server->uuid, + 'uuid_short' => $this->server->uuid_short, + 'enabled' => $this->server->enabled, + 'installed' => $this->server->installed, + 'blocked' => $this->server->blocked, + 'name' => $this->server->name, + 'ds_id' => $this->server->ds_id, + 'game_id' => $this->server->game_id, + 'game_mod_id' => $this->server->game_mod_id, + 'expires' => $this->server->expires, + 'server_ip' => $this->server->server_ip, + 'server_port' => $this->server->server_port, + 'query_port' => $this->server->query_port, + 'rcon_port' => $this->server->rcon_port, + 'rcon' => $this->server->rcon, + 'dir' => $this->server->dir, + 'su_user' => $this->server->su_user, + 'cpu_limit' => $this->server->cpu_limit, + 'ram_limit' => $this->server->ram_limit, + 'net_limit' => $this->server->net_limit, + 'start_command' => $this->server->start_command, + 'stop_command' => $this->server->stop_command, + 'force_stop_command' => $this->server->force_stop_command, + 'restart_command' => $this->server->restart_command, + 'process_active' => $this->server->process_active, + 'last_process_check' => $this->server->last_process_check, + 'vars' => $this->server->vars, + 'created_at' => $this->server->created_at, + 'updated_at' => $this->server->updated_at, + 'deleted_at' => $this->server->deleted_at, + 'settings' => $this->server->settings, + 'game' => $gameResponse->jsonSerialize(), + 'game_mod' => $gameModResponse->jsonSerialize(), + ]; + } +} diff --git a/database/factories/DedicatedServerFactory.php b/database/factories/DedicatedServerFactory.php index 7796ed56..e7258da8 100644 --- a/database/factories/DedicatedServerFactory.php +++ b/database/factories/DedicatedServerFactory.php @@ -29,19 +29,19 @@ 'gdaemon_server_cert' => '', 'client_certificate_id' => ClientCertificate::all()->random()->id, 'prefer_install_method' => 'auto', - 'script_install' => '', - 'script_reinstall' => '', - 'script_update' => '', - 'script_start' => '', - 'script_pause' => '', - 'script_unpause' => '', - 'script_stop' => '', - 'script_kill' => '', - 'script_restart' => '', - 'script_status' => '', - 'script_stats' => '', - 'script_get_console' => '', - 'script_send_command' => '', - 'script_delete' => '', + 'script_install' => './script install', + 'script_reinstall' => './script reinstall', + 'script_update' => './script update', + 'script_start' => './script start', + 'script_pause' => './script pause', + 'script_unpause' => './script unpause', + 'script_stop' => './script stop', + 'script_kill' => './script kill', + 'script_restart' => './script restart', + 'script_status' => './script status', + 'script_stats' => './script stats', + 'script_get_console' => './script get_console', + 'script_send_command' => './script send_command', + 'script_delete' => './script delete', ]; }); diff --git a/database/factories/GameFactory.php b/database/factories/GameFactory.php index 1f54c7a9..327b184d 100644 --- a/database/factories/GameFactory.php +++ b/database/factories/GameFactory.php @@ -15,5 +15,6 @@ 'name' => 'Test', 'engine' => 'test', 'engine_version' => '1.0', + 'remote_repository_linux' => '', ]; }); diff --git a/database/factories/GameModFactory.php b/database/factories/GameModFactory.php index 6ea1ec16..706b9622 100644 --- a/database/factories/GameModFactory.php +++ b/database/factories/GameModFactory.php @@ -15,12 +15,12 @@ 'name' => $faker->name, 'fast_rcon' => '', 'vars' => '', - 'remote_repository_linux' => '', - 'remote_repository_windows' => '', - 'local_repository_linux' => '', - 'local_repository_windows' => '', - 'start_cmd_linux' => '', - 'start_cmd_windows' => '', + 'remote_repository_linux' => 'https://example.com/mod_linux.tar.gz', + 'remote_repository_windows' => 'https://example.com/mod_windows.zip', + 'local_repository_linux' => 'path/to/mod_linux.tar.gz', + 'local_repository_windows' => 'C:\\path\\to\\mod_windows.zip', + 'start_cmd_linux' => './start.sh', + 'start_cmd_windows' => 'start.exe', 'kick_cmd' => '', 'ban_cmd' => '', 'chname_cmd' => '', diff --git a/docker-compose.yml b/docker-compose.yml index 3f39fb6e..0d0a5109 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: container_name: gameap_db hostname: gameap.db ports: - - "127.0.0.1:13306:3306" + - "13306:3306" environment: - MYSQL_ROOT_PASSWORD=gameapdbsuperduperpass - MYSQL_DATABASE=gameap @@ -17,7 +17,7 @@ services: container_name: gameap_nginx hostname: gameap.web ports: - - "0.0.0.0:2080:80" + - "2080:80" volumes: - ./:/var/www - ./.dev/nginx-configs/default.conf:/etc/nginx/conf.d/default.conf @@ -46,3 +46,13 @@ services: restart: always depends_on: - mysql + daemon: + build: ./.dev/docker/gdaemon + container_name: gameap_daemon + restart: always + links: + - nginx:gameap + depends_on: + - php + - nginx + - mysql diff --git a/tests/API/APITestCase.php b/tests/API/APITestCase.php index 72ed33e9..de7f77d2 100644 --- a/tests/API/APITestCase.php +++ b/tests/API/APITestCase.php @@ -20,26 +20,4 @@ protected function setUp(): void $this->container = Container::getInstance(); } - - protected function givenNode(): DedicatedServer - { - return factory(DedicatedServer::class)->create(); - } - - protected function givenGameServer(int $nodeId): Server - { - return factory(Server::class)->create([ - 'ds_id' => $nodeId, - ]); - } - - protected function givenGame(): Game - { - return factory(Game::class)->create(); - } - - protected function givenGameMod(): GameMod - { - return factory(GameMod::class)->create(); - } } diff --git a/tests/API/Admin/Servers/CreateTest.php b/tests/API/Admin/Servers/CreateTest.php index 8315d67f..d7abdb1c 100644 --- a/tests/API/Admin/Servers/CreateTest.php +++ b/tests/API/Admin/Servers/CreateTest.php @@ -3,7 +3,7 @@ namespace Tests\API\Admin\Servers; use Gameap\Models\User; -use Silber\Bouncer\Bouncer; +use Bouncer; use Symfony\Component\HttpFoundation\Response; use Tests\API\APITestCase; diff --git a/tests/DaemonAPI/GetInitDataTest.php b/tests/DaemonAPI/GetInitDataTest.php new file mode 100644 index 00000000..bad65d77 --- /dev/null +++ b/tests/DaemonAPI/GetInitDataTest.php @@ -0,0 +1,55 @@ +givenNode(); + + $response = $this->get( + '/gdaemon_api/dedicated_servers/get_init_data/' . $node->id, + [ + 'X-Auth-Token' => $node->gdaemon_api_token, + 'Accept' => 'application/json', + ] + ); + + $response->assertStatus(Response::HTTP_OK); + $this->assertEquals($node->work_path, $response->json('work_path')); + $this->assertEquals($node->steamcmd_path, $response->json('steamcmd_path')); + $this->assertEquals($node->prefer_install_method, $response->json('prefer_install_method')); + $this->assertEquals($node->script_install, $response->json('script_install')); + $this->assertEquals($node->script_reinstall, $response->json('script_reinstall')); + $this->assertEquals($node->script_update, $response->json('script_update')); + $this->assertEquals($node->script_start, $response->json('script_start')); + $this->assertEquals($node->script_pause, $response->json('script_pause')); + $this->assertEquals($node->script_unpause, $response->json('script_unpause')); + $this->assertEquals($node->script_stop, $response->json('script_stop')); + $this->assertEquals($node->script_kill, $response->json('script_kill')); + $this->assertEquals($node->script_restart, $response->json('script_restart')); + $this->assertEquals($node->script_status, $response->json('script_status')); + $this->assertEquals($node->script_get_console, $response->json('script_get_console')); + $this->assertEquals($node->script_send_command, $response->json('script_send_command')); + $this->assertEquals($node->script_delete, $response->json('script_delete')); + } + + public function testGetInitData_InvalidToken() + { + $node = $this->givenNode(); + + $response = $this->get( + '/gdaemon_api/dedicated_servers/get_init_data/' . $node->id, + [ + 'X-Auth-Token' => 'invalid', + 'Accept' => 'application/json', + ] + ); + + $response->assertStatus(Response::HTTP_UNAUTHORIZED); + $response->assertJsonPath('message', 'Invalid api token'); + } +} diff --git a/tests/DaemonAPI/GetTokenTest.php b/tests/DaemonAPI/GetTokenTest.php new file mode 100644 index 00000000..ea8fe947 --- /dev/null +++ b/tests/DaemonAPI/GetTokenTest.php @@ -0,0 +1,34 @@ +givenNode(); + + $response = $this->get('/gdaemon_api/get_token', [ + 'Authorization' => 'Bearer ' . $node->gdaemon_api_key, + ]); + + $response->assertStatus(Response::HTTP_OK); + $this->assertIsString($response->json('token')); + $this->assertIsInt($response->json('timestamp')); + } + + public function testGetToken_InvalidToken() + { + $this->givenNode(); + + $response = $this->get('/gdaemon_api/get_token', [ + 'Authorization' => 'Bearer invalid', + 'Accept' => 'application/json', + ]); + + $response->assertStatus(Response::HTTP_UNAUTHORIZED); + $response->assertJsonPath('message', 'Invalid api token'); + } +} diff --git a/tests/DaemonAPI/ServersTest.php b/tests/DaemonAPI/ServersTest.php new file mode 100644 index 00000000..4db65e8e --- /dev/null +++ b/tests/DaemonAPI/ServersTest.php @@ -0,0 +1,231 @@ +givenLinuxNode(); + $server = $this->givenGameServer($node->id); + + $response = $this->get( + '/gdaemon_api/servers', + [ + 'X-Auth-Token' => $node->gdaemon_api_token, + 'Accept' => 'application/json', + ] + ); + + $response->assertStatus(Response::HTTP_OK); + $response->assertJsonPath('0.id', $server->id); + $response->assertJsonPath('0.uuid', $server->uuid); + $response->assertJsonPath('0.uuid_short', $server->uuid_short); + $response->assertJsonPath('0.enabled', $server->enabled); + $response->assertJsonPath('0.installed', $server->installed); + $response->assertJsonPath('0.blocked', $server->blocked); + $response->assertJsonPath('0.name', $server->name); + $response->assertJsonPath('0.game_id', $server->game_id); + $response->assertJsonPath('0.ds_id', $server->ds_id); + $response->assertJsonPath('0.game_mod_id', $server->game_mod_id); + $response->assertJsonPath('0.server_ip', $server->server_ip); + $response->assertJsonPath('0.server_port', $server->server_port); + $response->assertJsonPath('0.rcon_port', $server->rcon_port); + $response->assertJsonPath('0.rcon', $server->rcon); + $response->assertJsonPath('0.dir', $server->dir); + $response->assertJsonPath('0.su_user', $server->su_user); + $response->assertJsonPath('0.cpu_limit', $server->cpu_limit); + $response->assertJsonPath('0.ram_limit', $server->ram_limit); + $response->assertJsonPath('0.net_limit', $server->net_limit); + $response->assertJsonPath('0.start_command', $server->start_command); + $response->assertJsonPath('0.game.code', $server->game->code); + $response->assertJsonPath('0.game.start_code', $server->game->start_code); + $response->assertJsonPath('0.game.steam_app_id', $server->game->steam_app_id_linux); + $response->assertJsonPath('0.game.remote_repository', $server->game->remote_repository_linux); + $response->assertJsonPath('0.game.local_repository', $server->game->local_repository_linux); + $response->assertJsonPath('0.game_mod.id', $server->gameMod->id); + $response->assertJsonPath('0.game_mod.name', $server->gameMod->name); + $response->assertJsonPath('0.game_mod.remote_repository', $server->gameMod->remote_repository_linux); + $response->assertJsonPath('0.game_mod.local_repository', $server->gameMod->local_repository_linux); + $response->assertJsonPath('0.game_mod.default_start_cmd', $server->gameMod->start_cmd_linux); + $response->assertJsonPath('0.game_mod.default_start_cmd_linux', $server->gameMod->start_cmd_linux); + $response->assertJsonPath('0.game_mod.default_start_cmd_windows', $server->gameMod->start_cmd_windows); + } + + public function testServersWindowsNode_Success() + { + $node = $this->givenWindowsNode(); + $server = $this->givenGameServer($node->id); + + $response = $this->get( + '/gdaemon_api/servers', + [ + 'X-Auth-Token' => $node->gdaemon_api_token, + 'Accept' => 'application/json', + ] + ); + + $response->assertStatus(Response::HTTP_OK); + $response->assertJsonPath('0.id', $server->id); + $response->assertJsonPath('0.uuid', $server->uuid); + $response->assertJsonPath('0.uuid_short', $server->uuid_short); + $response->assertJsonPath('0.enabled', $server->enabled); + $response->assertJsonPath('0.installed', $server->installed); + $response->assertJsonPath('0.blocked', $server->blocked); + $response->assertJsonPath('0.name', $server->name); + $response->assertJsonPath('0.game_id', $server->game_id); + $response->assertJsonPath('0.ds_id', $server->ds_id); + $response->assertJsonPath('0.game_mod_id', $server->game_mod_id); + $response->assertJsonPath('0.server_ip', $server->server_ip); + $response->assertJsonPath('0.server_port', $server->server_port); + $response->assertJsonPath('0.rcon_port', $server->rcon_port); + $response->assertJsonPath('0.rcon', $server->rcon); + $response->assertJsonPath('0.dir', $server->dir); + $response->assertJsonPath('0.su_user', $server->su_user); + $response->assertJsonPath('0.cpu_limit', $server->cpu_limit); + $response->assertJsonPath('0.ram_limit', $server->ram_limit); + $response->assertJsonPath('0.net_limit', $server->net_limit); + $response->assertJsonPath('0.start_command', $server->start_command); + $response->assertJsonPath('0.game.code', $server->game->code); + $response->assertJsonPath('0.game.start_code', $server->game->start_code); + $response->assertJsonPath('0.game.steam_app_id', $server->game->steam_app_id_windows); + $response->assertJsonPath('0.game.remote_repository', $server->game->remote_repository_windows); + $response->assertJsonPath('0.game.local_repository', $server->game->local_repository_windows); + $response->assertJsonPath('0.game_mod.id', $server->gameMod->id); + $response->assertJsonPath('0.game_mod.name', $server->gameMod->name); + $response->assertJsonPath('0.game_mod.remote_repository', $server->gameMod->remote_repository_windows); + $response->assertJsonPath('0.game_mod.local_repository', $server->gameMod->local_repository_windows); + $response->assertJsonPath('0.game_mod.default_start_cmd', $server->gameMod->start_cmd_windows); + $response->assertJsonPath('0.game_mod.default_start_cmd_linux', $server->gameMod->start_cmd_linux); + $response->assertJsonPath('0.game_mod.default_start_cmd_windows', $server->gameMod->start_cmd_windows); + } + + public function testServersIdLinux_Success() + { + $node = $this->givenNode(); + $server = $this->givenGameServer($node->id); + + $response = $this->get( + '/gdaemon_api/servers/' . $server->id, + [ + 'X-Auth-Token' => $node->gdaemon_api_token, + 'Accept' => 'application/json', + ] + ); + + $response->assertStatus(Response::HTTP_OK); + $response->assertJsonPath('id', $server->id); + $response->assertJsonPath('uuid', $server->uuid); + $response->assertJsonPath('uuid_short', $server->uuid_short); + $response->assertJsonPath('enabled', $server->enabled); + $response->assertJsonPath('installed', $server->installed); + $response->assertJsonPath('blocked', $server->blocked); + $response->assertJsonPath('name', $server->name); + $response->assertJsonPath('game_id', $server->game_id); + $response->assertJsonPath('ds_id', $server->ds_id); + $response->assertJsonPath('game_mod_id', $server->game_mod_id); + $response->assertJsonPath('server_ip', $server->server_ip); + $response->assertJsonPath('server_port', $server->server_port); + $response->assertJsonPath('rcon_port', $server->rcon_port); + $response->assertJsonPath('rcon', $server->rcon); + $response->assertJsonPath('dir', $server->dir); + $response->assertJsonPath('su_user', $server->su_user); + $response->assertJsonPath('cpu_limit', $server->cpu_limit); + $response->assertJsonPath('ram_limit', $server->ram_limit); + $response->assertJsonPath('net_limit', $server->net_limit); + $response->assertJsonPath('start_command', $server->start_command); + $response->assertJsonPath('game.code', $server->game->code); + $response->assertJsonPath('game.start_code', $server->game->start_code); + $response->assertJsonPath('game.steam_app_id', $server->game->steam_app_id_linux); + $response->assertJsonPath('game.remote_repository', $server->game->remote_repository_linux); + $response->assertJsonPath('game.local_repository', $server->game->local_repository_linux); + $response->assertJsonPath('game_mod.id', $server->gameMod->id); + $response->assertJsonPath('game_mod.name', $server->gameMod->name); + $response->assertJsonPath('game_mod.remote_repository', $server->gameMod->remote_repository_linux); + $response->assertJsonPath('game_mod.local_repository', $server->gameMod->local_repository_linux); + $response->assertJsonPath('game_mod.default_start_cmd', $server->gameMod->start_cmd_linux); + $response->assertJsonPath('game_mod.default_start_cmd_linux', $server->gameMod->start_cmd_linux); + $response->assertJsonPath('game_mod.default_start_cmd_windows', $server->gameMod->start_cmd_windows); + } + + public function testServersIdWindows_Success() + { + $node = $this->givenWindowsNode(); + $server = $this->givenGameServer($node->id); + + $response = $this->get( + '/gdaemon_api/servers/' . $server->id, + [ + 'X-Auth-Token' => $node->gdaemon_api_token, + 'Accept' => 'application/json', + ] + ); + + $response->assertStatus(Response::HTTP_OK); + $response->assertJsonPath('id', $server->id); + $response->assertJsonPath('uuid', $server->uuid); + $response->assertJsonPath('uuid_short', $server->uuid_short); + $response->assertJsonPath('enabled', $server->enabled); + $response->assertJsonPath('installed', $server->installed); + $response->assertJsonPath('blocked', $server->blocked); + $response->assertJsonPath('name', $server->name); + $response->assertJsonPath('game_id', $server->game_id); + $response->assertJsonPath('ds_id', $server->ds_id); + $response->assertJsonPath('game_mod_id', $server->game_mod_id); + $response->assertJsonPath('server_ip', $server->server_ip); + $response->assertJsonPath('server_port', $server->server_port); + $response->assertJsonPath('rcon_port', $server->rcon_port); + $response->assertJsonPath('rcon', $server->rcon); + $response->assertJsonPath('dir', $server->dir); + $response->assertJsonPath('su_user', $server->su_user); + $response->assertJsonPath('cpu_limit', $server->cpu_limit); + $response->assertJsonPath('ram_limit', $server->ram_limit); + $response->assertJsonPath('net_limit', $server->net_limit); + $response->assertJsonPath('start_command', $server->start_command); + $response->assertJsonPath('game.code', $server->game->code); + $response->assertJsonPath('game.start_code', $server->game->start_code); + $response->assertJsonPath('game.steam_app_id', $server->game->steam_app_id_windows); + $response->assertJsonPath('game.remote_repository', $server->game->remote_repository_windows); + $response->assertJsonPath('game.local_repository', $server->game->local_repository_windows); + $response->assertJsonPath('game_mod.id', $server->gameMod->id); + $response->assertJsonPath('game_mod.name', $server->gameMod->name); + $response->assertJsonPath('game_mod.remote_repository', $server->gameMod->remote_repository_windows); + $response->assertJsonPath('game_mod.local_repository', $server->gameMod->local_repository_windows); + $response->assertJsonPath('game_mod.default_start_cmd', $server->gameMod->start_cmd_windows); + $response->assertJsonPath('game_mod.default_start_cmd_linux', $server->gameMod->start_cmd_linux); + $response->assertJsonPath('game_mod.default_start_cmd_windows', $server->gameMod->start_cmd_windows); + } + + public function testServers_InvalidToken() + { + $response = $this->get( + '/gdaemon_api/servers/', + [ + 'X-Auth-Token' => 'invalid', + 'Accept' => 'application/json', + ] + ); + + $response->assertStatus(Response::HTTP_UNAUTHORIZED); + $response->assertJsonPath('message', 'Invalid api token'); + } + + public function testServersId_InvalidToken() + { + $node = $this->givenNode(); + $server = $this->givenGameServer($node->id); + + $response = $this->get( + '/gdaemon_api/servers/' . $server->id, + [ + 'X-Auth-Token' => 'invalid', + 'Accept' => 'application/json', + ] + ); + + $response->assertStatus(Response::HTTP_UNAUTHORIZED); + $response->assertJsonPath('message', 'Invalid api token'); + } +} diff --git a/tests/DaemonAPI/TestCase.php b/tests/DaemonAPI/TestCase.php new file mode 100644 index 00000000..1a59c0d3 --- /dev/null +++ b/tests/DaemonAPI/TestCase.php @@ -0,0 +1,19 @@ +container = Container::getInstance(); + } +} diff --git a/tests/TestCase.php b/tests/TestCase.php index 63a83e89..eeef9730 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -2,6 +2,10 @@ namespace Tests; +use Gameap\Models\DedicatedServer; +use Gameap\Models\Game; +use Gameap\Models\GameMod; +use Gameap\Models\Server; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; use Database\Seeders\DedicatedServersTableSeeder; use Database\Seeders\ServersTableSeeder; @@ -23,4 +27,51 @@ protected function setUp(): void $this->seed(ServersTableSeeder::class); } } + + protected function givenNode(): DedicatedServer + { + return factory(DedicatedServer::class)->create([ + 'gdaemon_api_key' => str_random(), + 'gdaemon_api_token' => str_random(), + ]); + } + + protected function givenLinuxNode(): DedicatedServer + { + return factory(DedicatedServer::class)->create([ + 'os' => 'linux', + 'gdaemon_api_key' => str_random(), + 'gdaemon_api_token' => str_random(), + ]); + } + + protected function givenWindowsNode(): DedicatedServer + { + return factory(DedicatedServer::class)->create([ + 'os' => 'windows', + 'gdaemon_api_key' => str_random(), + 'gdaemon_api_token' => str_random(), + ]); + } + + protected function givenGameServer(int $nodeId): Server + { + $gameMod = $this->givenGameMod(); + + return factory(Server::class)->create([ + 'ds_id' => $nodeId, + 'game_id' => $gameMod->game_code, + 'game_mod_id' => $gameMod->id, + ]); + } + + protected function givenGame(): Game + { + return factory(Game::class)->create(); + } + + protected function givenGameMod(): GameMod + { + return factory(GameMod::class)->create(); + } } From a47efaa26673c540acfadcb6f8c101204b457b65 Mon Sep 17 00:00:00 2001 From: et-nik Date: Sat, 18 Jun 2022 19:33:20 +0200 Subject: [PATCH 25/37] phpunit rules update --- phpunit.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/phpunit.xml b/phpunit.xml index b752a337..b349093b 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -10,6 +10,12 @@ + + ./tests/API + + + ./tests/DaemonAPI + ./tests/Feature From 66886e400b92ca7f12d9564c0efa03f2d9a84c2c Mon Sep 17 00:00:00 2001 From: et-nik Date: Sat, 18 Jun 2022 19:43:01 +0200 Subject: [PATCH 26/37] remove static Bouncer --- tests/API/Admin/Servers/CreateTest.php | 19 +++++++++++++++---- tests/API/FileManager/InitializeTest.php | 14 ++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/tests/API/Admin/Servers/CreateTest.php b/tests/API/Admin/Servers/CreateTest.php index d7abdb1c..a272fc27 100644 --- a/tests/API/Admin/Servers/CreateTest.php +++ b/tests/API/Admin/Servers/CreateTest.php @@ -3,17 +3,28 @@ namespace Tests\API\Admin\Servers; use Gameap\Models\User; -use Bouncer; +use Silber\Bouncer\Bouncer; use Symfony\Component\HttpFoundation\Response; use Tests\API\APITestCase; class CreateTest extends APITestCase { + /** @var \Silber\Bouncer\Bouncer */ + protected $bouncer; + + public function setUp(): void + { + parent::setUp(); + + $this->bouncer = $this->app->get(Bouncer::class); + $this->bouncer->dontCache(); + } + public function testCreateServer_ExpectInstallationGDaemonTaskExists() { $user = factory(User::class)->create(); $this->be($user); - Bouncer::sync($user)->roles(['admin']); + $this->bouncer->sync($user)->roles(['admin']); $node = $this->givenNode(); $gameMod = $this->givenGameMod(); @@ -61,7 +72,7 @@ public function testCreateServerUncheckedInstallServer_ExpectInstallationGDaemon { $user = factory(User::class)->create(); $this->be($user); - Bouncer::sync($user)->roles(['admin']); + $this->bouncer->sync($user)->roles(['admin']); $node = $this->givenNode(); $gameMod = $this->givenGameMod(); @@ -106,7 +117,7 @@ public function testCreateServerNodeNotExists_ExpectNotFound() { $user = factory(User::class)->create(); $this->be($user); - Bouncer::sync($user)->roles(['admin']); + $this->bouncer->sync($user)->roles(['admin']); $gameMod = $this->givenGameMod(); $response = $this->post( diff --git a/tests/API/FileManager/InitializeTest.php b/tests/API/FileManager/InitializeTest.php index b41e8921..db5bbac9 100644 --- a/tests/API/FileManager/InitializeTest.php +++ b/tests/API/FileManager/InitializeTest.php @@ -3,13 +3,23 @@ namespace Tests\API\FileManager; use Gameap\Models\User; -use Illuminate\Container\Container; use Silber\Bouncer\Bouncer; use Symfony\Component\HttpFoundation\Response; use Tests\API\APITestCase; class InitializeTest extends APITestCase { + /** @var Bouncer */ + protected $bouncer; + + public function setUp(): void + { + parent::setUp(); + + $this->bouncer = $this->app->get(Bouncer::class); + $this->bouncer->dontCache(); + } + public function testGuestUser_ExpectUnauthorized() { $node = $this->givenNode(); @@ -31,7 +41,7 @@ public function testAllowed() $server = $this->givenGameServer($node->id); $user = factory(User::class)->create(); $this->be($user); - Bouncer::sync($user)->roles(['admin']); + $this->bouncer->sync($user)->roles(['admin']); $response = $this->get( sprintf('/file-manager/%d/initialize', $server->id), From 423ae08d5fead6b318f98d849a6894f0d55dd234 Mon Sep 17 00:00:00 2001 From: et-nik Date: Sat, 18 Jun 2022 19:55:01 +0200 Subject: [PATCH 27/37] add shm_size --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 20b489e6..48e2f663 100644 --- a/.drone.yml +++ b/.drone.yml @@ -134,6 +134,7 @@ steps: - rm -rf storage/framework/views/* - rm -rf storage/debugbar/* - rm -rf storage/logs/* + shm_size: 2000000000 volumes: - name: daemon_logs path: /var/log/gameap-daemon @@ -273,6 +274,7 @@ services: - name: selenium image: selenium/standalone-chrome:4.1.0 + shm_size: 2000000000 environment: HUB_PORT: 4444 SCREEN_WIDTH: 1280 From 95b0c79e6767f7fc6273447d18b51a102178b61e Mon Sep 17 00:00:00 2001 From: et-nik Date: Sat, 18 Jun 2022 20:09:18 +0200 Subject: [PATCH 28/37] update daemon browser test --- tests/Browser/Admin/AAADaemonTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Browser/Admin/AAADaemonTest.php b/tests/Browser/Admin/AAADaemonTest.php index c4fab733..dc4dddd5 100644 --- a/tests/Browser/Admin/AAADaemonTest.php +++ b/tests/Browser/Admin/AAADaemonTest.php @@ -83,7 +83,7 @@ public function testCreate() $browser->refresh(); } - return $status === 'success'; + return $status === 'success' || $status === 'error'; }); $browser->assertSee('Downloading successfully completed'); From 2163ff10787ecc4eb975ce5bd28d01b614125d71 Mon Sep 17 00:00:00 2001 From: et-nik Date: Sat, 18 Jun 2022 20:21:28 +0200 Subject: [PATCH 29/37] update game mod context trait --- tests/Context/Browser/Models/GameModContextTrait.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Context/Browser/Models/GameModContextTrait.php b/tests/Context/Browser/Models/GameModContextTrait.php index aa99f98b..bd87b1c6 100644 --- a/tests/Context/Browser/Models/GameModContextTrait.php +++ b/tests/Context/Browser/Models/GameModContextTrait.php @@ -9,8 +9,9 @@ trait GameModContextTrait private function givenGameMod(): GameMod { return factory(GameMod::class)->create([ - 'game_code' => 'test', - 'name' => 'Test Game Mod', + 'game_code' => 'test', + 'name' => 'Test Game Mod', + 'remote_repository_linux' => '', ]); } } From c078a05895bc9779770e3d5a8174b5955095322b Mon Sep 17 00:00:00 2001 From: et-nik Date: Sat, 18 Jun 2022 22:19:10 +0200 Subject: [PATCH 30/37] update gdaemon api tests --- app/UseCases/CreateGameServer.php | 1 - tests/DaemonAPI/ServersTest.php | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app/UseCases/CreateGameServer.php b/app/UseCases/CreateGameServer.php index a39c9a87..822e64e5 100644 --- a/app/UseCases/CreateGameServer.php +++ b/app/UseCases/CreateGameServer.php @@ -2,7 +2,6 @@ namespace Gameap\UseCases; -use Gameap\Helpers\ServerHelper; use Gameap\Models\Server; use Gameap\Repositories\GameModRepository; use Gameap\Repositories\NodeRepository; diff --git a/tests/DaemonAPI/ServersTest.php b/tests/DaemonAPI/ServersTest.php index 4db65e8e..16d08a51 100644 --- a/tests/DaemonAPI/ServersTest.php +++ b/tests/DaemonAPI/ServersTest.php @@ -228,4 +228,31 @@ public function testServersId_InvalidToken() $response->assertStatus(Response::HTTP_UNAUTHORIZED); $response->assertJsonPath('message', 'Invalid api token'); } + + public function testUpdateServer_Success() + { + $node = $this->givenNode(); + $server = $this->givenGameServer($node->id); + + $response = $this->put( + '/gdaemon_api/servers/' . $server->id, + [ + 'installed' => 1, + 'process_active' => 1, + 'last_process_check' => '1971-11-19 22:52:16' + ], + [ + 'X-Auth-Token' => $node->gdaemon_api_token, + 'Accept' => 'application/json', + ] + ); + + $response->assertStatus(Response::HTTP_OK); + $this->assertDatabaseHas('servers', [ + 'id' => $server->id, + 'installed' => 1, + 'process_active' => 1, + 'last_process_check' => '1971-11-19 22:52:16', + ]); + } } From d2127943056737d0b5d5b8a82fa8a5d38b4a8d50 Mon Sep 17 00:00:00 2001 From: et-nik Date: Tue, 17 Jan 2023 10:07:31 +0100 Subject: [PATCH 31/37] add tools path --- app/Services/ServerService.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Services/ServerService.php b/app/Services/ServerService.php index 39c66b2e..c564f592 100644 --- a/app/Services/ServerService.php +++ b/app/Services/ServerService.php @@ -116,6 +116,7 @@ public function replaceShortCodes(Server $server, string $command, array $extraD $replaceArray = [ 'node_work_path' => $server->dedicatedServer->work_path, + 'node_tools_path' => $server->dedicatedServer->work_path . "/tools", 'host' => $server->server_ip, 'port' => $server->server_port, 'query_port' => $server->query_port, From f9c6698d5bfe2f2d2456df767ff3e9361d0203e7 Mon Sep 17 00:00:00 2001 From: et-nik Date: Tue, 17 Jan 2023 10:26:11 +0100 Subject: [PATCH 32/37] add remove repository linux minecraft --- database/seeds/GamesTableSeeder.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/database/seeds/GamesTableSeeder.php b/database/seeds/GamesTableSeeder.php index e2c5e39e..f7fac5cb 100644 --- a/database/seeds/GamesTableSeeder.php +++ b/database/seeds/GamesTableSeeder.php @@ -305,6 +305,7 @@ public function run() 'start_code' => 'minecraft', 'name' => 'Minecraft', 'engine' => 'Minecraft', + 'remote_repository_linux' => 'http://files.gameap.ru/minecraft/minecraft_install.tar.gz', ]); DB::table('games')->insert([ @@ -382,6 +383,7 @@ public function run() 'start_code' => 'mta', 'name' => 'GTA: Multi Theft Auto', 'engine' => 'RenderWare', + 'remote_repository_linux' => 'http://files.gameap.ru/mta/mta.tar.xz', ]); DB::table('games')->insert([ @@ -389,6 +391,7 @@ public function run() 'start_code' => 'fivem', 'name' => 'FiveM', 'engine' => 'Rage', + 'remote_repository_linux' => 'http://files.gameap.ru/fivem/fivem.tar.xz', ]); DB::table('games')->insert([ @@ -457,7 +460,7 @@ public function run() 'steam_app_id_linux' => 376030, 'steam_app_id_windows' => 376030, ]); - + DB::table('games')->insert([ 'code' => 'rust', 'start_code' => 'rust', @@ -465,7 +468,7 @@ public function run() 'engine' => 'Unity', 'steam_app_id_windows' => 258550, ]); - + DB::table('games')->insert([ 'code' => 'hurtworld', 'start_code' => 'hurtworld', From a3fd333ef9a8a73c3d87bf3a31525ceabe530dad Mon Sep 17 00:00:00 2001 From: et-nik Date: Tue, 17 Jan 2023 10:28:06 +0100 Subject: [PATCH 33/37] update version --- config/constants.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/constants.php b/config/constants.php index 899dbc21..d642a6ed 100644 --- a/config/constants.php +++ b/config/constants.php @@ -2,6 +2,6 @@ //file : app/config/constants.php return [ - 'AP_VERSION' => '3.0.0-beta9', - 'AP_DATE' => '29.12.2021' + 'AP_VERSION' => '3.0.0-beta10', + 'AP_DATE' => '17.01.2023' ]; From a9fa12f3d37f7cb314c704b4f4c507264f284b36 Mon Sep 17 00:00:00 2001 From: et-nik Date: Tue, 17 Jan 2023 11:51:33 +0100 Subject: [PATCH 34/37] update packages --- composer.json | 33 +- composer.lock | 1977 +++++++++++++++++++++++++------------------------ 2 files changed, 1041 insertions(+), 969 deletions(-) diff --git a/composer.json b/composer.json index 5a2ff85a..8fa76e4d 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "ext-xml": "*", "ext-zip": "*", "doctrine/dbal": "~2.3", - "fakerphp/faker": "^1.13.0", + "fakerphp/faker": "^1.21.0", "fideloper/proxy": "~4.0", "gameap/gameap-file-manager": "^1.0", "guzzlehttp/guzzle": "^7.4.4", @@ -34,20 +34,20 @@ "knik/gameap-daemon-client": "^0.6", "knik/gameq": "^3.0", "knik/x509": "^0.6.2", - "laravel/framework": "^8.71.0", - "laravel/helpers": "^1.1", - "laravel/legacy-factories": "^1.1", - "laravel/tinker": "^2.5", - "laravel/ui": "^3.0", + "laravel/framework": "^8.83.0", + "laravel/helpers": "^1.6", + "laravel/legacy-factories": "^1.3", + "laravel/tinker": "^2.8", + "laravel/ui": "^3.4", "laravelcollective/html": "^6", - "league/flysystem": "^1.1.5", - "mavinoo/laravel-batch": "^2.3.1", - "moontoast/math": "^1.1", - "nwidart/laravel-modules": "^6.0", - "phpseclib/phpseclib": "^2.0.33", - "silber/bouncer": "v1.0.0-rc.11", + "league/flysystem": "^1.1.10", + "mavinoo/laravel-batch": "^2.3.5", + "moontoast/math": "^1.2", + "nwidart/laravel-modules": "^6.2", + "phpseclib/phpseclib": "^2.0.41", + "silber/bouncer": "v1.0.0", "spatie/laravel-query-builder": "^3.6.0", - "splitbrain/php-archive": "^1.2", + "splitbrain/php-archive": "^1.3", "symfony/property-access": "^5.4", "symfony/serializer": "^5" }, @@ -70,7 +70,7 @@ "App\\": "app/", "GameapModules\\": "modules/", "Database\\Factories\\": "database/factories/", - "Database\\Seeders\\": "database/seeders/" + "Database\\Seeders\\": "database/seeds/" } }, "autoload-dev": { @@ -100,6 +100,9 @@ "config": { "preferred-install": "dist", "sort-packages": true, - "optimize-autoloader": true + "optimize-autoloader": true, + "allow-plugins": { + "joshbrw/laravel-module-installer": true + } } } diff --git a/composer.lock b/composer.lock index 960979db..03cfd088 100644 --- a/composer.lock +++ b/composer.lock @@ -4,30 +4,30 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b8a868c74ed602dc31e6b7da7c018ca1", + "content-hash": "9a1ec2829d2fe40bc6f15a463ec62af0", "packages": [ { "name": "brick/math", - "version": "0.9.3", + "version": "0.10.2", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "ca57d18f028f84f777b2168cd1911b0dee2343ae" + "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/ca57d18f028f84f777b2168cd1911b0dee2343ae", - "reference": "ca57d18f028f84f777b2168cd1911b0dee2343ae", + "url": "https://api.github.com/repos/brick/math/zipball/459f2781e1a08d52ee56b0b1444086e038561e3f", + "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f", "shasum": "" }, "require": { "ext-json": "*", - "php": "^7.1 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "php-coveralls/php-coveralls": "^2.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.0", - "vimeo/psalm": "4.9.2" + "phpunit/phpunit": "^9.0", + "vimeo/psalm": "4.25.0" }, "type": "library", "autoload": { @@ -52,19 +52,15 @@ ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.9.3" + "source": "https://github.com/brick/math/tree/0.10.2" }, "funding": [ { "url": "https://github.com/BenMorel", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/brick/math", - "type": "tidelift" } ], - "time": "2021-08-15T20:50:18+00:00" + "time": "2022-08-10T22:54:19+00:00" }, { "name": "clue/socket-raw", @@ -135,6 +131,81 @@ ], "time": "2020-11-27T13:16:18+00:00" }, + { + "name": "dflydev/dot-access-data", + "version": "v3.0.2", + "source": { + "type": "git", + "url": "https://github.com/dflydev/dflydev-dot-access-data.git", + "reference": "f41715465d65213d644d3141a6a93081be5d3549" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549", + "reference": "f41715465d65213d644d3141a6a93081be5d3549", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.42", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.3", + "scrutinizer/ocular": "1.6.0", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^4.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Dflydev\\DotAccessData\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dragonfly Development Inc.", + "email": "info@dflydev.com", + "homepage": "http://dflydev.com" + }, + { + "name": "Beau Simensen", + "email": "beau@dflydev.com", + "homepage": "http://beausimensen.com" + }, + { + "name": "Carlos Frutos", + "email": "carlos@kiwing.it", + "homepage": "https://github.com/cfrutos" + }, + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "https://www.colinodell.com" + } + ], + "description": "Given a deep data structure, access data by dot notation.", + "homepage": "https://github.com/dflydev/dflydev-dot-access-data", + "keywords": [ + "access", + "data", + "dot", + "notation" + ], + "support": { + "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues", + "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2" + }, + "time": "2022-10-27T11:44:00+00:00" + }, { "name": "doctrine/cache", "version": "2.2.0", @@ -382,37 +453,35 @@ }, { "name": "doctrine/event-manager", - "version": "1.1.1", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f" + "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f", - "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520", + "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520", "shasum": "" }, "require": { + "doctrine/deprecations": "^0.5.3 || ^1", "php": "^7.1 || ^8.0" }, "conflict": { - "doctrine/common": "<2.9@dev" + "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpunit/phpunit": "^7.0" + "doctrine/coding-standard": "^9 || ^10", + "phpstan/phpstan": "~1.4.10 || ^1.8.8", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.24" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common" + "Doctrine\\Common\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -456,7 +525,7 @@ ], "support": { "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/1.1.x" + "source": "https://github.com/doctrine/event-manager/tree/1.2.0" }, "funding": [ { @@ -472,32 +541,32 @@ "type": "tidelift" } ], - "time": "2020-05-29T18:28:51+00:00" + "time": "2022-10-12T20:51:15+00:00" }, { "name": "doctrine/inflector", - "version": "2.0.4", + "version": "2.0.6", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89" + "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", - "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/d9d313a36c872fd6ee06d9a6cbcf713eaa40f024", + "reference": "d9d313a36c872fd6ee06d9a6cbcf713eaa40f024", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "vimeo/psalm": "^4.10" + "doctrine/coding-standard": "^10", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^8.5 || ^9.5", + "vimeo/psalm": "^4.25" }, "type": "library", "autoload": { @@ -547,7 +616,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.4" + "source": "https://github.com/doctrine/inflector/tree/2.0.6" }, "funding": [ { @@ -563,7 +632,7 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:16:43+00:00" + "time": "2022-10-20T09:10:12+00:00" }, { "name": "doctrine/lexer", @@ -643,16 +712,16 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.3.1", + "version": "v3.3.2", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa" + "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/be85b3f05b46c39bbc0d95f6c071ddff669510fa", - "reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8", + "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8", "shasum": "" }, "require": { @@ -692,7 +761,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.1" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.2" }, "funding": [ { @@ -700,7 +769,7 @@ "type": "github" } ], - "time": "2022-01-18T15:43:28+00:00" + "time": "2022-09-10T18:51:20+00:00" }, { "name": "egulias/email-validator", @@ -772,20 +841,20 @@ }, { "name": "fakerphp/faker", - "version": "v1.19.0", + "version": "v1.21.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "d7f08a622b3346766325488aa32ddc93ccdecc75" + "reference": "92efad6a967f0b79c499705c69b662f738cc9e4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/d7f08a622b3346766325488aa32ddc93ccdecc75", - "reference": "d7f08a622b3346766325488aa32ddc93ccdecc75", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/92efad6a967f0b79c499705c69b662f738cc9e4d", + "reference": "92efad6a967f0b79c499705c69b662f738cc9e4d", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0", + "php": "^7.4 || ^8.0", "psr/container": "^1.0 || ^2.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" }, @@ -796,7 +865,8 @@ "bamarni/composer-bin-plugin": "^1.4.1", "doctrine/persistence": "^1.3 || ^2.0", "ext-intl": "*", - "symfony/phpunit-bridge": "^4.4 || ^5.2" + "phpunit/phpunit": "^9.5.26", + "symfony/phpunit-bridge": "^5.4.16" }, "suggest": { "doctrine/orm": "Required to use Faker\\ORM\\Doctrine", @@ -808,7 +878,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "v1.19-dev" + "dev-main": "v1.21-dev" } }, "autoload": { @@ -833,22 +903,22 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.19.0" + "source": "https://github.com/FakerPHP/Faker/tree/v1.21.0" }, - "time": "2022-02-02T17:38:57+00:00" + "time": "2022-12-13T13:54:32+00:00" }, { "name": "fideloper/proxy", - "version": "4.4.1", + "version": "4.4.2", "source": { "type": "git", "url": "https://github.com/fideloper/TrustedProxy.git", - "reference": "c073b2bd04d1c90e04dc1b787662b558dd65ade0" + "reference": "a751f2bc86dd8e6cfef12dc0cbdada82f5a18750" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/c073b2bd04d1c90e04dc1b787662b558dd65ade0", - "reference": "c073b2bd04d1c90e04dc1b787662b558dd65ade0", + "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/a751f2bc86dd8e6cfef12dc0cbdada82f5a18750", + "reference": "a751f2bc86dd8e6cfef12dc0cbdada82f5a18750", "shasum": "" }, "require": { @@ -858,7 +928,7 @@ "require-dev": { "illuminate/http": "^5.0|^6.0|^7.0|^8.0|^9.0", "mockery/mockery": "^1.0", - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^8.5.8|^9.3.3" }, "type": "library", "extra": { @@ -891,9 +961,9 @@ ], "support": { "issues": "https://github.com/fideloper/TrustedProxy/issues", - "source": "https://github.com/fideloper/TrustedProxy/tree/4.4.1" + "source": "https://github.com/fideloper/TrustedProxy/tree/4.4.2" }, - "time": "2020-10-22T13:48:01+00:00" + "time": "2022-02-09T13:33:34+00:00" }, { "name": "gameap/gameap-file-manager", @@ -963,24 +1033,24 @@ }, { "name": "graham-campbell/result-type", - "version": "v1.0.4", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "0690bde05318336c7221785f2a932467f98b64ca" + "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca", - "reference": "0690bde05318336c7221785f2a932467f98b64ca", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8", + "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8", "shasum": "" }, "require": { - "php": "^7.0 || ^8.0", - "phpoption/phpoption": "^1.8" + "php": "^7.2.5 || ^8.0", + "phpoption/phpoption": "^1.9" }, "require-dev": { - "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" + "phpunit/phpunit": "^8.5.28 || ^9.5.21" }, "type": "library", "autoload": { @@ -1009,7 +1079,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.0" }, "funding": [ { @@ -1021,26 +1091,26 @@ "type": "tidelift" } ], - "time": "2021-11-21T21:41:47+00:00" + "time": "2022-07-30T15:56:11+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.4.4", + "version": "7.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8" + "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/e3ff079b22820c2029d4c2a87796b6a0b8716ad8", - "reference": "e3ff079b22820c2029d4c2a87796b6a0b8716ad8", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", + "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", + "guzzlehttp/psr7": "^1.9 || ^2.4", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -1049,10 +1119,10 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.1", "ext-curl": "*", "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^8.5.5 || ^9.3.5", + "phpunit/phpunit": "^8.5.29 || ^9.5.23", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -1062,8 +1132,12 @@ }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + }, "branch-alias": { - "dev-master": "7.4-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -1129,7 +1203,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.4" + "source": "https://github.com/guzzle/guzzle/tree/7.5.0" }, "funding": [ { @@ -1145,20 +1219,20 @@ "type": "tidelift" } ], - "time": "2022-06-09T21:39:15+00:00" + "time": "2022-08-28T15:39:27+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "reference": "b94b2807d85443f9719887892882d0329d1e2598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", + "reference": "b94b2807d85443f9719887892882d0329d1e2598", "shasum": "" }, "require": { @@ -1213,7 +1287,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.1" + "source": "https://github.com/guzzle/promises/tree/1.5.2" }, "funding": [ { @@ -1229,20 +1303,20 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:56:57+00:00" + "time": "2022-08-28T14:55:35+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.3.0", + "version": "2.4.3", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee" + "reference": "67c26b443f348a51926030c83481b85718457d3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/83260bb50b8fc753c72d14dc1621a2dac31877ee", - "reference": "83260bb50b8fc753c72d14dc1621a2dac31877ee", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d", + "reference": "67c26b443f348a51926030c83481b85718457d3d", "shasum": "" }, "require": { @@ -1256,17 +1330,21 @@ "psr/http-message-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.1", "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.8 || ^9.3.10" + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + }, "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -1328,7 +1406,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.3.0" + "source": "https://github.com/guzzle/psr7/tree/2.4.3" }, "funding": [ { @@ -1344,7 +1422,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T08:26:02+00:00" + "time": "2022-10-26T14:07:24+00:00" }, { "name": "intervention/image", @@ -1899,16 +1977,16 @@ }, { "name": "laravel/framework", - "version": "v8.83.16", + "version": "v8.83.27", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "6be5abd144faf517879af7298e9d79f06f250f75" + "reference": "e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/6be5abd144faf517879af7298e9d79f06f250f75", - "reference": "6be5abd144faf517879af7298e9d79f06f250f75", + "url": "https://api.github.com/repos/laravel/framework/zipball/e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49", + "reference": "e1afe088b4ca613fb96dc57e6d8dbcb8cc2c6b49", "shasum": "" }, "require": { @@ -2068,24 +2146,24 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-06-07T15:09:06+00:00" + "time": "2022-12-08T15:28:55+00:00" }, { "name": "laravel/helpers", - "version": "v1.5.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/laravel/helpers.git", - "reference": "c28b0ccd799d58564c41a62395ac9511a1e72931" + "reference": "4dd0f9436d3911611622a6ced8329a1710576f60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/helpers/zipball/c28b0ccd799d58564c41a62395ac9511a1e72931", - "reference": "c28b0ccd799d58564c41a62395ac9511a1e72931", + "url": "https://api.github.com/repos/laravel/helpers/zipball/4dd0f9436d3911611622a6ced8329a1710576f60", + "reference": "4dd0f9436d3911611622a6ced8329a1710576f60", "shasum": "" }, "require": { - "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0", + "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0", "php": "^7.1.3|^8.0" }, "require-dev": { @@ -2122,26 +2200,26 @@ "laravel" ], "support": { - "source": "https://github.com/laravel/helpers/tree/v1.5.0" + "source": "https://github.com/laravel/helpers/tree/v1.6.0" }, - "time": "2022-01-12T15:58:51+00:00" + "time": "2023-01-09T14:48:11+00:00" }, { "name": "laravel/legacy-factories", - "version": "v1.3.0", + "version": "v1.3.2", "source": { "type": "git", "url": "https://github.com/laravel/legacy-factories.git", - "reference": "5edc7e7eb76e7b4b29221f32139bcbf806c8870f" + "reference": "cc6720da81094c82ea9f4737d615dd3d71f7f43d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/legacy-factories/zipball/5edc7e7eb76e7b4b29221f32139bcbf806c8870f", - "reference": "5edc7e7eb76e7b4b29221f32139bcbf806c8870f", + "url": "https://api.github.com/repos/laravel/legacy-factories/zipball/cc6720da81094c82ea9f4737d615dd3d71f7f43d", + "reference": "cc6720da81094c82ea9f4737d615dd3d71f7f43d", "shasum": "" }, "require": { - "illuminate/macroable": "^8.0|^9.0", + "illuminate/macroable": "^8.0|^9.0|^10.0", "php": "^7.3|^8.0", "symfony/finder": "^3.4|^4.0|^5.0|^6.0" }, @@ -2180,29 +2258,30 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-01-13T08:45:08+00:00" + "time": "2023-01-09T14:49:00+00:00" }, { "name": "laravel/serializable-closure", - "version": "v1.2.0", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "09f0e9fb61829f628205b7c94906c28740ff9540" + "reference": "47afb7fae28ed29057fdca37e16a84f90cc62fae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540", - "reference": "09f0e9fb61829f628205b7c94906c28740ff9540", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/47afb7fae28ed29057fdca37e16a84f90cc62fae", + "reference": "47afb7fae28ed29057fdca37e16a84f90cc62fae", "shasum": "" }, "require": { "php": "^7.3|^8.0" }, "require-dev": { - "pestphp/pest": "^1.18", - "phpstan/phpstan": "^0.12.98", - "symfony/var-dumper": "^5.3" + "nesbot/carbon": "^2.61", + "pestphp/pest": "^1.21.3", + "phpstan/phpstan": "^1.8.2", + "symfony/var-dumper": "^5.4.11" }, "type": "library", "extra": { @@ -2239,26 +2318,26 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2022-05-16T17:09:47+00:00" + "time": "2022-09-08T13:45:54+00:00" }, { "name": "laravel/tinker", - "version": "v2.7.2", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "dff39b661e827dae6e092412f976658df82dbac5" + "reference": "74d0b287cc4ae65d15c368dd697aae71d62a73ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/dff39b661e827dae6e092412f976658df82dbac5", - "reference": "dff39b661e827dae6e092412f976658df82dbac5", + "url": "https://api.github.com/repos/laravel/tinker/zipball/74d0b287cc4ae65d15c368dd697aae71d62a73ad", + "reference": "74d0b287cc4ae65d15c368dd697aae71d62a73ad", "shasum": "" }, "require": { - "illuminate/console": "^6.0|^7.0|^8.0|^9.0", - "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0", + "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0", "php": "^7.2.5|^8.0", "psy/psysh": "^0.10.4|^0.11.1", "symfony/var-dumper": "^4.3.4|^5.0|^6.0" @@ -2268,7 +2347,7 @@ "phpunit/phpunit": "^8.5.8|^9.3.3" }, "suggest": { - "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0)." + "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0)." }, "type": "library", "extra": { @@ -2305,9 +2384,9 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.7.2" + "source": "https://github.com/laravel/tinker/tree/v2.8.0" }, - "time": "2022-03-23T12:38:24+00:00" + "time": "2023-01-10T18:03:30+00:00" }, { "name": "laravel/ui", @@ -2444,42 +2523,54 @@ }, { "name": "league/commonmark", - "version": "1.6.7", + "version": "2.3.8", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "2b8185c13bc9578367a5bf901881d1c1b5bbd09b" + "reference": "c493585c130544c4e91d2e0e131e6d35cb0cbc47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2b8185c13bc9578367a5bf901881d1c1b5bbd09b", - "reference": "2b8185c13bc9578367a5bf901881d1c1b5bbd09b", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c493585c130544c4e91d2e0e131e6d35cb0cbc47", + "reference": "c493585c130544c4e91d2e0e131e6d35cb0cbc47", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": "^7.1 || ^8.0" - }, - "conflict": { - "scrutinizer/ocular": "1.7.*" + "league/config": "^1.1.1", + "php": "^7.4 || ^8.0", + "psr/event-dispatcher": "^1.0", + "symfony/deprecation-contracts": "^2.1 || ^3.0", + "symfony/polyfill-php80": "^1.16" }, "require-dev": { - "cebe/markdown": "~1.0", - "commonmark/commonmark.js": "0.29.2", - "erusev/parsedown": "~1.0", + "cebe/markdown": "^1.0", + "commonmark/cmark": "0.30.0", + "commonmark/commonmark.js": "0.30.0", + "composer/package-versions-deprecated": "^1.8", + "embed/embed": "^4.4", + "erusev/parsedown": "^1.0", "ext-json": "*", "github/gfm": "0.29.0", - "michelf/php-markdown": "~1.4", - "mikehaertl/php-shellcommand": "^1.4", - "phpstan/phpstan": "^0.12.90", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.2", - "scrutinizer/ocular": "^1.5", - "symfony/finder": "^4.2" + "michelf/php-markdown": "^1.4 || ^2.0", + "nyholm/psr7": "^1.5", + "phpstan/phpstan": "^1.8.2", + "phpunit/phpunit": "^9.5.21", + "scrutinizer/ocular": "^1.8.1", + "symfony/finder": "^5.3 | ^6.0", + "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0", + "unleashedtech/php-coding-standard": "^3.1.1", + "vimeo/psalm": "^4.24.0 || ^5.0.0" + }, + "suggest": { + "symfony/yaml": "v2.3+ required if using the Front Matter extension" }, - "bin": [ - "bin/commonmark" - ], "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.4-dev" + } + }, "autoload": { "psr-4": { "League\\CommonMark\\": "src" @@ -2497,7 +2588,7 @@ "role": "Lead Developer" } ], - "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and Github-Flavored Markdown (GFM)", + "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and GitHub-Flavored Markdown (GFM)", "homepage": "https://commonmark.thephpleague.com", "keywords": [ "commonmark", @@ -2511,6 +2602,7 @@ ], "support": { "docs": "https://commonmark.thephpleague.com/", + "forum": "https://github.com/thephpleague/commonmark/discussions", "issues": "https://github.com/thephpleague/commonmark/issues", "rss": "https://github.com/thephpleague/commonmark/releases.atom", "source": "https://github.com/thephpleague/commonmark" @@ -2533,20 +2625,102 @@ "type": "tidelift" } ], - "time": "2022-01-13T17:18:13+00:00" + "time": "2022-12-10T16:02:17+00:00" + }, + { + "name": "league/config", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/config.git", + "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/config/zipball/754b3604fb2984c71f4af4a9cbe7b57f346ec1f3", + "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3", + "shasum": "" + }, + "require": { + "dflydev/dot-access-data": "^3.0.1", + "nette/schema": "^1.2", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.8.2", + "phpunit/phpunit": "^9.5.5", + "scrutinizer/ocular": "^1.8.1", + "unleashedtech/php-coding-standard": "^3.1", + "vimeo/psalm": "^4.7.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.2-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Config\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "https://www.colinodell.com", + "role": "Lead Developer" + } + ], + "description": "Define configuration arrays with strict schemas and access values with dot notation", + "homepage": "https://config.thephpleague.com", + "keywords": [ + "array", + "config", + "configuration", + "dot", + "dot-access", + "nested", + "schema" + ], + "support": { + "docs": "https://config.thephpleague.com/", + "issues": "https://github.com/thephpleague/config/issues", + "rss": "https://github.com/thephpleague/config/releases.atom", + "source": "https://github.com/thephpleague/config" + }, + "funding": [ + { + "url": "https://www.colinodell.com/sponsor", + "type": "custom" + }, + { + "url": "https://www.paypal.me/colinpodell/10.00", + "type": "custom" + }, + { + "url": "https://github.com/colinodell", + "type": "github" + } + ], + "time": "2022-12-11T20:36:23+00:00" }, { "name": "league/flysystem", - "version": "1.1.9", + "version": "1.1.10", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "094defdb4a7001845300334e7c1ee2335925ef99" + "reference": "3239285c825c152bcc315fe0e87d6b55f5972ed1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99", - "reference": "094defdb4a7001845300334e7c1ee2335925ef99", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3239285c825c152bcc315fe0e87d6b55f5972ed1", + "reference": "3239285c825c152bcc315fe0e87d6b55f5972ed1", "shasum": "" }, "require": { @@ -2619,7 +2793,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/1.1.9" + "source": "https://github.com/thephpleague/flysystem/tree/1.1.10" }, "funding": [ { @@ -2627,7 +2801,7 @@ "type": "other" } ], - "time": "2021-12-09T09:40:50+00:00" + "time": "2022-10-04T09:16:37+00:00" }, { "name": "league/mime-type-detection", @@ -2687,16 +2861,16 @@ }, { "name": "mavinoo/laravel-batch", - "version": "v2.3.4", + "version": "v2.3.5", "source": { "type": "git", "url": "https://github.com/mavinoo/laravelBatch.git", - "reference": "126f077dec4ecabb67331694e71bf28b427daa60" + "reference": "379d04f1914901aa7ef72e89243dc624674d233c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mavinoo/laravelBatch/zipball/126f077dec4ecabb67331694e71bf28b427daa60", - "reference": "126f077dec4ecabb67331694e71bf28b427daa60", + "url": "https://api.github.com/repos/mavinoo/laravelBatch/zipball/379d04f1914901aa7ef72e89243dc624674d233c", + "reference": "379d04f1914901aa7ef72e89243dc624674d233c", "shasum": "" }, "require": { @@ -2737,22 +2911,22 @@ "description": "Insert and update batch (bulk) in laravel", "support": { "issues": "https://github.com/mavinoo/laravelBatch/issues", - "source": "https://github.com/mavinoo/laravelBatch/tree/v2.3.4" + "source": "https://github.com/mavinoo/laravelBatch/tree/v2.3.5" }, - "time": "2022-04-20T12:04:23+00:00" + "time": "2022-12-08T13:05:18+00:00" }, { "name": "monolog/monolog", - "version": "2.7.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524" + "reference": "720488632c590286b88b80e62aa3d3d551ad4a50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524", - "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50", + "reference": "720488632c590286b88b80e62aa3d3d551ad4a50", "shasum": "" }, "require": { @@ -2772,11 +2946,10 @@ "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "php-console/php-console": "^3.1.3", "phpspec/prophecy": "^1.15", "phpstan/phpstan": "^0.12.91", "phpunit/phpunit": "^8.5.14", - "predis/predis": "^1.1", + "predis/predis": "^1.1 || ^2.0", "rollbar/rollbar": "^1.3 || ^2 || ^3", "ruflin/elastica": "^7", "swiftmailer/swiftmailer": "^5.3|^6.0", @@ -2796,7 +2969,6 @@ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", - "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, @@ -2831,7 +3003,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.7.0" + "source": "https://github.com/Seldaek/monolog/tree/2.8.0" }, "funding": [ { @@ -2843,7 +3015,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T08:59:12+00:00" + "time": "2022-07-24T11:55:47+00:00" }, { "name": "moontoast/math", @@ -2902,16 +3074,16 @@ }, { "name": "nesbot/carbon", - "version": "2.58.0", + "version": "2.65.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055" + "reference": "09acf64155c16dc6f580f36569ae89344e9734a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/97a34af22bde8d0ac20ab34b29d7bfe360902055", - "reference": "97a34af22bde8d0ac20ab34b29d7bfe360902055", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/09acf64155c16dc6f580f36569ae89344e9734a3", + "reference": "09acf64155c16dc6f580f36569ae89344e9734a3", "shasum": "" }, "require": { @@ -2922,15 +3094,16 @@ "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { - "doctrine/dbal": "^2.0 || ^3.0", + "doctrine/dbal": "^2.0 || ^3.1.4", "doctrine/orm": "^2.7", "friendsofphp/php-cs-fixer": "^3.0", "kylekatarnls/multi-tester": "^2.0", + "ondrejmirtes/better-reflection": "*", "phpmd/phpmd": "^2.9", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.54 || ^1.0", - "phpunit/php-file-iterator": "^2.0.5", - "phpunit/phpunit": "^7.5.20 || ^8.5.23", + "phpstan/phpstan": "^0.12.99 || ^1.7.14", + "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6", + "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20", "squizlabs/php_codesniffer": "^3.4" }, "bin": [ @@ -2987,28 +3160,179 @@ }, "funding": [ { - "url": "https://opencollective.com/Carbon", - "type": "open_collective" + "url": "https://github.com/sponsors/kylekatarnls", + "type": "github" + }, + { + "url": "https://opencollective.com/Carbon#sponsor", + "type": "opencollective" }, { - "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "url": "https://tidelift.com/subscription/pkg/packagist-nesbot-carbon?utm_source=packagist-nesbot-carbon&utm_medium=referral&utm_campaign=readme", "type": "tidelift" } ], - "time": "2022-04-25T19:31:17+00:00" + "time": "2023-01-06T15:55:01+00:00" + }, + { + "name": "nette/schema", + "version": "v1.2.3", + "source": { + "type": "git", + "url": "https://github.com/nette/schema.git", + "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f", + "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f", + "shasum": "" + }, + "require": { + "nette/utils": "^2.5.7 || ^3.1.5 || ^4.0", + "php": ">=7.1 <8.3" + }, + "require-dev": { + "nette/tester": "^2.3 || ^2.4", + "phpstan/phpstan-nette": "^1.0", + "tracy/tracy": "^2.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause", + "GPL-2.0-only", + "GPL-3.0-only" + ], + "authors": [ + { + "name": "David Grudl", + "homepage": "https://davidgrudl.com" + }, + { + "name": "Nette Community", + "homepage": "https://nette.org/contributors" + } + ], + "description": "📐 Nette Schema: validating data structures against a given Schema.", + "homepage": "https://nette.org", + "keywords": [ + "config", + "nette" + ], + "support": { + "issues": "https://github.com/nette/schema/issues", + "source": "https://github.com/nette/schema/tree/v1.2.3" + }, + "time": "2022-10-13T01:24:26+00:00" + }, + { + "name": "nette/utils", + "version": "v3.2.8", + "source": { + "type": "git", + "url": "https://github.com/nette/utils.git", + "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nette/utils/zipball/02a54c4c872b99e4ec05c4aec54b5a06eb0f6368", + "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368", + "shasum": "" + }, + "require": { + "php": ">=7.2 <8.3" + }, + "conflict": { + "nette/di": "<3.0.6" + }, + "require-dev": { + "nette/tester": "~2.0", + "phpstan/phpstan": "^1.0", + "tracy/tracy": "^2.3" + }, + "suggest": { + "ext-gd": "to use Image", + "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()", + "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()", + "ext-json": "to use Nette\\Utils\\Json", + "ext-mbstring": "to use Strings::lower() etc...", + "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()", + "ext-xml": "to use Strings::length() etc. when mbstring is not available" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause", + "GPL-2.0-only", + "GPL-3.0-only" + ], + "authors": [ + { + "name": "David Grudl", + "homepage": "https://davidgrudl.com" + }, + { + "name": "Nette Community", + "homepage": "https://nette.org/contributors" + } + ], + "description": "🛠 Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.", + "homepage": "https://nette.org", + "keywords": [ + "array", + "core", + "datetime", + "images", + "json", + "nette", + "paginator", + "password", + "slugify", + "string", + "unicode", + "utf-8", + "utility", + "validation" + ], + "support": { + "issues": "https://github.com/nette/utils/issues", + "source": "https://github.com/nette/utils/tree/v3.2.8" + }, + "time": "2022-09-12T23:36:20+00:00" }, { "name": "nikic/php-parser", - "version": "v4.14.0", + "version": "v4.15.3", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1" + "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1", - "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039", + "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039", "shasum": "" }, "require": { @@ -3049,9 +3373,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3" }, - "time": "2022-05-31T20:59:12+00:00" + "time": "2023-01-16T22:05:37+00:00" }, { "name": "nwidart/laravel-modules", @@ -3195,29 +3519,33 @@ }, { "name": "phpoption/phpoption", - "version": "1.8.1", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15" + "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", - "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab", + "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab", "shasum": "" }, "require": { - "php": "^7.0 || ^8.0" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", - "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" + "bamarni/composer-bin-plugin": "^1.8", + "phpunit/phpunit": "^8.5.28 || ^9.5.21" }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, "branch-alias": { - "dev-master": "1.8-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -3250,7 +3578,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.8.1" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.0" }, "funding": [ { @@ -3262,7 +3590,7 @@ "type": "tidelift" } ], - "time": "2021-12-04T23:24:31+00:00" + "time": "2022-07-30T15:51:26+00:00" }, { "name": "phpseclib/bcmath_compat", @@ -3328,16 +3656,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "2.0.37", + "version": "2.0.41", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c" + "reference": "7e763c6f97ec1fcb37c46aa8ecfc20a2c71d9c1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c812fbb4d6b4d7f30235ab7298a12f09ba13b37c", - "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7e763c6f97ec1fcb37c46aa8ecfc20a2c71d9c1b", + "reference": "7e763c6f97ec1fcb37c46aa8ecfc20a2c71d9c1b", "shasum": "" }, "require": { @@ -3352,7 +3680,8 @@ "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", - "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." + "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.", + "ext-xml": "Install the XML extension to load XML formatted public keys." }, "type": "library", "autoload": { @@ -3417,7 +3746,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/2.0.37" + "source": "https://github.com/phpseclib/phpseclib/tree/2.0.41" }, "funding": [ { @@ -3433,24 +3762,24 @@ "type": "tidelift" } ], - "time": "2022-04-04T04:57:45+00:00" + "time": "2022-12-23T16:44:18+00:00" }, { "name": "psr/container", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": ">=7.4.0" }, "type": "library", "autoload": { @@ -3479,9 +3808,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" + "source": "https://github.com/php-fig/container/tree/1.1.2" }, - "time": "2021-03-05T17:36:06+00:00" + "time": "2021-11-05T16:50:12+00:00" }, { "name": "psr/event-dispatcher", @@ -3695,30 +4024,30 @@ }, { "name": "psr/log", - "version": "1.1.4", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -3739,9 +4068,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "source": "https://github.com/php-fig/log/tree/2.0.0" }, - "time": "2021-05-03T11:20:27+00:00" + "time": "2021-07-14T16:41:46+00:00" }, { "name": "psr/simple-cache", @@ -3796,16 +4125,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.5", + "version": "v0.11.10", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "c23686f9c48ca202710dbb967df8385a952a2daf" + "reference": "e9eadffbed9c9deb5426fd107faae0452bf20a36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/c23686f9c48ca202710dbb967df8385a952a2daf", - "reference": "c23686f9c48ca202710dbb967df8385a952a2daf", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e9eadffbed9c9deb5426fd107faae0452bf20a36", + "reference": "e9eadffbed9c9deb5426fd107faae0452bf20a36", "shasum": "" }, "require": { @@ -3866,9 +4195,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.5" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.10" }, - "time": "2022-05-27T18:03:49+00:00" + "time": "2022-12-23T17:47:18+00:00" }, { "name": "ralouphie/getallheaders", @@ -3916,42 +4245,52 @@ }, { "name": "ramsey/collection", - "version": "1.2.2", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a" + "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a", - "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a", + "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5", + "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5", "shasum": "" }, "require": { - "php": "^7.3 || ^8", - "symfony/polyfill-php81": "^1.23" + "php": "^8.1" }, "require-dev": { - "captainhook/captainhook": "^5.3", - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "ergebnis/composer-normalize": "^2.6", - "fakerphp/faker": "^1.5", - "hamcrest/hamcrest-php": "^2", - "jangregor/phpstan-prophecy": "^0.8", - "mockery/mockery": "^1.3", + "captainhook/plugin-composer": "^5.3", + "ergebnis/composer-normalize": "^2.28.3", + "fakerphp/faker": "^1.21", + "hamcrest/hamcrest-php": "^2.0", + "jangregor/phpstan-prophecy": "^1.0", + "mockery/mockery": "^1.5", + "php-parallel-lint/php-console-highlighter": "^1.0", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phpcsstandards/phpcsutils": "^1.0.0-rc1", "phpspec/prophecy-phpunit": "^2.0", - "phpstan/extension-installer": "^1", - "phpstan/phpstan": "^0.12.32", - "phpstan/phpstan-mockery": "^0.12.5", - "phpstan/phpstan-phpunit": "^0.12.11", - "phpunit/phpunit": "^8.5 || ^9", - "psy/psysh": "^0.10.4", - "slevomat/coding-standard": "^6.3", - "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^4.4" + "phpstan/extension-installer": "^1.2", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5", + "psalm/plugin-mockery": "^1.1", + "psalm/plugin-phpunit": "^0.18.4", + "ramsey/coding-standard": "^2.0.3", + "ramsey/conventional-commits": "^1.3", + "vimeo/psalm": "^5.4" }, "type": "library", + "extra": { + "captainhook": { + "force-install": true + }, + "ramsey/conventional-commits": { + "configFile": "conventional-commits.json" + } + }, "autoload": { "psr-4": { "Ramsey\\Collection\\": "src/" @@ -3979,7 +4318,7 @@ ], "support": { "issues": "https://github.com/ramsey/collection/issues", - "source": "https://github.com/ramsey/collection/tree/1.2.2" + "source": "https://github.com/ramsey/collection/tree/2.0.0" }, "funding": [ { @@ -3991,29 +4330,27 @@ "type": "tidelift" } ], - "time": "2021-10-10T03:01:02+00:00" + "time": "2022-12-31T21:50:55+00:00" }, { "name": "ramsey/uuid", - "version": "4.2.3", + "version": "4.7.3", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df" + "reference": "433b2014e3979047db08a17a205f410ba3869cf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df", - "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/433b2014e3979047db08a17a205f410ba3869cf2", + "reference": "433b2014e3979047db08a17a205f410ba3869cf2", "shasum": "" }, "require": { - "brick/math": "^0.8 || ^0.9", + "brick/math": "^0.8.8 || ^0.9 || ^0.10", "ext-json": "*", - "php": "^7.2 || ^8.0", - "ramsey/collection": "^1.0", - "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-php80": "^1.14" + "php": "^8.0", + "ramsey/collection": "^1.2 || ^2.0" }, "replace": { "rhumsaa/uuid": "self.version" @@ -4025,24 +4362,23 @@ "doctrine/annotations": "^1.8", "ergebnis/composer-normalize": "^2.15", "mockery/mockery": "^1.3", - "moontoast/math": "^1.1", "paragonie/random-lib": "^2", "php-mock/php-mock": "^2.2", "php-mock/php-mock-mockery": "^1.3", "php-parallel-lint/php-parallel-lint": "^1.1", "phpbench/phpbench": "^1.0", - "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-mockery": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-phpunit": "^1.1", "phpunit/phpunit": "^8.5 || ^9", - "slevomat/coding-standard": "^7.0", + "ramsey/composer-repl": "^1.4", + "slevomat/coding-standard": "^8.4", "squizlabs/php_codesniffer": "^3.5", "vimeo/psalm": "^4.9" }, "suggest": { "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.", - "ext-ctype": "Enables faster processing of character classification using ctype functions.", "ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.", "ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.", "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter", @@ -4050,9 +4386,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "4.x-dev" - }, "captainhook": { "force-install": true } @@ -4077,7 +4410,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.2.3" + "source": "https://github.com/ramsey/uuid/tree/4.7.3" }, "funding": [ { @@ -4089,33 +4422,33 @@ "type": "tidelift" } ], - "time": "2021-09-25T23:10:38+00:00" + "time": "2023-01-12T18:13:24+00:00" }, { "name": "silber/bouncer", - "version": "v1.0.0-rc.11", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/JosephSilber/bouncer.git", - "reference": "36ebbe26ebe2efc275c024eb33f3c63f6d112d6a" + "reference": "ea1b7961b16b9556dfdf0a02522ed9f7b2cb1907" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JosephSilber/bouncer/zipball/36ebbe26ebe2efc275c024eb33f3c63f6d112d6a", - "reference": "36ebbe26ebe2efc275c024eb33f3c63f6d112d6a", + "url": "https://api.github.com/repos/JosephSilber/bouncer/zipball/ea1b7961b16b9556dfdf0a02522ed9f7b2cb1907", + "reference": "ea1b7961b16b9556dfdf0a02522ed9f7b2cb1907", "shasum": "" }, "require": { - "illuminate/auth": "^6.0|^7.0|^8.0", - "illuminate/cache": "^6.0|^7.0|^8.0", - "illuminate/container": "^6.0|^7.0|^8.0", - "illuminate/contracts": "^6.0|^7.0|^8.0", - "illuminate/database": "^6.0|^7.0|^8.0", + "illuminate/auth": "^6.0|^7.0|^8.0|^9.0", + "illuminate/cache": "^6.0|^7.0|^8.0|^9.0", + "illuminate/container": "^6.0|^7.0|^8.0|^9.0", + "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0", + "illuminate/database": "^6.0|^7.0|^8.0|^9.0", "php": "^7.2|^8.0" }, "require-dev": { - "illuminate/console": "^6.0|^7.0|^8.0", - "illuminate/events": "^6.0|^7.0|^8.0", + "illuminate/console": "^6.0|^7.0|^8.0|^9.0", + "illuminate/events": "^6.0|^7.0|^8.0|^9.0", "larapack/dd": "^1.1", "mockery/mockery": "^1.3.3", "phpunit/phpunit": "^8.0|^9.0" @@ -4162,9 +4495,9 @@ ], "support": { "issues": "https://github.com/JosephSilber/bouncer/issues", - "source": "https://github.com/JosephSilber/bouncer/tree/v1.0.0-rc.11" + "source": "https://github.com/JosephSilber/bouncer/tree/v1.0.0" }, - "time": "2021-11-25T14:20:18+00:00" + "time": "2022-02-21T13:39:05+00:00" }, { "name": "sop/asn1", @@ -4444,16 +4777,16 @@ }, { "name": "spatie/laravel-query-builder", - "version": "3.6.2", + "version": "3.6.3", "source": { "type": "git", "url": "https://github.com/spatie/laravel-query-builder.git", - "reference": "3768381e9f2f80b01f0088eca49f061c269e0e8b" + "reference": "4510ac8a450656df45b6d1bcb222fe12e413ad56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/3768381e9f2f80b01f0088eca49f061c269e0e8b", - "reference": "3768381e9f2f80b01f0088eca49f061c269e0e8b", + "url": "https://api.github.com/repos/spatie/laravel-query-builder/zipball/4510ac8a450656df45b6d1bcb222fe12e413ad56", + "reference": "4510ac8a450656df45b6d1bcb222fe12e413ad56", "shasum": "" }, "require": { @@ -4510,7 +4843,7 @@ "type": "custom" } ], - "time": "2022-01-09T15:39:13+00:00" + "time": "2022-08-30T06:53:23+00:00" }, { "name": "splitbrain/php-archive", @@ -4650,16 +4983,16 @@ }, { "name": "symfony/console", - "version": "v5.4.9", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb" + "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/829d5d1bf60b2efeb0887b7436873becc71a45eb", - "reference": "829d5d1bf60b2efeb0887b7436873becc71a45eb", + "url": "https://api.github.com/repos/symfony/console/zipball/58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f", + "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f", "shasum": "" }, "require": { @@ -4729,7 +5062,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.9" + "source": "https://github.com/symfony/console/tree/v5.4.17" }, "funding": [ { @@ -4745,25 +5078,24 @@ "type": "tidelift" } ], - "time": "2022-05-18T06:17:34+00:00" + "time": "2022-12-28T14:15:31+00:00" }, { "name": "symfony/css-selector", - "version": "v5.4.3", + "version": "v6.2.3", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "b0a190285cd95cb019237851205b8140ef6e368e" + "reference": "ab1df4ba3ded7b724766ba3a6e0eca0418e74f80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/b0a190285cd95cb019237851205b8140ef6e368e", - "reference": "b0a190285cd95cb019237851205b8140ef6e368e", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/ab1df4ba3ded7b724766ba3a6e0eca0418e74f80", + "reference": "ab1df4ba3ded7b724766ba3a6e0eca0418e74f80", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1" }, "type": "library", "autoload": { @@ -4795,7 +5127,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.4.3" + "source": "https://github.com/symfony/css-selector/tree/v6.2.3" }, "funding": [ { @@ -4811,29 +5143,29 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-12-28T14:26:22+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.1", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3", + "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.3-dev" }, "thanks": { "name": "symfony/contracts", @@ -4862,7 +5194,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0" }, "funding": [ { @@ -4878,20 +5210,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-11-25T10:21:52+00:00" }, { "name": "symfony/error-handler", - "version": "v5.4.9", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "c116cda1f51c678782768dce89a45f13c949455d" + "reference": "b900446552833ad2f91ca7dd52aa8ffe78f66cb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/c116cda1f51c678782768dce89a45f13c949455d", - "reference": "c116cda1f51c678782768dce89a45f13c949455d", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/b900446552833ad2f91ca7dd52aa8ffe78f66cb2", + "reference": "b900446552833ad2f91ca7dd52aa8ffe78f66cb2", "shasum": "" }, "require": { @@ -4933,7 +5265,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v5.4.9" + "source": "https://github.com/symfony/error-handler/tree/v5.4.17" }, "funding": [ { @@ -4949,44 +5281,42 @@ "type": "tidelift" } ], - "time": "2022-05-21T13:57:48+00:00" + "time": "2022-12-13T09:43:00+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.9", + "version": "v6.2.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc" + "reference": "3ffeb31139b49bf6ef0bc09d1db95eac053388d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", - "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3ffeb31139b49bf6ef0bc09d1db95eac053388d1", + "reference": "3ffeb31139b49bf6ef0bc09d1db95eac053388d1", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/event-dispatcher-contracts": "^2|^3", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1", + "symfony/event-dispatcher-contracts": "^2|^3" }, "conflict": { - "symfony/dependency-injection": "<4.4" + "symfony/dependency-injection": "<5.4" }, "provide": { "psr/event-dispatcher-implementation": "1.0", - "symfony/event-dispatcher-implementation": "2.0" + "symfony/event-dispatcher-implementation": "2.0|3.0" }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/config": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/error-handler": "^5.4|^6.0", + "symfony/expression-language": "^5.4|^6.0", + "symfony/http-foundation": "^5.4|^6.0", "symfony/service-contracts": "^1.1|^2|^3", - "symfony/stopwatch": "^4.4|^5.0|^6.0" + "symfony/stopwatch": "^5.4|^6.0" }, "suggest": { "symfony/dependency-injection": "", @@ -5018,7 +5348,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.2" }, "funding": [ { @@ -5034,24 +5364,24 @@ "type": "tidelift" } ], - "time": "2022-05-05T16:45:39+00:00" + "time": "2022-12-14T16:11:27+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.1", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" + "reference": "0782b0b52a737a05b4383d0df35a474303cabdae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0782b0b52a737a05b4383d0df35a474303cabdae", + "reference": "0782b0b52a737a05b4383d0df35a474303cabdae", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.1", "psr/event-dispatcher": "^1" }, "suggest": { @@ -5060,7 +5390,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.3-dev" }, "thanks": { "name": "symfony/contracts", @@ -5097,7 +5427,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.0" }, "funding": [ { @@ -5113,20 +5443,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-11-25T10:21:52+00:00" }, { "name": "symfony/finder", - "version": "v5.4.8", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9" + "reference": "40c08632019838dfb3350f18cf5563b8080055fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9", - "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9", + "url": "https://api.github.com/repos/symfony/finder/zipball/40c08632019838dfb3350f18cf5563b8080055fc", + "reference": "40c08632019838dfb3350f18cf5563b8080055fc", "shasum": "" }, "require": { @@ -5160,7 +5490,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.8" + "source": "https://github.com/symfony/finder/tree/v5.4.17" }, "funding": [ { @@ -5176,20 +5506,20 @@ "type": "tidelift" } ], - "time": "2022-04-15T08:07:45+00:00" + "time": "2022-12-22T10:31:03+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.4.9", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "6b0d0e4aca38d57605dcd11e2416994b38774522" + "reference": "b64a0e2df212d5849e4584cabff0cf09c5d6866a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6b0d0e4aca38d57605dcd11e2416994b38774522", - "reference": "6b0d0e4aca38d57605dcd11e2416994b38774522", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b64a0e2df212d5849e4584cabff0cf09c5d6866a", + "reference": "b64a0e2df212d5849e4584cabff0cf09c5d6866a", "shasum": "" }, "require": { @@ -5201,8 +5531,11 @@ "require-dev": { "predis/predis": "~1.0", "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/mime": "^4.4|^5.0|^6.0" + "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4", + "symfony/mime": "^4.4|^5.0|^6.0", + "symfony/rate-limiter": "^5.2|^6.0" }, "suggest": { "symfony/mime": "To use the file extension guesser" @@ -5233,7 +5566,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.9" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.17" }, "funding": [ { @@ -5249,20 +5582,20 @@ "type": "tidelift" } ], - "time": "2022-05-17T15:07:29+00:00" + "time": "2022-12-14T08:23:03+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.4.9", + "version": "v5.4.18", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "34b121ad3dc761f35fe1346d2f15618f8cbf77f8" + "reference": "5da6f57a13e5d7d77197443cf55697cdf65f1352" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/34b121ad3dc761f35fe1346d2f15618f8cbf77f8", - "reference": "34b121ad3dc761f35fe1346d2f15618f8cbf77f8", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5da6f57a13e5d7d77197443cf55697cdf65f1352", + "reference": "5da6f57a13e5d7d77197443cf55697cdf65f1352", "shasum": "" }, "require": { @@ -5345,7 +5678,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v5.4.9" + "source": "https://github.com/symfony/http-kernel/tree/v5.4.18" }, "funding": [ { @@ -5361,20 +5694,20 @@ "type": "tidelift" } ], - "time": "2022-05-27T07:09:08+00:00" + "time": "2022-12-29T18:54:08+00:00" }, { "name": "symfony/mime", - "version": "v5.4.9", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "2b3802a24e48d0cfccf885173d2aac91e73df92e" + "reference": "2a83d82efc91c3f03a23c8b47a896df168aa5c63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/2b3802a24e48d0cfccf885173d2aac91e73df92e", - "reference": "2b3802a24e48d0cfccf885173d2aac91e73df92e", + "url": "https://api.github.com/repos/symfony/mime/zipball/2a83d82efc91c3f03a23c8b47a896df168aa5c63", + "reference": "2a83d82efc91c3f03a23c8b47a896df168aa5c63", "shasum": "" }, "require": { @@ -5388,7 +5721,8 @@ "egulias/email-validator": "~3.0.0", "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", - "symfony/mailer": "<4.4" + "symfony/mailer": "<4.4", + "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1", @@ -5396,7 +5730,7 @@ "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/property-access": "^4.4|^5.1|^6.0", "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.2|^6.0" + "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6" }, "type": "library", "autoload": { @@ -5428,7 +5762,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.9" + "source": "https://github.com/symfony/mime/tree/v5.4.17" }, "funding": [ { @@ -5444,20 +5778,20 @@ "type": "tidelift" } ], - "time": "2022-05-21T10:24:18+00:00" + "time": "2022-12-13T09:59:55+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { @@ -5472,7 +5806,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5510,7 +5844,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -5526,20 +5860,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "143f1881e655bebca1312722af8068de235ae5dc" + "reference": "927013f3aac555983a5059aada98e1907d842695" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/143f1881e655bebca1312722af8068de235ae5dc", - "reference": "143f1881e655bebca1312722af8068de235ae5dc", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/927013f3aac555983a5059aada98e1907d842695", + "reference": "927013f3aac555983a5059aada98e1907d842695", "shasum": "" }, "require": { @@ -5554,7 +5888,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5593,7 +5927,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.27.0" }, "funding": [ { @@ -5609,20 +5943,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "433d05519ce6990bf3530fba6957499d327395c2" + "reference": "511a08c03c1960e08a883f4cffcacd219b758354" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2", - "reference": "433d05519ce6990bf3530fba6957499d327395c2", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", + "reference": "511a08c03c1960e08a883f4cffcacd219b758354", "shasum": "" }, "require": { @@ -5634,7 +5968,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5674,7 +6008,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" }, "funding": [ { @@ -5690,20 +6024,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8" + "reference": "639084e360537a19f9ee352433b84ce831f3d2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8", - "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", + "reference": "639084e360537a19f9ee352433b84ce831f3d2da", "shasum": "" }, "require": { @@ -5717,7 +6051,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5761,7 +6095,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" }, "funding": [ { @@ -5777,20 +6111,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd" + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", "shasum": "" }, "require": { @@ -5802,7 +6136,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5845,7 +6179,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" }, "funding": [ { @@ -5861,20 +6195,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { @@ -5889,7 +6223,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5928,7 +6262,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -5944,20 +6278,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", "shasum": "" }, "require": { @@ -5966,7 +6300,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6004,7 +6338,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" }, "funding": [ { @@ -6020,20 +6354,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", "shasum": "" }, "require": { @@ -6042,7 +6376,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6083,7 +6417,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" }, "funding": [ { @@ -6099,20 +6433,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "" }, "require": { @@ -6121,7 +6455,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6166,86 +6500,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-05-10T07:21:04+00:00" - }, - { - "name": "symfony/polyfill-php81", - "version": "v1.26.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -6261,20 +6516,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/process", - "version": "v5.4.8", + "version": "v5.4.11", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3" + "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", - "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3", + "url": "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1", + "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1", "shasum": "" }, "require": { @@ -6307,7 +6562,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.8" + "source": "https://github.com/symfony/process/tree/v5.4.11" }, "funding": [ { @@ -6323,20 +6578,20 @@ "type": "tidelift" } ], - "time": "2022-04-08T05:07:18+00:00" + "time": "2022-06-27T16:58:25+00:00" }, { "name": "symfony/property-access", - "version": "v5.4.8", + "version": "v5.4.15", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "fe501d498d6ec7e9efe928c90fabedf629116495" + "reference": "0f3e8f40a1d3da90f674b3dd772e4777ccde4273" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/fe501d498d6ec7e9efe928c90fabedf629116495", - "reference": "fe501d498d6ec7e9efe928c90fabedf629116495", + "url": "https://api.github.com/repos/symfony/property-access/zipball/0f3e8f40a1d3da90f674b3dd772e4777ccde4273", + "reference": "0f3e8f40a1d3da90f674b3dd772e4777ccde4273", "shasum": "" }, "require": { @@ -6388,7 +6643,7 @@ "reflection" ], "support": { - "source": "https://github.com/symfony/property-access/tree/v5.4.8" + "source": "https://github.com/symfony/property-access/tree/v5.4.15" }, "funding": [ { @@ -6404,40 +6659,38 @@ "type": "tidelift" } ], - "time": "2022-04-12T15:48:08+00:00" + "time": "2022-10-27T07:55:40+00:00" }, { "name": "symfony/property-info", - "version": "v5.4.9", + "version": "v6.2.3", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "6f0a452aaba45e763f89e328df437f73a720e18e" + "reference": "b4cbbbcc8679460cfeb1d5bdcb8127a2e85c376c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/6f0a452aaba45e763f89e328df437f73a720e18e", - "reference": "6f0a452aaba45e763f89e328df437f73a720e18e", + "url": "https://api.github.com/repos/symfony/property-info/zipball/b4cbbbcc8679460cfeb1d5bdcb8127a2e85c376c", + "reference": "b4cbbbcc8679460cfeb1d5bdcb8127a2e85c376c", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php80": "^1.16", - "symfony/string": "^5.1|^6.0" + "php": ">=8.1", + "symfony/string": "^5.4|^6.0" }, "conflict": { - "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", - "symfony/dependency-injection": "<4.4" + "phpdocumentor/reflection-docblock": "<5.2", + "phpdocumentor/type-resolver": "<1.5.1", + "symfony/dependency-injection": "<5.4" }, "require-dev": { - "doctrine/annotations": "^1.10.4", - "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "doctrine/annotations": "^1.10.4|^2", + "phpdocumentor/reflection-docblock": "^5.2", "phpstan/phpdoc-parser": "^1.0", - "symfony/cache": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/serializer": "^4.4|^5.0|^6.0" + "symfony/cache": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/serializer": "^5.4|^6.0" }, "suggest": { "phpdocumentor/reflection-docblock": "To use the PHPDoc", @@ -6479,7 +6732,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v5.4.9" + "source": "https://github.com/symfony/property-info/tree/v6.2.3" }, "funding": [ { @@ -6495,20 +6748,20 @@ "type": "tidelift" } ], - "time": "2022-05-17T09:47:20+00:00" + "time": "2022-12-20T16:41:15+00:00" }, { "name": "symfony/routing", - "version": "v5.4.8", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "e07817bb6244ea33ef5ad31abc4a9288bef3f2f7" + "reference": "4ce2df9a469c19ba45ca6aca04fec1c358a6e791" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/e07817bb6244ea33ef5ad31abc4a9288bef3f2f7", - "reference": "e07817bb6244ea33ef5ad31abc4a9288bef3f2f7", + "url": "https://api.github.com/repos/symfony/routing/zipball/4ce2df9a469c19ba45ca6aca04fec1c358a6e791", + "reference": "4ce2df9a469c19ba45ca6aca04fec1c358a6e791", "shasum": "" }, "require": { @@ -6523,7 +6776,7 @@ "symfony/yaml": "<4.4" }, "require-dev": { - "doctrine/annotations": "^1.12", + "doctrine/annotations": "^1.12|^2", "psr/log": "^1|^2|^3", "symfony/config": "^5.3|^6.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", @@ -6569,7 +6822,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v5.4.8" + "source": "https://github.com/symfony/routing/tree/v5.4.17" }, "funding": [ { @@ -6585,20 +6838,20 @@ "type": "tidelift" } ], - "time": "2022-04-18T21:45:37+00:00" + "time": "2022-12-20T11:10:57+00:00" }, { "name": "symfony/serializer", - "version": "v5.4.9", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "b54815117a06a8120604bdf00219e3a55288ee1e" + "reference": "4ac4fae1cbad2655a0b05f327e7ce8ef310239fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/b54815117a06a8120604bdf00219e3a55288ee1e", - "reference": "b54815117a06a8120604bdf00219e3a55288ee1e", + "url": "https://api.github.com/repos/symfony/serializer/zipball/4ac4fae1cbad2655a0b05f327e7ce8ef310239fb", + "reference": "4ac4fae1cbad2655a0b05f327e7ce8ef310239fb", "shasum": "" }, "require": { @@ -6610,7 +6863,7 @@ "conflict": { "doctrine/annotations": "<1.12", "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", + "phpdocumentor/type-resolver": "<1.4.0|>=1.7.0", "symfony/dependency-injection": "<4.4", "symfony/property-access": "<5.4", "symfony/property-info": "<5.3.13", @@ -6618,7 +6871,7 @@ "symfony/yaml": "<4.4" }, "require-dev": { - "doctrine/annotations": "^1.12", + "doctrine/annotations": "^1.12|^2", "phpdocumentor/reflection-docblock": "^3.2|^4.0|^5.0", "symfony/cache": "^4.4|^5.0|^6.0", "symfony/config": "^4.4|^5.0|^6.0", @@ -6672,7 +6925,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v5.4.9" + "source": "https://github.com/symfony/serializer/tree/v5.4.17" }, "funding": [ { @@ -6688,20 +6941,20 @@ "type": "tidelift" } ], - "time": "2022-05-10T09:18:46+00:00" + "time": "2022-12-20T11:10:57+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.5.1", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c" + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c", - "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", "shasum": "" }, "require": { @@ -6755,7 +7008,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" }, "funding": [ { @@ -6771,38 +7024,38 @@ "type": "tidelift" } ], - "time": "2022-03-13T20:07:29+00:00" + "time": "2022-05-30T19:17:29+00:00" }, { "name": "symfony/string", - "version": "v5.4.9", + "version": "v6.2.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99" + "reference": "863219fd713fa41cbcd285a79723f94672faff4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", - "reference": "985e6a9703ef5ce32ba617c9c7d97873bb7b2a99", + "url": "https://api.github.com/repos/symfony/string/zipball/863219fd713fa41cbcd285a79723f94672faff4d", + "reference": "863219fd713fa41cbcd285a79723f94672faff4d", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "~1.15" + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": ">=3.0" + "symfony/translation-contracts": "<2.0" }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/http-client": "^4.4|^5.0|^6.0", - "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0|^6.0" + "symfony/error-handler": "^5.4|^6.0", + "symfony/http-client": "^5.4|^6.0", + "symfony/intl": "^6.2", + "symfony/translation-contracts": "^2.0|^3.0", + "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -6841,7 +7094,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.9" + "source": "https://github.com/symfony/string/tree/v6.2.2" }, "funding": [ { @@ -6857,54 +7110,55 @@ "type": "tidelift" } ], - "time": "2022-04-19T10:40:37+00:00" + "time": "2022-12-14T16:11:27+00:00" }, { "name": "symfony/translation", - "version": "v5.4.9", + "version": "v6.2.3", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "1639abc1177d26bcd4320e535e664cef067ab0ca" + "reference": "a2a15404ef4c15d92c205718eb828b225a144379" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/1639abc1177d26bcd4320e535e664cef067ab0ca", - "reference": "1639abc1177d26bcd4320e535e664cef067ab0ca", + "url": "https://api.github.com/repos/symfony/translation/zipball/a2a15404ef4c15d92c205718eb828b225a144379", + "reference": "a2a15404ef4c15d92c205718eb828b225a144379", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.1", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16", - "symfony/translation-contracts": "^2.3" + "symfony/translation-contracts": "^2.3|^3.0" }, "conflict": { - "symfony/config": "<4.4", - "symfony/console": "<5.3", - "symfony/dependency-injection": "<5.0", - "symfony/http-kernel": "<5.0", - "symfony/twig-bundle": "<5.0", - "symfony/yaml": "<4.4" + "symfony/config": "<5.4", + "symfony/console": "<5.4", + "symfony/dependency-injection": "<5.4", + "symfony/http-kernel": "<5.4", + "symfony/twig-bundle": "<5.4", + "symfony/yaml": "<5.4" }, "provide": { - "symfony/translation-implementation": "2.3" + "symfony/translation-implementation": "2.3|3.0" }, "require-dev": { + "nikic/php-parser": "^4.13", "psr/log": "^1|^2|^3", - "symfony/config": "^4.4|^5.0|^6.0", + "symfony/config": "^5.4|^6.0", "symfony/console": "^5.4|^6.0", - "symfony/dependency-injection": "^5.0|^6.0", - "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/finder": "^5.4|^6.0", "symfony/http-client-contracts": "^1.1|^2.0|^3.0", - "symfony/http-kernel": "^5.0|^6.0", - "symfony/intl": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/intl": "^5.4|^6.0", "symfony/polyfill-intl-icu": "^1.21", + "symfony/routing": "^5.4|^6.0", "symfony/service-contracts": "^1.1.2|^2|^3", - "symfony/yaml": "^4.4|^5.0|^6.0" + "symfony/yaml": "^5.4|^6.0" }, "suggest": { + "nikic/php-parser": "To use PhpAstExtractor", "psr/log-implementation": "To use logging capability in translator", "symfony/config": "", "symfony/yaml": "" @@ -6938,7 +7192,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v5.4.9" + "source": "https://github.com/symfony/translation/tree/v6.2.3" }, "funding": [ { @@ -6954,24 +7208,24 @@ "type": "tidelift" } ], - "time": "2022-05-06T12:33:37+00:00" + "time": "2022-12-23T14:11:11+00:00" }, { "name": "symfony/translation-contracts", - "version": "v2.5.1", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "1211df0afa701e45a04253110e959d4af4ef0f07" + "reference": "68cce71402305a015f8c1589bfada1280dc64fe7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07", - "reference": "1211df0afa701e45a04253110e959d4af4ef0f07", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/68cce71402305a015f8c1589bfada1280dc64fe7", + "reference": "68cce71402305a015f8c1589bfada1280dc64fe7", "shasum": "" }, "require": { - "php": ">=7.2.5" + "php": ">=8.1" }, "suggest": { "symfony/translation-implementation": "" @@ -6979,7 +7233,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.3-dev" }, "thanks": { "name": "symfony/contracts", @@ -6989,7 +7243,10 @@ "autoload": { "psr-4": { "Symfony\\Contracts\\Translation\\": "" - } + }, + "exclude-from-classmap": [ + "/Test/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -7016,7 +7273,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.5.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.2.0" }, "funding": [ { @@ -7032,20 +7289,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-11-25T10:21:52+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.4.9", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "af52239a330fafd192c773795520dc2dd62b5657" + "reference": "ad74890513d07060255df2575703daf971de92c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/af52239a330fafd192c773795520dc2dd62b5657", - "reference": "af52239a330fafd192c773795520dc2dd62b5657", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad74890513d07060255df2575703daf971de92c7", + "reference": "ad74890513d07060255df2575703daf971de92c7", "shasum": "" }, "require": { @@ -7105,7 +7362,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.9" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.17" }, "funding": [ { @@ -7121,20 +7378,20 @@ "type": "tidelift" } ], - "time": "2022-05-21T10:24:18+00:00" + "time": "2022-12-22T10:31:03+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "2.2.4", + "version": "2.2.6", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "da444caae6aca7a19c0c140f68c6182e337d5b1c" + "reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/da444caae6aca7a19c0c140f68c6182e337d5b1c", - "reference": "da444caae6aca7a19c0c140f68c6182e337d5b1c", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/c42125b83a4fa63b187fdf29f9c93cb7733da30c", + "reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c", "shasum": "" }, "require": { @@ -7172,22 +7429,22 @@ "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", "support": { "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", - "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.4" + "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.6" }, - "time": "2021-12-08T09:12:39+00:00" + "time": "2023-01-03T09:29:04+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v5.4.1", + "version": "v5.5.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f" + "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f", - "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7", + "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7", "shasum": "" }, "require": { @@ -7202,15 +7459,19 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.4.1", "ext-filter": "*", - "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10" + "phpunit/phpunit": "^7.5.20 || ^8.5.30 || ^9.5.25" }, "suggest": { "ext-filter": "Required to use the boolean validator." }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.5-dev" } }, "autoload": { @@ -7242,7 +7503,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.4.1" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.5.0" }, "funding": [ { @@ -7254,7 +7515,7 @@ "type": "tidelift" } ], - "time": "2021-12-12T23:22:04+00:00" + "time": "2022-10-16T01:01:54+00:00" }, { "name": "voku/portable-ascii", @@ -7392,30 +7653,29 @@ "packages-dev": [ { "name": "barryvdh/laravel-debugbar", - "version": "v3.6.7", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298" + "reference": "3372ed65e6d2039d663ed19aa699956f9d346271" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b96f9820aaf1ff9afe945207883149e1c7afb298", - "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/3372ed65e6d2039d663ed19aa699956f9d346271", + "reference": "3372ed65e6d2039d663ed19aa699956f9d346271", "shasum": "" }, "require": { - "illuminate/routing": "^6|^7|^8|^9", - "illuminate/session": "^6|^7|^8|^9", - "illuminate/support": "^6|^7|^8|^9", + "illuminate/routing": "^7|^8|^9", + "illuminate/session": "^7|^8|^9", + "illuminate/support": "^7|^8|^9", "maximebf/debugbar": "^1.17.2", - "php": ">=7.2", - "symfony/debug": "^4.3|^5|^6", - "symfony/finder": "^4.3|^5|^6" + "php": ">=7.2.5", + "symfony/finder": "^5|^6" }, "require-dev": { "mockery/mockery": "^1.3.3", - "orchestra/testbench-dusk": "^4|^5|^6|^7", + "orchestra/testbench-dusk": "^5|^6|^7", "phpunit/phpunit": "^8.5|^9.0", "squizlabs/php_codesniffer": "^3.5" }, @@ -7461,7 +7721,7 @@ ], "support": { "issues": "https://github.com/barryvdh/laravel-debugbar/issues", - "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.7" + "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.7.0" }, "funding": [ { @@ -7473,7 +7733,7 @@ "type": "github" } ], - "time": "2022-02-09T07:52:32+00:00" + "time": "2022-07-11T09:26:42+00:00" }, { "name": "barryvdh/laravel-ide-helper", @@ -7571,23 +7831,23 @@ }, { "name": "barryvdh/reflection-docblock", - "version": "v2.0.6", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/barryvdh/ReflectionDocBlock.git", - "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16" + "reference": "bf44b757feb8ba1734659029357646466ded673e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/6b69015d83d3daf9004a71a89f26e27d27ef6a16", - "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16", + "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/bf44b757feb8ba1734659029357646466ded673e", + "reference": "bf44b757feb8ba1734659029357646466ded673e", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.0,<4.5" + "phpunit/phpunit": "^8.5.14|^9" }, "suggest": { "dflydev/markdown": "~1.0", @@ -7617,26 +7877,26 @@ } ], "support": { - "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.0.6" + "source": "https://github.com/barryvdh/ReflectionDocBlock/tree/v2.1.0" }, - "time": "2018-12-13T10:34:14+00:00" + "time": "2022-10-31T15:35:43+00:00" }, { "name": "composer/pcre", - "version": "2.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "c8e9d27cfc5ed22643c19c160455b473ffd8aabe" + "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/c8e9d27cfc5ed22643c19c160455b473ffd8aabe", - "reference": "c8e9d27cfc5ed22643c19c160455b473ffd8aabe", + "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "phpstan/phpstan": "^1.3", @@ -7646,7 +7906,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -7674,7 +7934,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/2.0.0" + "source": "https://github.com/composer/pcre/tree/3.1.0" }, "funding": [ { @@ -7690,34 +7950,34 @@ "type": "tidelift" } ], - "time": "2022-02-25T20:05:29+00:00" + "time": "2022-11-17T09:50:14+00:00" }, { "name": "doctrine/instantiator", - "version": "1.4.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^9", + "doctrine/coding-standard": "^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" }, "type": "library", "autoload": { @@ -7744,7 +8004,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.1" + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" }, "funding": [ { @@ -7760,20 +8020,20 @@ "type": "tidelift" } ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2022-12-30T00:23:10+00:00" }, { "name": "filp/whoops", - "version": "2.14.5", + "version": "2.14.6", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc" + "reference": "f7948baaa0330277c729714910336383286305da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", - "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc", + "url": "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da", + "reference": "f7948baaa0330277c729714910336383286305da", "shasum": "" }, "require": { @@ -7823,7 +8083,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.14.5" + "source": "https://github.com/filp/whoops/tree/2.14.6" }, "funding": [ { @@ -7831,7 +8091,7 @@ "type": "github" } ], - "time": "2022-01-07T12:00:00+00:00" + "time": "2022-11-02T16:23:29+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -7886,16 +8146,16 @@ }, { "name": "laravel/dusk", - "version": "v6.24.0", + "version": "v6.25.2", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "7fed3695741787d9998c5f04c94adfd62d70e766" + "reference": "25a595ac3dc82089a91af10dd23b0d58fd3f6d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/7fed3695741787d9998c5f04c94adfd62d70e766", - "reference": "7fed3695741787d9998c5f04c94adfd62d70e766", + "url": "https://api.github.com/repos/laravel/dusk/zipball/25a595ac3dc82089a91af10dd23b0d58fd3f6d0b", + "reference": "25a595ac3dc82089a91af10dd23b0d58fd3f6d0b", "shasum": "" }, "require": { @@ -7953,22 +8213,22 @@ ], "support": { "issues": "https://github.com/laravel/dusk/issues", - "source": "https://github.com/laravel/dusk/tree/v6.24.0" + "source": "https://github.com/laravel/dusk/tree/v6.25.2" }, - "time": "2022-05-09T13:43:52+00:00" + "time": "2022-09-29T09:37:07+00:00" }, { "name": "maximebf/debugbar", - "version": "v1.18.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6" + "reference": "ba0af68dd4316834701ecb30a00ce9604ced3ee9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", - "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/ba0af68dd4316834701ecb30a00ce9604ced3ee9", + "reference": "ba0af68dd4316834701ecb30a00ce9604ced3ee9", "shasum": "" }, "require": { @@ -7988,7 +8248,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" } }, "autoload": { @@ -8019,22 +8279,22 @@ ], "support": { "issues": "https://github.com/maximebf/php-debugbar/issues", - "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.0" + "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.1" }, - "time": "2021-12-27T18:49:48+00:00" + "time": "2022-03-31T14:55:54+00:00" }, { "name": "mockery/mockery", - "version": "1.3.5", + "version": "1.3.6", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "472fa8ca4e55483d55ee1e73c963718c4393791d" + "reference": "dc206df4fa314a50bbb81cf72239a305c5bbd5c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/472fa8ca4e55483d55ee1e73c963718c4393791d", - "reference": "472fa8ca4e55483d55ee1e73c963718c4393791d", + "url": "https://api.github.com/repos/mockery/mockery/zipball/dc206df4fa314a50bbb81cf72239a305c5bbd5c0", + "reference": "dc206df4fa314a50bbb81cf72239a305c5bbd5c0", "shasum": "" }, "require": { @@ -8088,9 +8348,9 @@ ], "support": { "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/1.3.5" + "source": "https://github.com/mockery/mockery/tree/1.3.6" }, - "time": "2021-09-13T15:33:03+00:00" + "time": "2022-09-07T15:05:49+00:00" }, { "name": "myclabs/deep-copy", @@ -8264,16 +8524,16 @@ }, { "name": "php-webdriver/webdriver", - "version": "1.12.1", + "version": "1.13.1", "source": { "type": "git", "url": "https://github.com/php-webdriver/php-webdriver.git", - "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a" + "reference": "6dfe5f814b796c1b5748850aa19f781b9274c36c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/b27ddf458d273c7d4602106fcaf978aa0b7fe15a", - "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/6dfe5f814b796c1b5748850aa19f781b9274c36c", + "reference": "6dfe5f814b796c1b5748850aa19f781b9274c36c", "shasum": "" }, "require": { @@ -8323,9 +8583,9 @@ ], "support": { "issues": "https://github.com/php-webdriver/php-webdriver/issues", - "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.1" + "source": "https://github.com/php-webdriver/php-webdriver/tree/1.13.1" }, - "time": "2022-05-03T12:16:34+00:00" + "time": "2022-10-11T11:49:44+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -8380,84 +8640,32 @@ }, "time": "2020-06-27T09:03:43+00:00" }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", - "shasum": "" - }, - "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" - }, - "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" - }, - "time": "2021-10-19T17:43:47+00:00" - }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "77a32518733312af16a44300404e945338981de3" + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", - "reference": "77a32518733312af16a44300404e945338981de3", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { "ext-tokenizer": "*", - "psalm/phar": "^4.8" + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "rector/rector": "^0.13.9", + "vimeo/psalm": "^4.25" }, "type": "library", "extra": { @@ -8483,96 +8691,29 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" - }, - "time": "2022-03-15T21:29:03+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "v1.15.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" - }, - "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\": "src/Prophecy" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" }, - "time": "2021-12-08T12:19:24+00:00" + "time": "2022-10-14T12:47:21+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.15", + "version": "9.2.23", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f" + "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", + "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.13.0", + "nikic/php-parser": "^4.14", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -8621,7 +8762,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23" }, "funding": [ { @@ -8629,7 +8770,7 @@ "type": "github" } ], - "time": "2022-03-07T09:28:20+00:00" + "time": "2022-12-28T12:41:10+00:00" }, { "name": "phpunit/php-file-iterator", @@ -8874,20 +9015,20 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.20", + "version": "9.5.28", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba" + "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba", - "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e", + "reference": "954ca3113a03bf780d22f07bf055d883ee04b65e", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -8898,7 +9039,6 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpspec/prophecy": "^1.12.1", "phpunit/php-code-coverage": "^9.2.13", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", @@ -8906,20 +9046,16 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.0", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, - "require-dev": { - "ext-pdo": "*", - "phpspec/prophecy-phpunit": "^2.0.1" - }, "suggest": { "ext-soap": "*", "ext-xdebug": "*" @@ -8961,7 +9097,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28" }, "funding": [ { @@ -8971,9 +9107,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-04-01T12:37:26+00:00" + "time": "2023-01-14T12:32:24+00:00" }, { "name": "sebastian/cli-parser", @@ -9144,16 +9284,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.6", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { @@ -9206,7 +9346,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" }, "funding": [ { @@ -9214,7 +9354,7 @@ "type": "github" } ], - "time": "2020-10-26T15:49:45+00:00" + "time": "2022-09-14T12:41:17+00:00" }, { "name": "sebastian/complexity", @@ -9404,16 +9544,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { @@ -9469,7 +9609,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -9477,7 +9617,7 @@ "type": "github" } ], - "time": "2021-11-11T14:18:36+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { "name": "sebastian/global-state", @@ -9832,16 +9972,16 @@ }, { "name": "sebastian/type", - "version": "3.0.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad" + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", "shasum": "" }, "require": { @@ -9853,7 +9993,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -9876,7 +10016,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.0.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" }, "funding": [ { @@ -9884,7 +10024,7 @@ "type": "github" } ], - "time": "2022-03-15T09:54:48+00:00" + "time": "2022-09-12T14:47:03+00:00" }, { "name": "sebastian/version", @@ -9939,75 +10079,6 @@ ], "time": "2020-09-28T06:39:44+00:00" }, - { - "name": "symfony/debug", - "version": "v4.4.41", - "source": { - "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "6637e62480b60817b9a6984154a533e8e64c6bd5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/6637e62480b60817b9a6984154a533e8e64c6bd5", - "reference": "6637e62480b60817b9a6984154a533e8e64c6bd5", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "psr/log": "^1|^2|^3" - }, - "conflict": { - "symfony/http-kernel": "<3.4" - }, - "require-dev": { - "symfony/http-kernel": "^3.4|^4.0|^5.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides tools to ease debugging PHP code", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.41" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "abandoned": "symfony/error-handler", - "time": "2022-04-12T15:19:55+00:00" - }, { "name": "symplify/easy-coding-standard", "version": "9.4.70", @@ -10116,9 +10187,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "silber/bouncer": 5 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -10135,5 +10204,5 @@ "ext-zip": "*" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.2.0" } From beba7b9bced403bdc98427df63e85b4fa11d342c Mon Sep 17 00:00:00 2001 From: et-nik Date: Tue, 17 Jan 2023 12:22:46 +0100 Subject: [PATCH 35/37] update packages --- composer.json | 6 +- composer.lock | 883 ++++++++++++++++++-------------------------------- 2 files changed, 323 insertions(+), 566 deletions(-) diff --git a/composer.json b/composer.json index 8fa76e4d..97751479 100644 --- a/composer.json +++ b/composer.json @@ -24,10 +24,10 @@ "ext-xml": "*", "ext-zip": "*", "doctrine/dbal": "~2.3", - "fakerphp/faker": "^1.21.0", + "fakerphp/faker": "^1.20.0", "fideloper/proxy": "~4.0", "gameap/gameap-file-manager": "^1.0", - "guzzlehttp/guzzle": "^7.4.4", + "guzzlehttp/guzzle": "^7.5.0", "joshbrw/laravel-module-installer": "^1.0.1", "knik/flysystem-gameap": "*", "knik/g-rcon": "*", @@ -42,7 +42,7 @@ "laravelcollective/html": "^6", "league/flysystem": "^1.1.10", "mavinoo/laravel-batch": "^2.3.5", - "moontoast/math": "^1.2", + "moontoast/math": "^1.1", "nwidart/laravel-modules": "^6.2", "phpseclib/phpseclib": "^2.0.41", "silber/bouncer": "v1.0.0", diff --git a/composer.lock b/composer.lock index 03cfd088..dbaf11f2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,30 +4,30 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9a1ec2829d2fe40bc6f15a463ec62af0", + "content-hash": "d75d97bf619a5b14183a71d0c318b3c3", "packages": [ { "name": "brick/math", - "version": "0.10.2", + "version": "0.9.3", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f" + "reference": "ca57d18f028f84f777b2168cd1911b0dee2343ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/459f2781e1a08d52ee56b0b1444086e038561e3f", - "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f", + "url": "https://api.github.com/repos/brick/math/zipball/ca57d18f028f84f777b2168cd1911b0dee2343ae", + "reference": "ca57d18f028f84f777b2168cd1911b0dee2343ae", "shasum": "" }, "require": { "ext-json": "*", - "php": "^7.4 || ^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "php-coveralls/php-coveralls": "^2.2", - "phpunit/phpunit": "^9.0", - "vimeo/psalm": "4.25.0" + "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.0", + "vimeo/psalm": "4.9.2" }, "type": "library", "autoload": { @@ -52,15 +52,19 @@ ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.10.2" + "source": "https://github.com/brick/math/tree/0.9.3" }, "funding": [ { "url": "https://github.com/BenMorel", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/brick/math", + "type": "tidelift" } ], - "time": "2022-08-10T22:54:19+00:00" + "time": "2021-08-15T20:50:18+00:00" }, { "name": "clue/socket-raw", @@ -131,81 +135,6 @@ ], "time": "2020-11-27T13:16:18+00:00" }, - { - "name": "dflydev/dot-access-data", - "version": "v3.0.2", - "source": { - "type": "git", - "url": "https://github.com/dflydev/dflydev-dot-access-data.git", - "reference": "f41715465d65213d644d3141a6a93081be5d3549" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549", - "reference": "f41715465d65213d644d3141a6a93081be5d3549", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^0.12.42", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.3", - "scrutinizer/ocular": "1.6.0", - "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^4.0.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Dflydev\\DotAccessData\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Dragonfly Development Inc.", - "email": "info@dflydev.com", - "homepage": "http://dflydev.com" - }, - { - "name": "Beau Simensen", - "email": "beau@dflydev.com", - "homepage": "http://beausimensen.com" - }, - { - "name": "Carlos Frutos", - "email": "carlos@kiwing.it", - "homepage": "https://github.com/cfrutos" - }, - { - "name": "Colin O'Dell", - "email": "colinodell@gmail.com", - "homepage": "https://www.colinodell.com" - } - ], - "description": "Given a deep data structure, access data by dot notation.", - "homepage": "https://github.com/dflydev/dflydev-dot-access-data", - "keywords": [ - "access", - "data", - "dot", - "notation" - ], - "support": { - "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues", - "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2" - }, - "time": "2022-10-27T11:44:00+00:00" - }, { "name": "doctrine/cache", "version": "2.2.0", @@ -841,20 +770,20 @@ }, { "name": "fakerphp/faker", - "version": "v1.21.0", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "92efad6a967f0b79c499705c69b662f738cc9e4d" + "reference": "37f751c67a5372d4e26353bd9384bc03744ec77b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/92efad6a967f0b79c499705c69b662f738cc9e4d", - "reference": "92efad6a967f0b79c499705c69b662f738cc9e4d", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/37f751c67a5372d4e26353bd9384bc03744ec77b", + "reference": "37f751c67a5372d4e26353bd9384bc03744ec77b", "shasum": "" }, "require": { - "php": "^7.4 || ^8.0", + "php": "^7.1 || ^8.0", "psr/container": "^1.0 || ^2.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" }, @@ -865,8 +794,7 @@ "bamarni/composer-bin-plugin": "^1.4.1", "doctrine/persistence": "^1.3 || ^2.0", "ext-intl": "*", - "phpunit/phpunit": "^9.5.26", - "symfony/phpunit-bridge": "^5.4.16" + "symfony/phpunit-bridge": "^4.4 || ^5.2" }, "suggest": { "doctrine/orm": "Required to use Faker\\ORM\\Doctrine", @@ -878,7 +806,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "v1.21-dev" + "dev-main": "v1.20-dev" } }, "autoload": { @@ -903,9 +831,9 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.21.0" + "source": "https://github.com/FakerPHP/Faker/tree/v1.20.0" }, - "time": "2022-12-13T13:54:32+00:00" + "time": "2022-07-20T13:12:54+00:00" }, { "name": "fideloper/proxy", @@ -2523,54 +2451,42 @@ }, { "name": "league/commonmark", - "version": "2.3.8", + "version": "1.6.7", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "c493585c130544c4e91d2e0e131e6d35cb0cbc47" + "reference": "2b8185c13bc9578367a5bf901881d1c1b5bbd09b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c493585c130544c4e91d2e0e131e6d35cb0cbc47", - "reference": "c493585c130544c4e91d2e0e131e6d35cb0cbc47", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2b8185c13bc9578367a5bf901881d1c1b5bbd09b", + "reference": "2b8185c13bc9578367a5bf901881d1c1b5bbd09b", "shasum": "" }, "require": { "ext-mbstring": "*", - "league/config": "^1.1.1", - "php": "^7.4 || ^8.0", - "psr/event-dispatcher": "^1.0", - "symfony/deprecation-contracts": "^2.1 || ^3.0", - "symfony/polyfill-php80": "^1.16" + "php": "^7.1 || ^8.0" + }, + "conflict": { + "scrutinizer/ocular": "1.7.*" }, "require-dev": { - "cebe/markdown": "^1.0", - "commonmark/cmark": "0.30.0", - "commonmark/commonmark.js": "0.30.0", - "composer/package-versions-deprecated": "^1.8", - "embed/embed": "^4.4", - "erusev/parsedown": "^1.0", + "cebe/markdown": "~1.0", + "commonmark/commonmark.js": "0.29.2", + "erusev/parsedown": "~1.0", "ext-json": "*", "github/gfm": "0.29.0", - "michelf/php-markdown": "^1.4 || ^2.0", - "nyholm/psr7": "^1.5", - "phpstan/phpstan": "^1.8.2", - "phpunit/phpunit": "^9.5.21", - "scrutinizer/ocular": "^1.8.1", - "symfony/finder": "^5.3 | ^6.0", - "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0", - "unleashedtech/php-coding-standard": "^3.1.1", - "vimeo/psalm": "^4.24.0 || ^5.0.0" - }, - "suggest": { - "symfony/yaml": "v2.3+ required if using the Front Matter extension" + "michelf/php-markdown": "~1.4", + "mikehaertl/php-shellcommand": "^1.4", + "phpstan/phpstan": "^0.12.90", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.2", + "scrutinizer/ocular": "^1.5", + "symfony/finder": "^4.2" }, + "bin": [ + "bin/commonmark" + ], "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.4-dev" - } - }, "autoload": { "psr-4": { "League\\CommonMark\\": "src" @@ -2588,7 +2504,7 @@ "role": "Lead Developer" } ], - "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and GitHub-Flavored Markdown (GFM)", + "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and Github-Flavored Markdown (GFM)", "homepage": "https://commonmark.thephpleague.com", "keywords": [ "commonmark", @@ -2602,7 +2518,6 @@ ], "support": { "docs": "https://commonmark.thephpleague.com/", - "forum": "https://github.com/thephpleague/commonmark/discussions", "issues": "https://github.com/thephpleague/commonmark/issues", "rss": "https://github.com/thephpleague/commonmark/releases.atom", "source": "https://github.com/thephpleague/commonmark" @@ -2625,89 +2540,7 @@ "type": "tidelift" } ], - "time": "2022-12-10T16:02:17+00:00" - }, - { - "name": "league/config", - "version": "v1.2.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/config.git", - "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/config/zipball/754b3604fb2984c71f4af4a9cbe7b57f346ec1f3", - "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3", - "shasum": "" - }, - "require": { - "dflydev/dot-access-data": "^3.0.1", - "nette/schema": "^1.2", - "php": "^7.4 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^1.8.2", - "phpunit/phpunit": "^9.5.5", - "scrutinizer/ocular": "^1.8.1", - "unleashedtech/php-coding-standard": "^3.1", - "vimeo/psalm": "^4.7.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.2-dev" - } - }, - "autoload": { - "psr-4": { - "League\\Config\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Colin O'Dell", - "email": "colinodell@gmail.com", - "homepage": "https://www.colinodell.com", - "role": "Lead Developer" - } - ], - "description": "Define configuration arrays with strict schemas and access values with dot notation", - "homepage": "https://config.thephpleague.com", - "keywords": [ - "array", - "config", - "configuration", - "dot", - "dot-access", - "nested", - "schema" - ], - "support": { - "docs": "https://config.thephpleague.com/", - "issues": "https://github.com/thephpleague/config/issues", - "rss": "https://github.com/thephpleague/config/releases.atom", - "source": "https://github.com/thephpleague/config" - }, - "funding": [ - { - "url": "https://www.colinodell.com/sponsor", - "type": "custom" - }, - { - "url": "https://www.paypal.me/colinpodell/10.00", - "type": "custom" - }, - { - "url": "https://github.com/colinodell", - "type": "github" - } - ], - "time": "2022-12-11T20:36:23+00:00" + "time": "2022-01-13T17:18:13+00:00" }, { "name": "league/flysystem", @@ -3174,153 +3007,6 @@ ], "time": "2023-01-06T15:55:01+00:00" }, - { - "name": "nette/schema", - "version": "v1.2.3", - "source": { - "type": "git", - "url": "https://github.com/nette/schema.git", - "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f", - "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f", - "shasum": "" - }, - "require": { - "nette/utils": "^2.5.7 || ^3.1.5 || ^4.0", - "php": ">=7.1 <8.3" - }, - "require-dev": { - "nette/tester": "^2.3 || ^2.4", - "phpstan/phpstan-nette": "^1.0", - "tracy/tracy": "^2.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "📐 Nette Schema: validating data structures against a given Schema.", - "homepage": "https://nette.org", - "keywords": [ - "config", - "nette" - ], - "support": { - "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.2.3" - }, - "time": "2022-10-13T01:24:26+00:00" - }, - { - "name": "nette/utils", - "version": "v3.2.8", - "source": { - "type": "git", - "url": "https://github.com/nette/utils.git", - "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/02a54c4c872b99e4ec05c4aec54b5a06eb0f6368", - "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368", - "shasum": "" - }, - "require": { - "php": ">=7.2 <8.3" - }, - "conflict": { - "nette/di": "<3.0.6" - }, - "require-dev": { - "nette/tester": "~2.0", - "phpstan/phpstan": "^1.0", - "tracy/tracy": "^2.3" - }, - "suggest": { - "ext-gd": "to use Image", - "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()", - "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()", - "ext-json": "to use Nette\\Utils\\Json", - "ext-mbstring": "to use Strings::lower() etc...", - "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()", - "ext-xml": "to use Strings::length() etc. when mbstring is not available" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "🛠 Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.", - "homepage": "https://nette.org", - "keywords": [ - "array", - "core", - "datetime", - "images", - "json", - "nette", - "paginator", - "password", - "slugify", - "string", - "unicode", - "utf-8", - "utility", - "validation" - ], - "support": { - "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v3.2.8" - }, - "time": "2022-09-12T23:36:20+00:00" - }, { "name": "nikic/php-parser", "version": "v4.15.3", @@ -3766,20 +3452,20 @@ }, { "name": "psr/container", - "version": "1.1.2", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", "shasum": "" }, "require": { - "php": ">=7.4.0" + "php": ">=7.2.0" }, "type": "library", "autoload": { @@ -3808,9 +3494,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "source": "https://github.com/php-fig/container/tree/1.1.1" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2021-03-05T17:36:06+00:00" }, { "name": "psr/event-dispatcher", @@ -4024,30 +3710,30 @@ }, { "name": "psr/log", - "version": "2.0.0", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", - "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, "require": { - "php": ">=8.0.0" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "src" + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", @@ -4068,9 +3754,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/2.0.0" + "source": "https://github.com/php-fig/log/tree/1.1.4" }, - "time": "2021-07-14T16:41:46+00:00" + "time": "2021-05-03T11:20:27+00:00" }, { "name": "psr/simple-cache", @@ -4245,52 +3931,42 @@ }, { "name": "ramsey/collection", - "version": "2.0.0", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/ramsey/collection.git", - "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5" + "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/collection/zipball/a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5", - "reference": "a4b48764bfbb8f3a6a4d1aeb1a35bb5e9ecac4a5", + "url": "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a", + "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a", "shasum": "" }, "require": { - "php": "^8.1" + "php": "^7.3 || ^8", + "symfony/polyfill-php81": "^1.23" }, "require-dev": { - "captainhook/plugin-composer": "^5.3", - "ergebnis/composer-normalize": "^2.28.3", - "fakerphp/faker": "^1.21", - "hamcrest/hamcrest-php": "^2.0", - "jangregor/phpstan-prophecy": "^1.0", - "mockery/mockery": "^1.5", - "php-parallel-lint/php-console-highlighter": "^1.0", - "php-parallel-lint/php-parallel-lint": "^1.3", - "phpcsstandards/phpcsutils": "^1.0.0-rc1", + "captainhook/captainhook": "^5.3", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "ergebnis/composer-normalize": "^2.6", + "fakerphp/faker": "^1.5", + "hamcrest/hamcrest-php": "^2", + "jangregor/phpstan-prophecy": "^0.8", + "mockery/mockery": "^1.3", "phpspec/prophecy-phpunit": "^2.0", - "phpstan/extension-installer": "^1.2", - "phpstan/phpstan": "^1.9", - "phpstan/phpstan-mockery": "^1.1", - "phpstan/phpstan-phpunit": "^1.3", - "phpunit/phpunit": "^9.5", - "psalm/plugin-mockery": "^1.1", - "psalm/plugin-phpunit": "^0.18.4", - "ramsey/coding-standard": "^2.0.3", - "ramsey/conventional-commits": "^1.3", - "vimeo/psalm": "^5.4" + "phpstan/extension-installer": "^1", + "phpstan/phpstan": "^0.12.32", + "phpstan/phpstan-mockery": "^0.12.5", + "phpstan/phpstan-phpunit": "^0.12.11", + "phpunit/phpunit": "^8.5 || ^9", + "psy/psysh": "^0.10.4", + "slevomat/coding-standard": "^6.3", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^4.4" }, "type": "library", - "extra": { - "captainhook": { - "force-install": true - }, - "ramsey/conventional-commits": { - "configFile": "conventional-commits.json" - } - }, "autoload": { "psr-4": { "Ramsey\\Collection\\": "src/" @@ -4318,7 +3994,7 @@ ], "support": { "issues": "https://github.com/ramsey/collection/issues", - "source": "https://github.com/ramsey/collection/tree/2.0.0" + "source": "https://github.com/ramsey/collection/tree/1.2.2" }, "funding": [ { @@ -4330,27 +4006,29 @@ "type": "tidelift" } ], - "time": "2022-12-31T21:50:55+00:00" + "time": "2021-10-10T03:01:02+00:00" }, { "name": "ramsey/uuid", - "version": "4.7.3", + "version": "4.2.3", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "433b2014e3979047db08a17a205f410ba3869cf2" + "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/433b2014e3979047db08a17a205f410ba3869cf2", - "reference": "433b2014e3979047db08a17a205f410ba3869cf2", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df", + "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df", "shasum": "" }, "require": { - "brick/math": "^0.8.8 || ^0.9 || ^0.10", + "brick/math": "^0.8 || ^0.9", "ext-json": "*", - "php": "^8.0", - "ramsey/collection": "^1.2 || ^2.0" + "php": "^7.2 || ^8.0", + "ramsey/collection": "^1.0", + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-php80": "^1.14" }, "replace": { "rhumsaa/uuid": "self.version" @@ -4362,23 +4040,24 @@ "doctrine/annotations": "^1.8", "ergebnis/composer-normalize": "^2.15", "mockery/mockery": "^1.3", + "moontoast/math": "^1.1", "paragonie/random-lib": "^2", "php-mock/php-mock": "^2.2", "php-mock/php-mock-mockery": "^1.3", "php-parallel-lint/php-parallel-lint": "^1.1", "phpbench/phpbench": "^1.0", - "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-mockery": "^1.1", - "phpstan/phpstan-phpunit": "^1.1", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-mockery": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", "phpunit/phpunit": "^8.5 || ^9", - "ramsey/composer-repl": "^1.4", - "slevomat/coding-standard": "^8.4", + "slevomat/coding-standard": "^7.0", "squizlabs/php_codesniffer": "^3.5", "vimeo/psalm": "^4.9" }, "suggest": { "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.", + "ext-ctype": "Enables faster processing of character classification using ctype functions.", "ext-gmp": "Enables faster math with arbitrary-precision integers using GMP.", "ext-uuid": "Enables the use of PeclUuidTimeGenerator and PeclUuidRandomGenerator.", "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter", @@ -4386,6 +4065,9 @@ }, "type": "library", "extra": { + "branch-alias": { + "dev-main": "4.x-dev" + }, "captainhook": { "force-install": true } @@ -4410,7 +4092,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.7.3" + "source": "https://github.com/ramsey/uuid/tree/4.2.3" }, "funding": [ { @@ -4422,7 +4104,7 @@ "type": "tidelift" } ], - "time": "2023-01-12T18:13:24+00:00" + "time": "2021-09-25T23:10:38+00:00" }, { "name": "silber/bouncer", @@ -5082,20 +4764,21 @@ }, { "name": "symfony/css-selector", - "version": "v6.2.3", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "ab1df4ba3ded7b724766ba3a6e0eca0418e74f80" + "reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/ab1df4ba3ded7b724766ba3a6e0eca0418e74f80", - "reference": "ab1df4ba3ded7b724766ba3a6e0eca0418e74f80", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/052ef49b660f9ad2a3adb311c555c9bc11ba61f4", + "reference": "052ef49b660f9ad2a3adb311c555c9bc11ba61f4", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.16" }, "type": "library", "autoload": { @@ -5127,7 +4810,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.2.3" + "source": "https://github.com/symfony/css-selector/tree/v5.4.17" }, "funding": [ { @@ -5143,29 +4826,29 @@ "type": "tidelift" } ], - "time": "2022-12-28T14:26:22+00:00" + "time": "2022-12-23T11:40:44+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.2.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3" + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3", - "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -5194,7 +4877,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" }, "funding": [ { @@ -5210,7 +4893,7 @@ "type": "tidelift" } ], - "time": "2022-11-25T10:21:52+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/error-handler", @@ -5285,38 +4968,40 @@ }, { "name": "symfony/event-dispatcher", - "version": "v6.2.2", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "3ffeb31139b49bf6ef0bc09d1db95eac053388d1" + "reference": "8e18a9d559eb8ebc2220588f1faa726a2fcd31c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3ffeb31139b49bf6ef0bc09d1db95eac053388d1", - "reference": "3ffeb31139b49bf6ef0bc09d1db95eac053388d1", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e18a9d559eb8ebc2220588f1faa726a2fcd31c9", + "reference": "8e18a9d559eb8ebc2220588f1faa726a2fcd31c9", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/event-dispatcher-contracts": "^2|^3" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/event-dispatcher-contracts": "^2|^3", + "symfony/polyfill-php80": "^1.16" }, "conflict": { - "symfony/dependency-injection": "<5.4" + "symfony/dependency-injection": "<4.4" }, "provide": { "psr/event-dispatcher-implementation": "1.0", - "symfony/event-dispatcher-implementation": "2.0|3.0" + "symfony/event-dispatcher-implementation": "2.0" }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/error-handler": "^5.4|^6.0", - "symfony/expression-language": "^5.4|^6.0", - "symfony/http-foundation": "^5.4|^6.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", "symfony/service-contracts": "^1.1|^2|^3", - "symfony/stopwatch": "^5.4|^6.0" + "symfony/stopwatch": "^4.4|^5.0|^6.0" }, "suggest": { "symfony/dependency-injection": "", @@ -5348,7 +5033,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.2" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.17" }, "funding": [ { @@ -5364,24 +5049,24 @@ "type": "tidelift" } ], - "time": "2022-12-14T16:11:27+00:00" + "time": "2022-12-12T15:54:21+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.2.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "0782b0b52a737a05b4383d0df35a474303cabdae" + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0782b0b52a737a05b4383d0df35a474303cabdae", - "reference": "0782b0b52a737a05b4383d0df35a474303cabdae", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=7.2.5", "psr/event-dispatcher": "^1" }, "suggest": { @@ -5390,7 +5075,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -5427,7 +5112,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.2.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" }, "funding": [ { @@ -5443,7 +5128,7 @@ "type": "tidelift" } ], - "time": "2022-11-25T10:21:52+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/finder", @@ -6518,6 +6203,85 @@ ], "time": "2022-11-03T14:55:06+00:00" }, + { + "name": "symfony/polyfill-php81", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-11-03T14:55:06+00:00" + }, { "name": "symfony/process", "version": "v5.4.11", @@ -6663,34 +6427,36 @@ }, { "name": "symfony/property-info", - "version": "v6.2.3", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "b4cbbbcc8679460cfeb1d5bdcb8127a2e85c376c" + "reference": "12e1f7b3d73b1f3690aa524b92b5de9937507361" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/b4cbbbcc8679460cfeb1d5bdcb8127a2e85c376c", - "reference": "b4cbbbcc8679460cfeb1d5bdcb8127a2e85c376c", + "url": "https://api.github.com/repos/symfony/property-info/zipball/12e1f7b3d73b1f3690aa524b92b5de9937507361", + "reference": "12e1f7b3d73b1f3690aa524b92b5de9937507361", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/string": "^5.4|^6.0" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php80": "^1.16", + "symfony/string": "^5.1|^6.0" }, "conflict": { - "phpdocumentor/reflection-docblock": "<5.2", - "phpdocumentor/type-resolver": "<1.5.1", - "symfony/dependency-injection": "<5.4" + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/dependency-injection": "<4.4" }, "require-dev": { "doctrine/annotations": "^1.10.4|^2", - "phpdocumentor/reflection-docblock": "^5.2", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "phpstan/phpdoc-parser": "^1.0", - "symfony/cache": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/serializer": "^5.4|^6.0" + "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/serializer": "^4.4|^5.0|^6.0" }, "suggest": { "phpdocumentor/reflection-docblock": "To use the PHPDoc", @@ -6732,7 +6498,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v6.2.3" + "source": "https://github.com/symfony/property-info/tree/v5.4.17" }, "funding": [ { @@ -6748,7 +6514,7 @@ "type": "tidelift" } ], - "time": "2022-12-20T16:41:15+00:00" + "time": "2022-12-20T11:10:57+00:00" }, { "name": "symfony/routing", @@ -7028,34 +6794,34 @@ }, { "name": "symfony/string", - "version": "v6.2.2", + "version": "v5.4.17", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "863219fd713fa41cbcd285a79723f94672faff4d" + "reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/863219fd713fa41cbcd285a79723f94672faff4d", - "reference": "863219fd713fa41cbcd285a79723f94672faff4d", + "url": "https://api.github.com/repos/symfony/string/zipball/55733a8664b8853b003e70251c58bc8cb2d82a6b", + "reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=7.2.5", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0" + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "~1.15" }, "conflict": { - "symfony/translation-contracts": "<2.0" + "symfony/translation-contracts": ">=3.0" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", - "symfony/translation-contracts": "^2.0|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/translation-contracts": "^1.1|^2", + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "type": "library", "autoload": { @@ -7094,7 +6860,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.2.2" + "source": "https://github.com/symfony/string/tree/v5.4.17" }, "funding": [ { @@ -7110,55 +6876,54 @@ "type": "tidelift" } ], - "time": "2022-12-14T16:11:27+00:00" + "time": "2022-12-12T15:54:21+00:00" }, { "name": "symfony/translation", - "version": "v6.2.3", + "version": "v5.4.14", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "a2a15404ef4c15d92c205718eb828b225a144379" + "reference": "f0ed07675863aa6e3939df8b1bc879450b585cab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/a2a15404ef4c15d92c205718eb828b225a144379", - "reference": "a2a15404ef4c15d92c205718eb828b225a144379", + "url": "https://api.github.com/repos/symfony/translation/zipball/f0ed07675863aa6e3939df8b1bc879450b585cab", + "reference": "f0ed07675863aa6e3939df8b1bc879450b585cab", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^2.3|^3.0" + "symfony/polyfill-php80": "^1.16", + "symfony/translation-contracts": "^2.3" }, "conflict": { - "symfony/config": "<5.4", - "symfony/console": "<5.4", - "symfony/dependency-injection": "<5.4", - "symfony/http-kernel": "<5.4", - "symfony/twig-bundle": "<5.4", - "symfony/yaml": "<5.4" + "symfony/config": "<4.4", + "symfony/console": "<5.3", + "symfony/dependency-injection": "<5.0", + "symfony/http-kernel": "<5.0", + "symfony/twig-bundle": "<5.0", + "symfony/yaml": "<4.4" }, "provide": { - "symfony/translation-implementation": "2.3|3.0" + "symfony/translation-implementation": "2.3" }, "require-dev": { - "nikic/php-parser": "^4.13", "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", + "symfony/config": "^4.4|^5.0|^6.0", "symfony/console": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/finder": "^5.4|^6.0", + "symfony/dependency-injection": "^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", "symfony/http-client-contracts": "^1.1|^2.0|^3.0", - "symfony/http-kernel": "^5.4|^6.0", - "symfony/intl": "^5.4|^6.0", + "symfony/http-kernel": "^5.0|^6.0", + "symfony/intl": "^4.4|^5.0|^6.0", "symfony/polyfill-intl-icu": "^1.21", - "symfony/routing": "^5.4|^6.0", "symfony/service-contracts": "^1.1.2|^2|^3", - "symfony/yaml": "^5.4|^6.0" + "symfony/yaml": "^4.4|^5.0|^6.0" }, "suggest": { - "nikic/php-parser": "To use PhpAstExtractor", "psr/log-implementation": "To use logging capability in translator", "symfony/config": "", "symfony/yaml": "" @@ -7192,7 +6957,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.2.3" + "source": "https://github.com/symfony/translation/tree/v5.4.14" }, "funding": [ { @@ -7208,24 +6973,24 @@ "type": "tidelift" } ], - "time": "2022-12-23T14:11:11+00:00" + "time": "2022-10-07T08:01:20+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.2.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "68cce71402305a015f8c1589bfada1280dc64fe7" + "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/68cce71402305a015f8c1589bfada1280dc64fe7", - "reference": "68cce71402305a015f8c1589bfada1280dc64fe7", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe", + "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=7.2.5" }, "suggest": { "symfony/translation-implementation": "" @@ -7233,7 +6998,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -7243,10 +7008,7 @@ "autoload": { "psr-4": { "Symfony\\Contracts\\Translation\\": "" - }, - "exclude-from-classmap": [ - "/Test/" - ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -7273,7 +7035,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.2.0" + "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2" }, "funding": [ { @@ -7289,7 +7051,7 @@ "type": "tidelift" } ], - "time": "2022-11-25T10:21:52+00:00" + "time": "2022-06-27T16:58:25+00:00" }, { "name": "symfony/var-dumper", @@ -7883,20 +7645,20 @@ }, { "name": "composer/pcre", - "version": "3.1.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" + "reference": "3fdb2807b31a78a40ad89570e30ec77466c98717" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "url": "https://api.github.com/repos/composer/pcre/zipball/3fdb2807b31a78a40ad89570e30ec77466c98717", + "reference": "3fdb2807b31a78a40ad89570e30ec77466c98717", "shasum": "" }, "require": { - "php": "^7.4 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { "phpstan/phpstan": "^1.3", @@ -7906,7 +7668,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.x-dev" + "dev-main": "2.x-dev" } }, "autoload": { @@ -7934,7 +7696,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.0" + "source": "https://github.com/composer/pcre/tree/2.1.0" }, "funding": [ { @@ -7950,34 +7712,34 @@ "type": "tidelift" } ], - "time": "2022-11-17T09:50:14+00:00" + "time": "2022-11-16T18:32:04+00:00" }, { "name": "doctrine/instantiator", - "version": "2.0.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", - "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { - "php": "^8.1" + "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^11", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^1.2", - "phpstan/phpstan": "^1.9.4", - "phpstan/phpstan-phpunit": "^1.3", - "phpunit/phpunit": "^9.5.27", - "vimeo/psalm": "^5.4" + "phpbench/phpbench": "^0.16 || ^1", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -8004,7 +7766,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/2.0.0" + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" }, "funding": [ { @@ -8020,7 +7782,7 @@ "type": "tidelift" } ], - "time": "2022-12-30T00:23:10+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "filp/whoops", @@ -8642,30 +8404,25 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.2", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" + "reference": "77a32518733312af16a44300404e945338981de3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", - "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", + "reference": "77a32518733312af16a44300404e945338981de3", "shasum": "" }, "require": { - "php": "^7.4 || ^8.0", + "php": "^7.2 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { "ext-tokenizer": "*", - "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-phpunit": "^1.1", - "phpunit/phpunit": "^9.5", - "rector/rector": "^0.13.9", - "vimeo/psalm": "^4.25" + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -8691,9 +8448,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" }, - "time": "2022-10-14T12:47:21+00:00" + "time": "2022-03-15T21:29:03+00:00" }, { "name": "phpunit/php-code-coverage", @@ -10204,5 +9961,5 @@ "ext-zip": "*" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.1.0" } From 4d640b497b0a64a5d06eedd081551343efc5b1d9 Mon Sep 17 00:00:00 2001 From: et-nik Date: Tue, 17 Jan 2023 12:31:15 +0100 Subject: [PATCH 36/37] fix test --- .../Controllers/API/ServerRconControllerTest.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/Feature/Permissions/Controllers/API/ServerRconControllerTest.php b/tests/Feature/Permissions/Controllers/API/ServerRconControllerTest.php index 99a3593e..6216a5d3 100644 --- a/tests/Feature/Permissions/Controllers/API/ServerRconControllerTest.php +++ b/tests/Feature/Permissions/Controllers/API/ServerRconControllerTest.php @@ -5,6 +5,7 @@ use Gameap\Models\GameMod; use Gameap\Models\Server; use Gameap\Models\User; +use Gameap\Repositories\UserRepository; use Illuminate\Http\Response; use Silber\Bouncer\Bouncer; use Tests\TestCase; @@ -19,6 +20,9 @@ class ServerRconControllerTest extends TestCase */ protected $user; + /** @var UserRepository */ + protected $userRepository; + /** @var Bouncer */ protected $bouncer; @@ -30,6 +34,8 @@ public function setUp(): void $this->be($this->user); $this->bouncer = $this->app->get(Bouncer::class); + + $this->userRepository = new UserRepository($this->bouncer); } public function testForbidden() @@ -82,6 +88,7 @@ public function testAllow() 'game_mod_id' => GameMod::select('id')->where(['game_code' => 'cstrike'])->first(), 'process_active' => false, ]); + $this->userRepository->updateServerPermission($this->user, $server, []); $this->user->allow('server-rcon-console', $server); $this->user->allow('server-rcon-players', $server); From b613ce88604df25b53c1efe2a48006e97e670036 Mon Sep 17 00:00:00 2001 From: et-nik Date: Tue, 17 Jan 2023 13:48:29 +0100 Subject: [PATCH 37/37] update drone configuration --- .drone.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.drone.yml b/.drone.yml index 48e2f663..c30c68ac 100644 --- a/.drone.yml +++ b/.drone.yml @@ -105,6 +105,29 @@ steps: - rm -rf storage/logs/* - rm .env + - name: tests-php-8.2 + image: knik/php:8.2-fpm-alpine + failure: ignore + environment: + APP_KEY: base64:QhlU2DzlLyaYVHzlh3RlSipTtBhwb3/5jPKbctx2lP8= + DB_CONNECTION: mysql + DB_HOST: db + DB_PORT: 3306 + DB_DATABASE: homestead + DB_USERNAME: homestead + DB_PASSWORD: secret + commands: + - cp .env.example .env + - php artisan migrate:fresh --seed + - vendor/bin/phpunit --verbose + - rm -rf storage/app/certs + - rm -rf storage/framework/cache/data/* + - rm -rf storage/framework/sessions/* + - rm -rf storage/framework/views/* + - rm -rf storage/debugbar/* + - rm -rf storage/logs/* + - rm .env + - name: browser-tests image: knik/php:7.3-fpm-buster environment: