refactor: improved code

Author: thorsten

mago.toml

@@ -16,3 +16,11 @@ null-type-hint = "question"
 
 [linter]
 integrations = ["symfony", "php-unit"]
+
+[linter.rules]
+cyclomatic-complexity = { threshold = 50 }
+halstead = { volume-threshold = 3000, effort-threshold = 20000 }
+kan-defect = { threshold = 3.0 }
+too-many-enum-cases = { threshold = 50 }
+too-many-methods = { threshold = 20 }
+too-many-properties = { threshold = 15 }

phpmyfaq/src/phpMyFAQ/Attachment/Filesystem/AbstractFile.php

@@ -55,7 +55,7 @@ public function __construct(
     ) {
         $this->path = $filepath;
 
-        $this->handle = @fopen($this->path, $this->mode);
+        $this->handle = fopen($this->path, $this->mode);
 
         if (!is_resource($this->handle)) {
             throw new FileException('Could not open file: ' . $this->path);

phpmyfaq/src/phpMyFAQ/Auth/AuthLdap.php

@@ -126,7 +126,7 @@ private function assignUserToGroups(string $login, int $userId): void
             $groupName = $this->extractGroupNameFromDn($userGroup);
 
             // Check if there's a specific mapping for this AD group
-            if (!empty($groupMapping) && isset($groupMapping[$groupName])) {
+            if (count($groupMapping) > 0 && isset($groupMapping[$groupName])) {
                 $faqGroupName = $groupMapping[$groupName];
             } else {
                 // Default: use the AD group name
@@ -232,7 +232,7 @@ public function checkCredentials(
             }
 
             $allowedGroups = $ldapGroupConfig['allowed_groups'];
-            if (!empty($allowedGroups)) {
+            if (count($allowedGroups) > 0) {
                 $hasAllowedGroup = false;
                 foreach ($userGroups as $userGroup) {
                     foreach ($allowedGroups as $allowedGroup) {

phpmyfaq/src/phpMyFAQ/Helper/StatisticsHelper.php

@@ -95,13 +95,14 @@ public function getLastTrackingDate(int $lastDate): string
         if (is_file(PMF_ROOT_DIR . '/content/core/data/tracking' . date(format: 'dmY', timestamp: $lastDate))) {
             $fp = fopen(PMF_ROOT_DIR . '/content/core/data/tracking' . date(format: 'dmY', timestamp: $lastDate), 'r');
 
+            $date = null;
             while (($data = fgetcsv($fp, length: 1024, separator: ';', enclosure: '"', escape: '\\')) !== false) {
                 $date = isset($data[7]) && 10 === strlen($data[7]) ? $data[7] : $requestTime;
             }
 
             fclose($fp);
 
-            if (empty($date)) {
+            if ($date === null || $date === 0) {
                 $date = $request->server->get('REQUEST_TIME');
             }
 

phpmyfaq/src/phpMyFAQ/Mail/Builtin.php

@@ -57,7 +57,7 @@ public function send(string $recipients, array $headers, string $body): int
         }
 
         // Send the email
-        if (empty($sender)) {
+        if ($sender === '') {
             return (int) mail($recipients, $subject, $body, $mailHeaders);
         }
 

phpmyfaq/src/phpMyFAQ/Permission/MediumPermission.php

@@ -124,7 +124,7 @@ public function checkUserGroupRight(int $userId, int $rightId): bool
     public function grantGroupRight(int $groupId, int $rightId): bool
     {
         $right_data = $this->getRightData($rightId);
-        if (empty($right_data) || !($right_data['for_groups'] ?? false)) {
+        if (count($right_data) === 0 || !($right_data['for_groups'] ?? false)) {
             return false;
         }
 

phpmyfaq/src/phpMyFAQ/Search/SearchDatabase.php

@@ -104,17 +104,7 @@ public function search(string $searchTerm): mixed
      */
     public function getResultColumns(): string
     {
-        $resultColumns = '';
-
-        foreach ($this->resultColumns as $resultColumn) {
-            if (empty($resultColumns)) {
-                $resultColumns = $resultColumn;
-            } else {
-                $resultColumns .= ', ' . $resultColumn;
-            }
-        }
-
-        return $resultColumns;
+        return implode(', ', $this->resultColumns);
     }
 
     /**
@@ -262,7 +252,7 @@ public function getMatchClause(string $searchTerm = ''): string
         $where = '';
 
         for ($i = 0; $i < $numKeys; ++$i) {
-            if (strlen($where) != 0) {
+            if ($where !== '') {
                 $where .= ' OR';
             }
 

phpmyfaq/src/phpMyFAQ/Session/Token.php

@@ -176,9 +176,7 @@ private function getSession(string $page): ?Token
 
     private function getCookie(string $page): string
     {
-        $cookieValue = Request::createFromGlobals()->cookies->get($this->getCookieName($page), '');
-
-        return empty($cookieValue) ? '' : $cookieValue;
+        return Request::createFromGlobals()->cookies->get($this->getCookieName($page), '');
     }
 
     /**

phpmyfaq/src/phpMyFAQ/User/Tracking.php

@@ -123,11 +123,14 @@ public function getRemoteAddress(): string
         $remoteAddress = $this->request->getClientIp();
         $localAddresses = ['127.0.0.1', '::1'];
 
-        if (in_array($remoteAddress, $localAddresses) && $this->getRequestHeaders()->has('X-Forwarded-For')) {
+        if (
+            in_array($remoteAddress, $localAddresses, strict: true)
+            && $this->getRequestHeaders()->has('X-Forwarded-For')
+        ) {
             $remoteAddress = $this->getRequestHeaders()->get('X-Forwarded-For');
         }
 
-        return preg_replace('([^0-9a-z:.]+)i', '', (string) $remoteAddress);
+        return preg_replace(pattern: '([^0-9a-z:.]+)i', replacement: '', subject: (string) $remoteAddress);
     }
 
     private function isBanned(string $remoteAddress): bool
@@ -147,7 +150,7 @@ private function handleSession(?int $cookieId, string $remoteAddress, string $ac
                 'sid',
             );
 
-            if (!is_null($cookieId) && !$cookieId != $this->userSession->getCurrentSessionId()) {
+            if (!is_null($cookieId) && !$cookieId !== $this->userSession->getCurrentSessionId()) {
                 $this->userSession->setCookie(
                     UserSession::COOKIE_NAME_SESSION_ID,
                     $this->userSession->getCurrentSessionId(),
@@ -180,11 +183,15 @@ private function writeTrackingData(string $action, int|string|null $data, string
             . ';'
             . $remoteAddress
             . ';'
-            . str_replace(';', ',', $this->request->server->get('QUERY_STRING') ?? '')
+            . str_replace(search: ';', replace: ',', subject: $this->request->server->get('QUERY_STRING') ?? '')
             . ';'
-            . str_replace(';', ',', $this->request->server->get('HTTP_REFERER') ?? '')
+            . str_replace(search: ';', replace: ',', subject: $this->request->server->get('HTTP_REFERER') ?? '')
             . ';'
-            . str_replace(';', ',', urldecode((string) $this->request->server->get('HTTP_USER_AGENT')))
+            . str_replace(
+                search: ';',
+                replace: ',',
+                subject: urldecode((string) $this->request->server->get('HTTP_USER_AGENT')),
+            )
             . ';'
             . $this->request->server->get('REQUEST_TIME')
             . ";\n";