Revert "rector: arrrrr"

This reverts commit 16c0cd10d8.
2025-01-07 15:31:43 +01:00
parent da07b4fdcf
commit 1fe4dd722b
349 changed files with 3689 additions and 4184 deletions
--- a/app/Http/Controllers/Api/ApplicationsController.php
+++ b/app/Http/Controllers/Api/ApplicationsController.php
@@ -15,7 +15,6 @@ use App\Models\PrivateKey;
 use App\Models\Project;
 use App\Models\Server;
 use App\Models\Service;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
 use OpenApi\Attributes as OA;
@@ -90,7 +89,7 @@ class ApplicationsController extends Controller
        if (is_null($teamId)) {
            return invalidTokenResponse();
        }
-        $projects = Project::query()->where('team_id', $teamId)->get();
+        $projects = Project::where('team_id', $teamId)->get();
        $applications = collect();
        $applications->push($projects->pluck('applications')->flatten());
        $applications = $applications->flatten();
@@ -718,7 +717,7 @@ class ApplicationsController extends Controller
        }

        $return = validateIncomingRequest($request);
-        if ($return instanceof JsonResponse) {
+        if ($return instanceof \Illuminate\Http\JsonResponse) {
            return $return;
        }
        $validator = customApiValidator($request->all(), [
@@ -732,10 +731,12 @@ class ApplicationsController extends Controller
        ]);

        $extraFields = array_diff(array_keys($request->all()), $allowedFields);
-        if ($validator->fails() || $extraFields !== []) {
+        if ($validator->fails() || ! empty($extraFields)) {
            $errors = $validator->errors();
-            foreach ($extraFields as $extraField) {
-                $errors->add($extraField, 'This field is not allowed.');
+            if (! empty($extraFields)) {
+                foreach ($extraFields as $field) {
+                    $errors->add($field, 'This field is not allowed.');
+                }
            }

            return response()->json([
@@ -824,12 +825,15 @@ class ApplicationsController extends Controller
            if ($request->build_pack === 'dockercompose') {
                $request->offsetSet('ports_exposes', '80');
            }
+
            $return = $this->validateDataApplications($request, $server);
-            if ($return instanceof JsonResponse) {
+            if ($return instanceof \Illuminate\Http\JsonResponse) {
                return $return;
            }
+
            $application = new Application;
            removeUnnecessaryFieldsFromRequest($request);
+
            $application->fill($request->all());
            $dockerComposeDomainsJson = collect();
            if ($request->has('docker_compose_domains')) {
@@ -844,6 +848,7 @@ class ApplicationsController extends Controller
            if ($dockerComposeDomainsJson->count() > 0) {
                $application->docker_compose_domains = $dockerComposeDomainsJson;
            }
+
            $application->fqdn = $fqdn;
            $application->destination_id = $destination->id;
            $application->destination_type = $destination->getMorphClass();
@@ -863,24 +868,27 @@ class ApplicationsController extends Controller
                $application->save();
            }
            $application->isConfigurationChanged(true);
+
            if ($instantDeploy) {
                $deployment_uuid = new Cuid2;
+
                queue_application_deployment(
                    application: $application,
                    deployment_uuid: $deployment_uuid,
                    no_questions_asked: true,
                    is_api: true,
                );
-            } elseif ($application->build_pack === 'dockercompose') {
-                LoadComposeFile::dispatch($application);
+            } else {
+                if ($application->build_pack === 'dockercompose') {
+                    LoadComposeFile::dispatch($application);
+                }
            }

            return response()->json(serializeApiResponse([
                'uuid' => data_get($application, 'uuid'),
                'domains' => data_get($application, 'domains'),
            ]))->setStatusCode(201);
-        }
-        if ($type === 'private-gh-app') {
+        } elseif ($type === 'private-gh-app') {
            $validationRules = [
                'git_repository' => 'string|required',
                'git_branch' => 'string|required',
@@ -892,6 +900,7 @@ class ApplicationsController extends Controller
                'docker_compose_raw' => 'string|nullable',
            ];
            $validationRules = array_merge(sharedDataApplications(), $validationRules);
+
            $validator = customApiValidator($request->all(), $validationRules);
            if ($validator->fails()) {
                return response()->json([
@@ -899,14 +908,16 @@ class ApplicationsController extends Controller
                    'errors' => $validator->errors(),
                ], 422);
            }
+
            if (! $request->has('name')) {
                $request->offsetSet('name', generate_application_name($request->git_repository, $request->git_branch));
            }
            if ($request->build_pack === 'dockercompose') {
                $request->offsetSet('ports_exposes', '80');
            }
+
            $return = $this->validateDataApplications($request, $server);
-            if ($return instanceof JsonResponse) {
+            if ($return instanceof \Illuminate\Http\JsonResponse) {
                return $return;
            }
            $githubApp = GithubApp::whereTeamId($teamId)->where('uuid', $githubAppUuid)->first();
@@ -919,7 +930,9 @@ class ApplicationsController extends Controller
            }
            $application = new Application;
            removeUnnecessaryFieldsFromRequest($request);
+
            $application->fill($request->all());
+
            $dockerComposeDomainsJson = collect();
            if ($request->has('docker_compose_domains')) {
                $yaml = Yaml::parse($application->docker_compose_raw);
@@ -956,24 +969,28 @@ class ApplicationsController extends Controller
                $application->save();
            }
            $application->isConfigurationChanged(true);
+
            if ($instantDeploy) {
                $deployment_uuid = new Cuid2;
+
                queue_application_deployment(
                    application: $application,
                    deployment_uuid: $deployment_uuid,
                    no_questions_asked: true,
                    is_api: true,
                );
-            } elseif ($application->build_pack === 'dockercompose') {
-                LoadComposeFile::dispatch($application);
+            } else {
+                if ($application->build_pack === 'dockercompose') {
+                    LoadComposeFile::dispatch($application);
+                }
            }

            return response()->json(serializeApiResponse([
                'uuid' => data_get($application, 'uuid'),
                'domains' => data_get($application, 'domains'),
            ]))->setStatusCode(201);
-        }
-        if ($type === 'private-deploy-key') {
+        } elseif ($type === 'private-deploy-key') {
+
            $validationRules = [
                'git_repository' => 'string|required',
                'git_branch' => 'string|required',
@@ -984,8 +1001,10 @@ class ApplicationsController extends Controller
                'docker_compose_location' => 'string',
                'docker_compose_raw' => 'string|nullable',
            ];
+
            $validationRules = array_merge(sharedDataApplications(), $validationRules);
            $validator = customApiValidator($request->all(), $validationRules);
+
            if ($validator->fails()) {
                return response()->json([
                    'message' => 'Validation failed.',
@@ -998,17 +1017,21 @@ class ApplicationsController extends Controller
            if ($request->build_pack === 'dockercompose') {
                $request->offsetSet('ports_exposes', '80');
            }
+
            $return = $this->validateDataApplications($request, $server);
-            if ($return instanceof JsonResponse) {
+            if ($return instanceof \Illuminate\Http\JsonResponse) {
                return $return;
            }
            $privateKey = PrivateKey::whereTeamId($teamId)->where('uuid', $request->private_key_uuid)->first();
            if (! $privateKey) {
                return response()->json(['message' => 'Private Key not found.'], 404);
            }
+
            $application = new Application;
            removeUnnecessaryFieldsFromRequest($request);
+
            $application->fill($request->all());
+
            $dockerComposeDomainsJson = collect();
            if ($request->has('docker_compose_domains')) {
                $yaml = Yaml::parse($application->docker_compose_raw);
@@ -1043,29 +1066,33 @@ class ApplicationsController extends Controller
                $application->save();
            }
            $application->isConfigurationChanged(true);
+
            if ($instantDeploy) {
                $deployment_uuid = new Cuid2;
+
                queue_application_deployment(
                    application: $application,
                    deployment_uuid: $deployment_uuid,
                    no_questions_asked: true,
                    is_api: true,
                );
-            } elseif ($application->build_pack === 'dockercompose') {
-                LoadComposeFile::dispatch($application);
+            } else {
+                if ($application->build_pack === 'dockercompose') {
+                    LoadComposeFile::dispatch($application);
+                }
            }

            return response()->json(serializeApiResponse([
                'uuid' => data_get($application, 'uuid'),
                'domains' => data_get($application, 'domains'),
            ]))->setStatusCode(201);
-        }
-        if ($type === 'dockerfile') {
+        } elseif ($type === 'dockerfile') {
            $validationRules = [
                'dockerfile' => 'string|required',
            ];
            $validationRules = array_merge(sharedDataApplications(), $validationRules);
            $validator = customApiValidator($request->all(), $validationRules);
+
            if ($validator->fails()) {
                return response()->json([
                    'message' => 'Validation failed.',
@@ -1075,8 +1102,9 @@ class ApplicationsController extends Controller
            if (! $request->has('name')) {
                $request->offsetSet('name', 'dockerfile-'.new Cuid2);
            }
+
            $return = $this->validateDataApplications($request, $server);
-            if ($return instanceof JsonResponse) {
+            if ($return instanceof \Illuminate\Http\JsonResponse) {
                return $return;
            }
            if (! isBase64Encoded($request->dockerfile)) {
@@ -1098,10 +1126,12 @@ class ApplicationsController extends Controller
            }
            $dockerFile = base64_decode($request->dockerfile);
            removeUnnecessaryFieldsFromRequest($request);
+
            $port = get_port_from_dockerfile($request->dockerfile);
            if (! $port) {
                $port = 80;
            }
+
            $application = new Application;
            $application->fill($request->all());
            $application->fqdn = $fqdn;
@@ -1111,6 +1141,7 @@ class ApplicationsController extends Controller
            $application->destination_id = $destination->id;
            $application->destination_type = $destination->getMorphClass();
            $application->environment_id = $environment->id;
+
            $application->git_repository = 'coollabsio/coolify';
            $application->git_branch = 'main';
            $application->save();
@@ -1124,6 +1155,7 @@ class ApplicationsController extends Controller
                $application->save();
            }
            $application->isConfigurationChanged(true);
+
            if ($instantDeploy) {
                $deployment_uuid = new Cuid2;

@@ -1139,8 +1171,7 @@ class ApplicationsController extends Controller
                'uuid' => data_get($application, 'uuid'),
                'domains' => data_get($application, 'domains'),
            ]))->setStatusCode(201);
-        }
-        if ($type === 'dockerimage') {
+        } elseif ($type === 'dockerimage') {
            $validationRules = [
                'docker_registry_image_name' => 'string|required',
                'docker_registry_image_tag' => 'string',
@@ -1148,6 +1179,7 @@ class ApplicationsController extends Controller
            ];
            $validationRules = array_merge(sharedDataApplications(), $validationRules);
            $validator = customApiValidator($request->all(), $validationRules);
+
            if ($validator->fails()) {
                return response()->json([
                    'message' => 'Validation failed.',
@@ -1158,7 +1190,7 @@ class ApplicationsController extends Controller
                $request->offsetSet('name', 'docker-image-'.new Cuid2);
            }
            $return = $this->validateDataApplications($request, $server);
-            if ($return instanceof JsonResponse) {
+            if ($return instanceof \Illuminate\Http\JsonResponse) {
                return $return;
            }
            if (! $request->docker_registry_image_tag) {
@@ -1166,12 +1198,14 @@ class ApplicationsController extends Controller
            }
            $application = new Application;
            removeUnnecessaryFieldsFromRequest($request);
+
            $application->fill($request->all());
            $application->fqdn = $fqdn;
            $application->build_pack = 'dockerimage';
            $application->destination_id = $destination->id;
            $application->destination_type = $destination->getMorphClass();
            $application->environment_id = $environment->id;
+
            $application->git_repository = 'coollabsio/coolify';
            $application->git_branch = 'main';
            $application->save();
@@ -1185,6 +1219,7 @@ class ApplicationsController extends Controller
                $application->save();
            }
            $application->isConfigurationChanged(true);
+
            if ($instantDeploy) {
                $deployment_uuid = new Cuid2;

@@ -1200,14 +1235,16 @@ class ApplicationsController extends Controller
                'uuid' => data_get($application, 'uuid'),
                'domains' => data_get($application, 'domains'),
            ]))->setStatusCode(201);
-        }
-        if ($type === 'dockercompose') {
+        } elseif ($type === 'dockercompose') {
            $allowedFields = ['project_uuid', 'environment_name', 'environment_uuid', 'server_uuid', 'destination_uuid', 'type', 'name', 'description', 'instant_deploy', 'docker_compose_raw'];
+
            $extraFields = array_diff(array_keys($request->all()), $allowedFields);
-            if ($validator->fails() || $extraFields !== []) {
+            if ($validator->fails() || ! empty($extraFields)) {
                $errors = $validator->errors();
-                foreach ($extraFields as $extraField) {
-                    $errors->add($extraField, 'This field is not allowed.');
+                if (! empty($extraFields)) {
+                    foreach ($extraFields as $field) {
+                        $errors->add($field, 'This field is not allowed.');
+                    }
                }

                return response()->json([
@@ -1223,6 +1260,7 @@ class ApplicationsController extends Controller
            ];
            $validationRules = array_merge(sharedDataApplications(), $validationRules);
            $validator = customApiValidator($request->all(), $validationRules);
+
            if ($validator->fails()) {
                return response()->json([
                    'message' => 'Validation failed.',
@@ -1230,7 +1268,7 @@ class ApplicationsController extends Controller
                ], 422);
            }
            $return = $this->validateDataApplications($request, $server);
-            if ($return instanceof JsonResponse) {
+            if ($return instanceof \Illuminate\Http\JsonResponse) {
                return $return;
            }
            if (! isBase64Encoded($request->docker_compose_raw)) {
@@ -1252,19 +1290,23 @@ class ApplicationsController extends Controller
            }
            $dockerCompose = base64_decode($request->docker_compose_raw);
            $dockerComposeRaw = Yaml::dump(Yaml::parse($dockerCompose), 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
+
            // $isValid = validateComposeFile($dockerComposeRaw, $server_id);
            // if ($isValid !== 'OK') {
            //     return $this->dispatch('error', "Invalid docker-compose file.\n$isValid");
            // }
+
            $service = new Service;
            removeUnnecessaryFieldsFromRequest($request);
            $service->fill($request->all());
+
            $service->docker_compose_raw = $dockerComposeRaw;
            $service->environment_id = $environment->id;
            $service->server_id = $server->id;
            $service->destination_id = $destination->id;
            $service->destination_type = $destination->getMorphClass();
            $service->save();
+
            $service->name = "service-$service->uuid";
            $service->parse(isNew: true);
            if ($instantDeploy) {
@@ -1404,7 +1446,7 @@ class ApplicationsController extends Controller
    public function delete_by_uuid(Request $request)
    {
        $teamId = getTeamIdFromToken();
-        filter_var($request->query->get('cleanup', true), FILTER_VALIDATE_BOOLEAN);
+        $cleanup = filter_var($request->query->get('cleanup', true), FILTER_VALIDATE_BOOLEAN);
        if (is_null($teamId)) {
            return invalidTokenResponse();
        }
@@ -1559,7 +1601,7 @@ class ApplicationsController extends Controller
            ], 400);
        }
        $return = validateIncomingRequest($request);
-        if ($return instanceof JsonResponse) {
+        if ($return instanceof \Illuminate\Http\JsonResponse) {
            return $return;
        }
        $application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $request->uuid)->first();
@@ -1621,14 +1663,16 @@ class ApplicationsController extends Controller
            }
        }
        $return = $this->validateDataApplications($request, $server);
-        if ($return instanceof JsonResponse) {
+        if ($return instanceof \Illuminate\Http\JsonResponse) {
            return $return;
        }
        $extraFields = array_diff(array_keys($request->all()), $allowedFields);
-        if ($validator->fails() || $extraFields !== []) {
+        if ($validator->fails() || ! empty($extraFields)) {
            $errors = $validator->errors();
-            foreach ($extraFields as $extraField) {
-                $errors->add($extraField, 'This field is not allowed.');
+            if (! empty($extraFields)) {
+                foreach ($extraFields as $field) {
+                    $errors->add($field, 'This field is not allowed.');
+                }
            }

            return response()->json([
@@ -1651,7 +1695,7 @@ class ApplicationsController extends Controller

                return $domain;
            });
-            if ($errors !== []) {
+            if (count($errors) > 0) {
                return response()->json([
                    'message' => 'Validation failed.',
                    'errors' => $errors,
@@ -1710,11 +1754,11 @@ class ApplicationsController extends Controller
        $application->save();

        if ($instantDeploy) {
-            $cuid2 = new Cuid2;
+            $deployment_uuid = new Cuid2;

            queue_application_deployment(
                application: $application,
-                deployment_uuid: $cuid2,
+                deployment_uuid: $deployment_uuid,
                is_api: true,
            );
        }
@@ -1890,7 +1934,7 @@ class ApplicationsController extends Controller
        }

        $return = validateIncomingRequest($request);
-        if ($return instanceof JsonResponse) {
+        if ($return instanceof \Illuminate\Http\JsonResponse) {
            return $return;
        }
        $application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $request->uuid)->first();
@@ -1911,10 +1955,12 @@ class ApplicationsController extends Controller
        ]);

        $extraFields = array_diff(array_keys($request->all()), $allowedFields);
-        if ($validator->fails() || $extraFields !== []) {
+        if ($validator->fails() || ! empty($extraFields)) {
            $errors = $validator->errors();
-            foreach ($extraFields as $extraField) {
-                $errors->add($extraField, 'This field is not allowed.');
+            if (! empty($extraFields)) {
+                foreach ($extraFields as $field) {
+                    $errors->add($field, 'This field is not allowed.');
+                }
            }

            return response()->json([
@@ -1948,38 +1994,43 @@ class ApplicationsController extends Controller
                $env->save();

                return response()->json($this->removeSensitiveData($env))->setStatusCode(201);
+            } else {
+                return response()->json([
+                    'message' => 'Environment variable not found.',
+                ], 404);
            }
+        } else {
+            $env = $application->environment_variables->where('key', $key)->first();
+            if ($env) {
+                $env->value = $request->value;
+                if ($env->is_build_time != $is_build_time) {
+                    $env->is_build_time = $is_build_time;
+                }
+                if ($env->is_literal != $is_literal) {
+                    $env->is_literal = $is_literal;
+                }
+                if ($env->is_preview != $is_preview) {
+                    $env->is_preview = $is_preview;
+                }
+                if ($env->is_multiline != $request->is_multiline) {
+                    $env->is_multiline = $request->is_multiline;
+                }
+                if ($env->is_shown_once != $request->is_shown_once) {
+                    $env->is_shown_once = $request->is_shown_once;
+                }
+                $env->save();

-            return response()->json([
-                'message' => 'Environment variable not found.',
-            ], 404);
-        }
-        $env = $application->environment_variables->where('key', $key)->first();
-        if ($env) {
-            $env->value = $request->value;
-            if ($env->is_build_time != $is_build_time) {
-                $env->is_build_time = $is_build_time;
+                return response()->json($this->removeSensitiveData($env))->setStatusCode(201);
+            } else {
+                return response()->json([
+                    'message' => 'Environment variable not found.',
+                ], 404);
            }
-            if ($env->is_literal != $is_literal) {
-                $env->is_literal = $is_literal;
-            }
-            if ($env->is_preview != $is_preview) {
-                $env->is_preview = $is_preview;
-            }
-            if ($env->is_multiline != $request->is_multiline) {
-                $env->is_multiline = $request->is_multiline;
-            }
-            if ($env->is_shown_once != $request->is_shown_once) {
-                $env->is_shown_once = $request->is_shown_once;
-            }
-            $env->save();
-
-            return response()->json($this->removeSensitiveData($env))->setStatusCode(201);
        }

        return response()->json([
-            'message' => 'Environment variable not found.',
-        ], 404);
+            'message' => 'Something is not okay. Are you okay?',
+        ], 500);
    }

    #[OA\Patch(
@@ -2072,7 +2123,7 @@ class ApplicationsController extends Controller
        }

        $return = validateIncomingRequest($request);
-        if ($return instanceof JsonResponse) {
+        if ($return instanceof \Illuminate\Http\JsonResponse) {
            return $return;
        }
        $application = Application::ownedByCurrentTeamAPI($teamId)->where('uuid', $request->uuid)->first();
@@ -2278,10 +2329,12 @@ class ApplicationsController extends Controller
        ]);

        $extraFields = array_diff(array_keys($request->all()), $allowedFields);
-        if ($validator->fails() || $extraFields !== []) {
+        if ($validator->fails() || ! empty($extraFields)) {
            $errors = $validator->errors();
-            foreach ($extraFields as $extraField) {
-                $errors->add($extraField, 'This field is not allowed.');
+            if (! empty($extraFields)) {
+                foreach ($extraFields as $field) {
+                    $errors->add($field, 'This field is not allowed.');
+                }
            }

            return response()->json([
@@ -2298,44 +2351,51 @@ class ApplicationsController extends Controller
                return response()->json([
                    'message' => 'Environment variable already exists. Use PATCH request to update it.',
                ], 409);
-            }
-            $env = $application->environment_variables()->create([
-                'key' => $request->key,
-                'value' => $request->value,
-                'is_preview' => $request->is_preview ?? false,
-                'is_build_time' => $request->is_build_time ?? false,
-                'is_literal' => $request->is_literal ?? false,
-                'is_multiline' => $request->is_multiline ?? false,
-                'is_shown_once' => $request->is_shown_once ?? false,
-                'resourceable_type' => get_class($application),
-                'resourceable_id' => $application->id,
-            ]);
+            } else {
+                $env = $application->environment_variables()->create([
+                    'key' => $request->key,
+                    'value' => $request->value,
+                    'is_preview' => $request->is_preview ?? false,
+                    'is_build_time' => $request->is_build_time ?? false,
+                    'is_literal' => $request->is_literal ?? false,
+                    'is_multiline' => $request->is_multiline ?? false,
+                    'is_shown_once' => $request->is_shown_once ?? false,
+                    'resourceable_type' => get_class($application),
+                    'resourceable_id' => $application->id,
+                ]);

-            return response()->json([
-                'uuid' => $env->uuid,
-            ])->setStatusCode(201);
+                return response()->json([
+                    'uuid' => $env->uuid,
+                ])->setStatusCode(201);
+            }
+        } else {
+            $env = $application->environment_variables->where('key', $key)->first();
+            if ($env) {
+                return response()->json([
+                    'message' => 'Environment variable already exists. Use PATCH request to update it.',
+                ], 409);
+            } else {
+                $env = $application->environment_variables()->create([
+                    'key' => $request->key,
+                    'value' => $request->value,
+                    'is_preview' => $request->is_preview ?? false,
+                    'is_build_time' => $request->is_build_time ?? false,
+                    'is_literal' => $request->is_literal ?? false,
+                    'is_multiline' => $request->is_multiline ?? false,
+                    'is_shown_once' => $request->is_shown_once ?? false,
+                    'resourceable_type' => get_class($application),
+                    'resourceable_id' => $application->id,
+                ]);
+
+                return response()->json([
+                    'uuid' => $env->uuid,
+                ])->setStatusCode(201);
+            }
        }
-        $env = $application->environment_variables->where('key', $key)->first();
-        if ($env) {
-            return response()->json([
-                'message' => 'Environment variable already exists. Use PATCH request to update it.',
-            ], 409);
-        }
-        $env = $application->environment_variables()->create([
-            'key' => $request->key,
-            'value' => $request->value,
-            'is_preview' => $request->is_preview ?? false,
-            'is_build_time' => $request->is_build_time ?? false,
-            'is_literal' => $request->is_literal ?? false,
-            'is_multiline' => $request->is_multiline ?? false,
-            'is_shown_once' => $request->is_shown_once ?? false,
-            'resourceable_type' => get_class($application),
-            'resourceable_id' => $application->id,
-        ]);

        return response()->json([
-            'uuid' => $env->uuid,
-        ])->setStatusCode(201);
+            'message' => 'Something went wrong.',
+        ], 500);
    }

    #[OA\Delete(
@@ -2412,7 +2472,7 @@ class ApplicationsController extends Controller
                'message' => 'Application not found.',
            ], 404);
        }
-        $found_env = EnvironmentVariable::query()->where('uuid', $request->env_uuid)
+        $found_env = EnvironmentVariable::where('uuid', $request->env_uuid)
            ->where('resourceable_type', Application::class)
            ->where('resourceable_id', $application->id)
            ->first();
@@ -2515,11 +2575,11 @@ class ApplicationsController extends Controller
            return response()->json(['message' => 'Application not found.'], 404);
        }

-        $cuid2 = new Cuid2;
+        $deployment_uuid = new Cuid2;

        queue_application_deployment(
            application: $application,
-            deployment_uuid: $cuid2,
+            deployment_uuid: $deployment_uuid,
            force_rebuild: $force,
            is_api: true,
            no_questions_asked: $instant_deploy
@@ -2528,7 +2588,7 @@ class ApplicationsController extends Controller
        return response()->json(
            [
                'message' => 'Deployment request queued.',
-                'deployment_uuid' => $cuid2->toString(),
+                'deployment_uuid' => $deployment_uuid->toString(),
            ],
            200
        );
@@ -2676,11 +2736,11 @@ class ApplicationsController extends Controller
            return response()->json(['message' => 'Application not found.'], 404);
        }

-        $cuid2 = new Cuid2;
+        $deployment_uuid = new Cuid2;

        queue_application_deployment(
            application: $application,
-            deployment_uuid: $cuid2,
+            deployment_uuid: $deployment_uuid,
            restart_only: true,
            is_api: true,
        );
@@ -2688,7 +2748,7 @@ class ApplicationsController extends Controller
        return response()->json(
            [
                'message' => 'Restart request queued.',
-                'deployment_uuid' => $cuid2->toString(),
+                'deployment_uuid' => $deployment_uuid->toString(),
            ],
        );
    }
@@ -2775,7 +2835,7 @@ class ApplicationsController extends Controller
            return response()->json(['message' => 'Application not found.'], 404);
        }
        $return = validateIncomingRequest($request);
-        if ($return instanceof JsonResponse) {
+        if ($return instanceof \Illuminate\Http\JsonResponse) {
            return $return;
        }
        $validator = customApiValidator($request->all(), [
@@ -2783,10 +2843,12 @@ class ApplicationsController extends Controller
        ]);

        $extraFields = array_diff(array_keys($request->all()), $allowedFields);
-        if ($validator->fails() || $extraFields !== []) {
+        if ($validator->fails() || ! empty($extraFields)) {
            $errors = $validator->errors();
-            foreach ($extraFields as $extraField) {
-                $errors->add($extraField, 'This field is not allowed.');
+            if (! empty($extraFields)) {
+                foreach ($extraFields as $field) {
+                    $errors->add($field, 'This field is not allowed.');
+                }
            }

            return response()->json([
@@ -2869,7 +2931,7 @@ class ApplicationsController extends Controller

                return str($domain)->trim()->lower();
            });
-            if ($errors !== []) {
+            if (count($errors) > 0) {
                return response()->json([
                    'message' => 'Validation failed.',
                    'errors' => $errors,
@@ -2884,7 +2946,5 @@ class ApplicationsController extends Controller
                ], 422);
            }
        }
-
-        return null;
    }
 }