refactor: simplified code, fixed linter issues

Author: thorsten

mago.toml

@@ -1,6 +1,6 @@
 # Mago configuration file
 # For more information, see https://mago.carthage.software/#/getting-started/configuration
-php-version = "8.3.0"
+php-version = "8.4.0"
 
 [source]
 paths = ["./phpmyfaq/src/phpMyFAQ"]
@@ -18,9 +18,9 @@ null-type-hint = "question"
 integrations = ["symfony", "php-unit"]
 
 [linter.rules]
-cyclomatic-complexity = { threshold = 50 }
-halstead = { volume-threshold = 3000, effort-threshold = 20000 }
-kan-defect = { threshold = 3.0 }
+cyclomatic-complexity = { threshold = 75 }
+halstead = { volume-threshold = 3000, effort-threshold = 25000 }
+kan-defect = { threshold = 4.0 }
 too-many-enum-cases = { threshold = 50 }
 too-many-methods = { threshold = 20 }
 too-many-properties = { threshold = 15 }

phpmyfaq/src/phpMyFAQ/Category/CategoryRepository.php

@@ -178,7 +178,7 @@ public function findByIdAndLanguage(int $categoryId, string $language): ?Categor
         $result = $this->configuration->getDb()->query($query);
 
         if ($row = $this->configuration->getDb()->fetchObject($result)) {
-            $categoryEntity = (new CategoryEntity())
+            $categoryEntity = new CategoryEntity()
                 ->setId((int) $row->id)
                 ->setLang($row->lang)
                 ->setParentId((int) $row->parent_id)

phpmyfaq/src/phpMyFAQ/Command/UpdateCommand.php

@@ -77,7 +77,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
             $io->success(message: strtr(string: 'phpMyFAQ was successfully updated to version version: on date:.', replace_pairs: [
                 'version:' => System::getVersion(),
-                'date:' => (new DateTime())->format(format: 'Y-m-d H:i:s'),
+                'date:' => new DateTime()->format(format: 'Y-m-d H:i:s'),
             ]));
 
             return Command::SUCCESS;

phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/AttachmentController.php

@@ -31,7 +31,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 
 final class AttachmentController extends AbstractController
 {

phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/CategoryController.php

@@ -32,7 +32,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 
 final class CategoryController extends AbstractController
 {
@@ -100,13 +100,15 @@ public function permissions(Request $request): JsonResponse
 
         $categoryData = $request->attributes->get('categories');
 
-        if (empty($categoryData)) {
+        if ($categoryData === null || $categoryData === '' || $categoryData === false) {
             $categories = [-1]; // Access for all users and groups
-        } else {
+        }
+
+        if ($categoryData !== null && $categoryData !== '' && $categoryData !== false) {
             $categories = explode(',', (string) $categoryData);
         }
 
-        if (!in_array(true, filter_var_array($categories, FILTER_VALIDATE_INT))) {
+        if (!in_array(true, filter_var_array($categories, FILTER_VALIDATE_INT), strict: true)) {
             return $this->json(['error' => 'Only integer values are valid.'], Response::HTTP_BAD_REQUEST);
         }
 

phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/CommentController.php

@@ -26,7 +26,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 
 final class CommentController extends AbstractController
 {

phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/ConfigurationController.php

@@ -28,7 +28,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 
 final class ConfigurationController extends AbstractController
 {

phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/ConfigurationTabController.php

@@ -34,7 +34,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Twig\Error\LoaderError;
 
 final class ConfigurationTabController extends AbstractController
@@ -101,7 +101,7 @@ public function save(Request $request): JsonResponse
         // Parse the list of available fields from the form
         $availableFields = [];
         if ($availableFieldsJson) {
-            $availableFields = json_decode($availableFieldsJson, true);
+            $availableFields = json_decode($availableFieldsJson, associative: true);
             if (!is_array($availableFields)) {
                 $availableFields = [];
             }
@@ -159,7 +159,7 @@ public function save(Request $request): JsonResponse
         // Only process fields that were available in the current form
         // For checkboxes: if field is available but not in configurationData, set to false
         // For other fields: keep original value if not in configurationData
-        if (!empty($availableFields)) {
+        if ($availableFields !== [] && $availableFields !== null) {
             foreach ($availableFields as $fieldKey) {
                 if (array_key_exists($fieldKey, $newConfigValues)) {
                     continue;

phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/DashboardController.php

@@ -29,7 +29,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
 
@@ -62,9 +62,12 @@ public function versions(): JsonResponse
 
         try {
             $versions = $api->getVersions();
+            $info = [];
             if (version_compare($versions['installed'], $versions[$releaseEnvironment]) < 0) {
                 $info = ['warning' => Translation::get(key: 'ad_you_should_update')];
-            } else {
+            }
+
+            if (version_compare($versions['installed'], $versions[$releaseEnvironment]) >= 0) {
                 $info = [
                     'success' => Translation::get(key: 'ad_xmlrpc_latest') . ': phpMyFAQ ' . $versions['stable'],
                 ];

phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/ElasticsearchController.php

@@ -29,7 +29,7 @@
 use phpMyFAQ\Translation;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 
 final class ElasticsearchController extends AbstractController
 {