Move logic into model

app/Services/Servers/EnvironmentService.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace Pterodactyl\Services\Servers;
-
-use Pterodactyl\Models\Server;
-use Pterodactyl\Models\EggVariable;
-
-class EnvironmentService
-{
-    private array $additional = [];
-
-    /**
-     * Dynamically configure additional environment variables to be assigned
-     * with a specific server.
-     */
-    public function setEnvironmentKey(string $key, callable $closure): void
-    {
-        $this->additional[$key] = $closure;
-    }
-
-    /**
-     * Return the dynamically added additional keys.
-     */
-    public function getEnvironmentKeys(): array
-    {
-        return $this->additional;
-    }
-
-    /**
-     * Take all of the environment variables configured for this server and return
-     * them in an easy to process format.
-     */
-    public function handle(Server $server): array
-    {
-        $variables = $server->variables->toBase()->mapWithKeys(function (EggVariable $variable) {
-            return [$variable->env_variable => $variable->server_value ?? $variable->default_value];
-        });
-
-        // Process environment variables defined in this file. This is done first
-        // in order to allow run-time and config defined variables to take
-        // priority over built-in values.
-        foreach ($this->getEnvironmentMappings() as $key => $object) {
-            $variables->put($key, object_get($server, $object));
-        }
-
-        // Process variables set in the configuration file.
-        foreach (config('pterodactyl.environment_variables', []) as $key => $object) {
-            $variables->put(
-                $key,
-                is_callable($object) ? call_user_func($object, $server) : object_get($server, $object)
-            );
-        }
-
-        // Process dynamically included environment variables.
-        foreach ($this->additional as $key => $closure) {
-            $variables->put($key, call_user_func($closure, $server));
-        }
-
-        return $variables->toArray();
-    }
-
-    /**
-     * Return a mapping of Panel default environment variables.
-     */
-    private function getEnvironmentMappings(): array
-    {
-        return [
-            'STARTUP' => 'startup',
-            'P_SERVER_LOCATION' => 'location.short',
-            'P_SERVER_UUID' => 'uuid',
-        ];
-    }
-}

app/Services/Servers/ServerConfigurationStructureService.php

@@ -10,7 +10,7 @@ class ServerConfigurationStructureService
     /**
      * ServerConfigurationStructureService constructor.
      */
-    public function __construct(private EnvironmentService $environment)
+    public function __construct()
     {
     }
 
@@ -49,7 +49,7 @@ class ServerConfigurationStructureService
                 'description' => $server->description,
             ],
             'suspended' => $server->isSuspended(),
-            'environment' => $this->environment->handle($server),
+            'environment' => $server->getEnvironment(),
             'invocation' => $server->startup,
             'skip_egg_scripts' => $server->skip_scripts,
             'build' => [
@@ -109,7 +109,7 @@ class ServerConfigurationStructureService
                 'ports' => $server->allocations->groupBy('ip')->map(function ($item) {
                     return $item->pluck('port');
                 })->toArray(),
-                'env' => $this->environment->handle($server),
+                'env' => $server->getEnvironment(),
                 'oom_disabled' => $server->oom_disabled,
                 'memory' => (int) $server->memory,
                 'swap' => (int) $server->swap,