fix: corrected check on permissions, additional some refactorings

thorsten · thorsten · commit 20be77995510 · 2025-12-08T20:41:45.000+01:00
diff --git a/phpmyfaq/src/phpMyFAQ/Administration/Helper.php b/phpmyfaq/src/phpMyFAQ/Administration/Helper.php
@@ -120,7 +120,7 @@ public function setUser(User $user): void
         // check user rights, set them TRUE
         $allUserRights = $user->perm->getAllUserRights($user->getUserId());
         foreach ($allRights as $allRight) {
-            if (!in_array($allRight['right_id'], $allUserRights, true)) {
+            if (!in_array((int) $allRight['right_id'], $allUserRights, true)) {
                 continue;
             }
 
diff --git a/phpmyfaq/src/phpMyFAQ/Attachment/AbstractAttachment.php b/phpmyfaq/src/phpMyFAQ/Attachment/AbstractAttachment.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * Abstract attachment class.
  *
@@ -17,6 +15,8 @@
  * @since     2009-08-21
  */
 
+declare(strict_types=1);
+
 namespace phpMyFAQ\Attachment;
 
 use phpMyFAQ\Database;
@@ -231,7 +231,7 @@ public function saveMeta(): int
     {
         $attachmentTableName = sprintf('%sfaqattachment', Database::getTablePrefix());
 
-        if (null == $this->id) {
+        if (null === $this->id) {
             $this->id = $this->databaseDriver->nextId($attachmentTableName, 'id');
 
             $sql = sprintf(
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/UpdateController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/Api/UpdateController.php
@@ -108,15 +108,15 @@ public function updateCheck(): JsonResponse
             $installed = $versions['installed'];
             $available = $versions[$branch];
 
-            if (version_compare($installed, $available, '<')) {
+            if (version_compare($installed, $available, operator: '<')) {
                 return $this->json([
                     'version' => $available,
                     'message' => Translation::get(key: 'msgCurrentVersion') . $available,
                     'dateLastChecked' => $dateLastChecked,
                 ], Response::HTTP_OK);
             }
 
-            if ($branch !== 'nightly' && version_compare($installed, $available, '>')) {
+            if ($branch !== 'nightly' && version_compare($installed, $available, operator: '>')) {
                 return $this->json([
                     'version' => $available,
                     'message' => Translation::get(key: 'msgInstalledNewerThanAvailable'),
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Client.php b/phpmyfaq/src/phpMyFAQ/Instance/Client.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * The main phpMyFAQ instances class for instance clients.
  *
@@ -17,6 +15,8 @@
  * @since     2012-03-31
  */
 
+declare(strict_types=1);
+
 namespace phpMyFAQ\Instance;
 
 use phpMyFAQ\Configuration;
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database.php b/phpmyfaq/src/phpMyFAQ/Instance/Database.php
@@ -21,7 +21,7 @@
 
 use phpMyFAQ\Configuration;
 use phpMyFAQ\Core\Exception;
-use phpMyFAQ\Instance\Database\Driver;
+use phpMyFAQ\Instance\Database\DriverInterface;
 
 /**
  * Class Database
@@ -33,7 +33,7 @@ class Database
     /**
      * Instance.
      */
-    private static ?Driver $driver = null;
+    private static ?DriverInterface $driver = null;
 
     /**
      * DROP TABLE statements.
@@ -91,7 +91,7 @@ private function __construct(
      * @param string        $type Database management system type
      * @throws Exception
      */
-    public static function factory(Configuration $configuration, string $type): ?Driver
+    public static function factory(Configuration $configuration, string $type): ?DriverInterface
     {
         if (str_starts_with($type, 'pdo_')) {
             $class = 'phpMyFAQ\Instance\Database\Pdo' . ucfirst(substr($type, 4));
@@ -111,9 +111,9 @@ public static function factory(Configuration $configuration, string $type): ?Dri
     /**
      * Returns the single instance.
      */
-    public static function getInstance(): ?Driver
+    public static function getInstance(): ?DriverInterface
     {
-        if (!self::$driver instanceof Driver) {
+        if (!self::$driver instanceof DriverInterface) {
             $className = self::class;
             self::$driver = new $className();
         }
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/DriverInterface.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/DriverInterface.php
@@ -24,7 +24,7 @@
  *
  * @package phpMyFAQ\Instance\Database
  */
-interface Driver
+interface DriverInterface
 {
     /**
      * Executes all CREATE TABLE and CREATE INDEX statements.
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/Mysqli.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/Mysqli.php
@@ -28,7 +28,7 @@
  *
  * @package phpMyFAQ\Instance\Database
  */
-class Mysqli extends Database implements Driver
+class Mysqli extends Database implements DriverInterface
 {
     private array $createTableStatements = [
         'faqadminlog' => 'CREATE TABLE %sfaqadminlog (
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/PdoMysql.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/PdoMysql.php
@@ -28,7 +28,7 @@
  *
  * @package phpMyFAQ\Instance\Database
  */
-class PdoMysql extends Database implements Driver
+class PdoMysql extends Database implements DriverInterface
 {
     private array $createTableStatements = [
         'faqadminlog' => 'CREATE TABLE %sfaqadminlog (
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/PdoPgsql.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/PdoPgsql.php
@@ -27,7 +27,7 @@
  *
  * @package phpMyFAQ\Instance\Database
  */
-class PdoPgsql extends Database implements Driver
+class PdoPgsql extends Database implements DriverInterface
 {
     private array $createTableStatements = [
         'faquser_user_id_seq' => 'CREATE SEQUENCE %sfaquser_user_id_seq START WITH 2',
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/PdoSqlite.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/PdoSqlite.php
@@ -27,7 +27,7 @@
  *
  * @package phpMyFAQ\Instance\Database
  */
-class PdoSqlite extends Database implements Driver
+class PdoSqlite extends Database implements DriverInterface
 {
     private array $createTableStatements = [
         'faqadminlog' => 'CREATE TABLE %sfaqadminlog (
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/PdoSqlsrv.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/PdoSqlsrv.php
@@ -27,7 +27,7 @@
  *
  * @package phpMyFAQ\Instance\Database
  */
-class PdoSqlsrv extends Database implements Driver
+class PdoSqlsrv extends Database implements DriverInterface
 {
     private array $createTableStatements = [
         'faqadminlog' => 'CREATE TABLE %sfaqadminlog (
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/Pgsql.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/Pgsql.php
@@ -27,7 +27,7 @@
  *
  * @package phpMyFAQ\Instance\Database
  */
-class Pgsql extends Database implements Driver
+class Pgsql extends Database implements DriverInterface
 {
     private array $createTableStatements = [
         'faquser_user_id_seq' => 'CREATE SEQUENCE %sfaquser_user_id_seq START WITH 2',
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/Sqlite3.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/Sqlite3.php
@@ -27,7 +27,7 @@
  *
  * @package phpMyFAQ\Instance\Database
  */
-class Sqlite3 extends Database implements Driver
+class Sqlite3 extends Database implements DriverInterface
 {
     private array $createTableStatements = [
         'faqadminlog' => 'CREATE TABLE %sfaqadminlog (
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Database/Sqlsrv.php b/phpmyfaq/src/phpMyFAQ/Instance/Database/Sqlsrv.php
@@ -27,7 +27,7 @@
  *
  * @package phpMyFAQ\Instance\Database
  */
-class Sqlsrv extends Database implements Driver
+class Sqlsrv extends Database implements DriverInterface
 {
     private array $createTableStatements = [
         'faqadminlog' => 'CREATE TABLE %sfaqadminlog (
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Elasticsearch.php b/phpmyfaq/src/phpMyFAQ/Instance/Elasticsearch.php
@@ -1,9 +1,7 @@
 <?php
 
-declare(strict_types=1);
-
 /**
- * The phpMyFAQ instances basic Elasticsearch class.
+ * The phpMyFAQ instances a basic Elasticsearch class.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
@@ -17,6 +15,8 @@
  * @since     2015-12-25
  */
 
+declare(strict_types=1);
+
 namespace phpMyFAQ\Instance;
 
 use Elastic\Elasticsearch\Client;
@@ -261,7 +261,7 @@ public function bulkIndex(array $faqs): array
                 'category_id' => $faq['category_id'],
             ];
 
-            if (($i % 1000) == 0) {
+            if (($i % 1000) === 0) {
                 try {
                     $responses = $this->client->bulk($params);
                 } catch (ClientResponseException|ServerResponseException $e) {
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Main.php b/phpmyfaq/src/phpMyFAQ/Instance/Main.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * The main phpMyFAQ instances class for instance masters.
  *
@@ -17,6 +15,8 @@
  * @since     2012-03-31
  */
 
+declare(strict_types=1);
+
 namespace phpMyFAQ\Instance;
 
 use phpMyFAQ\Instance;
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/OpenSearch.php b/phpmyfaq/src/phpMyFAQ/Instance/OpenSearch.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * phpMyFAQ OpenSearch instance class.
  *
@@ -17,6 +15,8 @@
  * @since     2023-11-20
  */
 
+declare(strict_types=1);
+
 namespace phpMyFAQ\Instance;
 
 use Exception;
@@ -90,7 +90,7 @@ public function createIndex(): bool
     }
 
     /**
-     * Returns the basic phpMyFAQ index structure as raw array.
+     * Returns the basic phpMyFAQ index structure as a raw array.
      *
      * @return array<string, mixed>
      */
diff --git a/phpmyfaq/src/phpMyFAQ/Instance/Setup.php b/phpmyfaq/src/phpMyFAQ/Instance/Setup.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * The phpMyFAQ instances setup class.
  *
@@ -17,6 +15,8 @@
  * @since     2012-04-04
  */
 
+declare(strict_types=1);
+
 namespace phpMyFAQ\Instance;
 
 use phpMyFAQ\Configuration;
diff --git a/phpmyfaq/src/phpMyFAQ/Link/Util/TitleSlugifier.php b/phpmyfaq/src/phpMyFAQ/Link/Util/TitleSlugifier.php
@@ -97,22 +97,21 @@ public static function slug(string $title): string
         $itemTitle = trim($title);
         $itemTitle = Strings::strtolower($itemTitle);
         // replace apostrophe and slash with underscore
-        $itemTitle = str_replace(["'", '/', '&#39'], '_', $itemTitle);
+        $itemTitle = str_replace(["'", '/', '&#39'], replace: '_', subject: $itemTitle);
         // collapse multiple dashes to a space (will become '-')
         $itemTitle = Strings::preg_replace(self::REGEX_MULTI_DASH, ' ', $itemTitle);
         // replace single inner dashes with underscores (legacy: HD-Ready => hd_ready)
         $itemTitle = Strings::preg_replace(self::REGEX_INNER_DASH, '_', $itemTitle);
         // whitespace to '-'
         $itemTitle = Strings::preg_replace(self::REGEX_WHITESPACE, '-', $itemTitle);
         // strip punctuation
-        $itemTitle = str_replace(self::PUNCTUATION, '', $itemTitle);
+        $itemTitle = str_replace(self::PUNCTUATION, replace: '', subject: $itemTitle);
         // map umlauts and accents
         $itemTitle = str_replace(self::UMLAUTS, self::UMLAUTS_REPLACEMENTS, $itemTitle);
         // reduce multiple separators
         $itemTitle = Strings::preg_replace('/_{2,}/m', '_', $itemTitle);
         $itemTitle = Strings::preg_replace(self::REGEX_MULTI_DASH, '-', $itemTitle);
         // trim edge separators
-        $itemTitle = trim($itemTitle, '-_');
-        return $itemTitle;
+        return trim($itemTitle, characters: '-_');
     }
 }
diff --git a/phpmyfaq/src/phpMyFAQ/Mail/Builtin.php b/phpmyfaq/src/phpMyFAQ/Mail/Builtin.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * MUA (Mail User Agent) implementation using the PHP built-in mail() function.
  *
@@ -17,6 +15,8 @@
  * @since     2009-09-11
  */
 
+declare(strict_types=1);
+
 namespace phpMyFAQ\Mail;
 
 /**
@@ -41,8 +41,12 @@ public function send(string $recipients, array $headers, string $body): int
         unset($headers['Subject']);
 
         $sender = '';
-        if ('WIN' !== strtoupper(substr(PHP_OS, 0, 3)) && !ini_get('safe_mode') && isset($headers['Return-Path'])) {
-            $sender = str_replace(['<', '>'], '', $headers['Return-Path']);
+        if (
+            'WIN' !== strtoupper(substr(PHP_OS, offset: 0, length: 3))
+            && !ini_get('safe_mode')
+            && isset($headers['Return-Path'])
+        ) {
+            $sender = str_replace(['<', '>'], replace: '', subject: $headers['Return-Path']);
             unset($headers['Return-Path']);
         }
 
diff --git a/phpmyfaq/src/phpMyFAQ/Permission/MediumPermission.php b/phpmyfaq/src/phpMyFAQ/Permission/MediumPermission.php
@@ -270,7 +270,7 @@ public function getAllGroupsOptions(array $groups, CurrentUser $currentUser): st
             $options .= sprintf(
                 '<option value="%d" %s>%s</option>',
                 $allGroup,
-                in_array($allGroup, $groups) || isset($groups[0]) && $groups[0] === -1 ? 'selected' : '',
+                in_array($allGroup, $groups, strict: true) || isset($groups[0]) && $groups[0] === -1 ? 'selected' : '',
                 $this->getGroupName($allGroup),
             );
         }
diff --git a/phpmyfaq/src/phpMyFAQ/Strings/AbstractString.php b/phpmyfaq/src/phpMyFAQ/Strings/AbstractString.php
@@ -1,8 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
-// phpcs:ignoreFile
 /**
  * Abstract parent for the string wrapper classes.
  *
@@ -18,14 +15,16 @@
  * @since     2009-04-06
  */
 
+declare(strict_types=1);
+
 namespace phpMyFAQ\Strings;
 
 /**
  * Class StringsAbstract
  *
  * @package phpMyFAQ\Strings
  */
-abstract class StringsAbstract
+abstract class AbstractString
 {
     /**
      * Default encoding.
@@ -57,7 +56,7 @@ abstract class StringsAbstract
     public static function isUTF8(string $str): bool
     {
         if (function_exists('mb_detect_encoding')) {
-            return (bool) mb_detect_encoding($str, self::DEFAULT_ENCODING, true);
+            return (bool) mb_detect_encoding($str, self::DEFAULT_ENCODING, strict: true);
         }
 
         $regex =
diff --git a/phpmyfaq/src/phpMyFAQ/Strings/Mbstring.php b/phpmyfaq/src/phpMyFAQ/Strings/Mbstring.php
diff --git a/phpmyfaq/src/phpMyFAQ/Strings/StringBasic.php b/phpmyfaq/src/phpMyFAQ/Strings/StringBasic.php
diff --git a/tests/phpMyFAQ/Attachment/AbstractAttachmentTest.php b/tests/phpMyFAQ/Attachment/AbstractAttachmentTest.php
diff --git a/tests/phpMyFAQ/Controller/Api/AttachmentControllerTest.php b/tests/phpMyFAQ/Controller/Api/AttachmentControllerTest.php
diff --git a/tests/phpMyFAQ/Search/SearchResultSetTest.php b/tests/phpMyFAQ/Search/SearchResultSetTest.php

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function setUser(User $user): void`
`120`	`120`	`// check user rights, set them TRUE`
`121`	`121`	`$allUserRights = $user->perm->getAllUserRights($user->getUserId());`
`122`	`122`	`foreach ($allRights as $allRight) {`
`123`		`- if (!in_array($allRight['right_id'], $allUserRights, true)) {`
	`123`	`+ if (!in_array((int) $allRight['right_id'], $allUserRights, true)) {`
`124`	`124`	`continue;`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*`
`25`	`25`	`* @package phpMyFAQ\Instance\Database`
`26`	`26`	`*/`
`27`		`-interface Driver`
	`27`	`+interface DriverInterface`
`28`	`28`	`{`
`29`	`29`	`/**`
`30`	`30`	`* Executes all CREATE TABLE and CREATE INDEX statements.`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`* @package phpMyFAQ\Instance\Database`
`30`	`30`	`*/`
`31`		`-class Mysqli extends Database implements Driver`
	`31`	`+class Mysqli extends Database implements DriverInterface`
`32`	`32`	`{`
`33`	`33`	`private array $createTableStatements = [`
`34`	`34`	`'faqadminlog' => 'CREATE TABLE %sfaqadminlog (`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*`
`28`	`28`	`* @package phpMyFAQ\Instance\Database`
`29`	`29`	`*/`
`30`		`-class PdoPgsql extends Database implements Driver`
	`30`	`+class PdoPgsql extends Database implements DriverInterface`
`31`	`31`	`{`
`32`	`32`	`private array $createTableStatements = [`
`33`	`33`	`'faquser_user_id_seq' => 'CREATE SEQUENCE %sfaquser_user_id_seq START WITH 2',`