diff --git a/app/Games/Minecraft/Servers/Protocol/MinecraftBedrockPing.php b/app/Games/Minecraft/Servers/Protocol/MinecraftBedrockPing.php index f215e674..95f892ac 100644 --- a/app/Games/Minecraft/Servers/Protocol/MinecraftBedrockPing.php +++ b/app/Games/Minecraft/Servers/Protocol/MinecraftBedrockPing.php @@ -16,6 +16,7 @@ class MinecraftBedrockPing protected $socket; protected $address; + protected $port; public function __construct(string $address, int $port = 19132) diff --git a/app/Games/Steam/Servers/FiveMStatus.php b/app/Games/Steam/Servers/FiveMStatus.php index 13f02ad5..6968c212 100644 --- a/app/Games/Steam/Servers/FiveMStatus.php +++ b/app/Games/Steam/Servers/FiveMStatus.php @@ -9,6 +9,7 @@ class FiveMStatus extends ServerBridge { protected const TIMEOUT = 3; + protected const DEFAULT_PORT = 30120; public function getServerData() diff --git a/app/Games/Steam/Servers/Protocol/FiveMRcon.php b/app/Games/Steam/Servers/Protocol/FiveMRcon.php index 405211e6..55e58f5c 100644 --- a/app/Games/Steam/Servers/Protocol/FiveMRcon.php +++ b/app/Games/Steam/Servers/Protocol/FiveMRcon.php @@ -12,7 +12,9 @@ class FiveMRcon { private $address; + private $port; + private $password; private $socket; diff --git a/app/Http/Controllers/InstallController.php b/app/Http/Controllers/InstallController.php index fdb39c62..033ba21d 100644 --- a/app/Http/Controllers/InstallController.php +++ b/app/Http/Controllers/InstallController.php @@ -27,15 +27,19 @@ class InstallController extends Controller { public const TEMP_KEY = 'base64:hmU1T3OuvHdi5t1wULI8Xp7geI+JIWGog9pBCNxslY8='; + public const MIN_PHP_VERSION = '8.0'; + public const REQUIRED_EXTENSIONS = [ 'bcmath', 'ctype', 'json', 'mbstring', 'openssl', 'PDO', 'tokenizer', 'xml', 'xmlwriter', 'curl', 'fileinfo', 'zip', ]; + public const SUPPORTED_LANGUAGES_NAMES = [ 'en' => 'English', 'fr' => 'Français', ]; + public const SUPPORTED_LANGUAGES = ['en', 'fr']; protected $databaseDrivers = [ @@ -49,6 +53,7 @@ class InstallController extends Controller protected $steamGames = [ 'gmod', 'ark', 'rust', 'fivem', 'csgo', 'tf2', ]; + protected $games = [ 'minecraft' => [ 'name' => 'Minecraft', diff --git a/app/Http/View/Composers/AdminLayoutComposer.php b/app/Http/View/Composers/AdminLayoutComposer.php index 413a99c9..23477fe0 100644 --- a/app/Http/View/Composers/AdminLayoutComposer.php +++ b/app/Http/View/Composers/AdminLayoutComposer.php @@ -11,7 +11,9 @@ class AdminLayoutComposer { protected UpdateManager $updates; + protected PluginManager $plugins; + protected ThemeManager $themes; /** diff --git a/app/Http/View/Composers/ServerComposer.php b/app/Http/View/Composers/ServerComposer.php index c674a7f6..bfb606c3 100644 --- a/app/Http/View/Composers/ServerComposer.php +++ b/app/Http/View/Composers/ServerComposer.php @@ -12,6 +12,7 @@ class ServerComposer { private static ?Collection $servers = null; + private static ?Server $server = null; /** diff --git a/composer.json b/composer.json index 7ae9e211..36eb2cc9 100644 --- a/composer.json +++ b/composer.json @@ -27,6 +27,7 @@ "require-dev": { "barryvdh/laravel-debugbar": "^3.6.6", "fakerphp/faker": "^1.9.1", + "laravel/pint": "^1.0", "mockery/mockery": "^1.4.4", "nunomaduro/collision": "^6.1", "phpunit/phpunit": "^9.5.10", diff --git a/composer.lock b/composer.lock index b87fc8fa..95b5a4f7 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": "4e8fad69c6adb4025b3d8c9e4c9cdcae", + "content-hash": "2a499f3f39eb1bc9e39b7716011ffd7e", "packages": [ { "name": "bacon/bacon-qr-code", @@ -6326,6 +6326,72 @@ }, "time": "2020-07-09T08:09:16+00:00" }, + { + "name": "laravel/pint", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/pint.git", + "reference": "df89c86ce4515f28b70feaf9ad59e8c3bdb888fd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/pint/zipball/df89c86ce4515f28b70feaf9ad59e8c3bdb888fd", + "reference": "df89c86ce4515f28b70feaf9ad59e8c3bdb888fd", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "ext-tokenizer": "*", + "ext-xml": "*", + "php": "^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^3.8.0", + "illuminate/view": "^9.17.0", + "laravel-zero/framework": "^9.1.1", + "mockery/mockery": "^1.5.0", + "nunomaduro/larastan": "^2.1.11", + "nunomaduro/termwind": "^1.10.1", + "pestphp/pest": "^1.21.3" + }, + "bin": [ + "builds/pint" + ], + "type": "project", + "autoload": { + "psr-4": { + "App\\": "app/", + "Database\\Seeders\\": "database/seeders/", + "Database\\Factories\\": "database/factories/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nuno Maduro", + "email": "enunomaduro@gmail.com" + } + ], + "description": "An opinionated code formatter for PHP.", + "homepage": "https://laravel.com", + "keywords": [ + "format", + "formatter", + "lint", + "linter", + "php" + ], + "support": { + "issues": "https://github.com/laravel/pint/issues", + "source": "https://github.com/laravel/pint" + }, + "time": "2022-07-14T14:50:04+00:00" + }, { "name": "maximebf/debugbar", "version": "v1.18.0", diff --git a/pint.json b/pint.json new file mode 100644 index 00000000..d71d00c6 --- /dev/null +++ b/pint.json @@ -0,0 +1,6 @@ +{ + "exclude": [ + "plugins", + "resources/themes" + ] +}