build: always use the Mago version from composer.json

Author: thorsten

.github/workflows/build.yml

@@ -44,10 +44,8 @@ jobs:
       #- name: Lint with PHPCS
       #  run: phpmyfaq/src/libs/bin/phpcs --standard=PSR12 ./phpmyfaq/src/phpMyFAQ
 
-      - name: Setup Mago
+      - name: Setup Mago CLI
         uses: nhedger/setup-mago@v1
-        with:
-          version: latest
 
       - name: Run Mago
         run: |

composer.json

@@ -55,7 +55,7 @@
     "twig/twig": "^3.10"
   },
   "require-dev": {
-    "carthage-software/mago": "^1.0.0-beta.28",
+    "carthage-software/mago": "^1.0.0-beta.31",
     "doctrine/instantiator": "2.*",
     "mikey179/vfsstream": "^1.6",
     "phpdocumentor/reflection-docblock": "5.*",

composer.lock

@@ -20,7 +20,6 @@
 namespace phpMyFAQ\Administration;
 
 use phpMyFAQ\Configuration;
-use phpMyFAQ\Database;
 use phpMyFAQ\Entity\AdminLog as AdminLogEntity;
 use phpMyFAQ\User;
 use Symfony\Component\HttpFoundation\Request;
@@ -32,22 +31,24 @@
  */
 readonly class AdminLog
 {
+    /** @var AdminLogRepository */
+    private AdminLogRepository $repository;
+
     /**
      * Constructor.
      */
     public function __construct(
         private Configuration $configuration,
     ) {
+        $this->repository = new AdminLogRepository($this->configuration);
     }
 
     /**
      * Returns the number of entries.
      */
     public function getNumberOfEntries(): int
     {
-        $query = sprintf('SELECT id FROM %sfaqadminlog', Database::getTablePrefix());
-
-        return $this->configuration->getDb()->numRows($this->configuration->getDb()->query($query));
+        return $this->repository->getNumberOfEntries();
     }
 
     /**
@@ -56,27 +57,7 @@ public function getNumberOfEntries(): int
      */
     public function getAll(): array
     {
-        $data = [];
-
-        $query = sprintf(
-            'SELECT id, time, usr AS user, text, ip FROM %sfaqadminlog ORDER BY id DESC',
-            Database::getTablePrefix(),
-        );
-
-        $result = $this->configuration->getDb()->query($query);
-
-        while ($row = $this->configuration->getDb()->fetchObject($result)) {
-            $adminLog = new AdminLogEntity();
-            $adminLog
-                ->setId($row->id)
-                ->setTime($row->time)
-                ->setUserId($row->user)
-                ->setText($row->text)
-                ->setIp($row->ip);
-            $data[$row->id] = $adminLog;
-        }
-
-        return $data;
+        return $this->repository->getAll();
     }
 
     /**
@@ -87,35 +68,20 @@ public function getAll(): array
      */
     public function log(User $user, string $logText = ''): bool
     {
-        if ($this->configuration->get('main.enableAdminLog')) {
-            $request = Request::createFromGlobals();
-            $query = sprintf(
-                "INSERT INTO %sfaqadminlog (id, time, usr, text, ip) VALUES (%d, %d, %d, '%s', '%s')",
-                Database::getTablePrefix(),
-                $this->configuration->getDb()->nextId(Database::getTablePrefix() . 'faqadminlog', 'id'),
-                $request->server->get('REQUEST_TIME'),
-                $user->getUserId(),
-                $this->configuration->getDb()->escape(nl2br($logText)),
-                $this->configuration->getDb()->escape($request->getClientIp()),
-            );
-
-            return (bool) $this->configuration->getDb()->query($query);
+        if (!$this->configuration->get('main.enableAdminLog')) {
+            return false; // early return, avoids else
         }
 
-        return false;
+        $request = Request::createFromGlobals();
+        return $this->repository->add($user, $logText, $request);
     }
 
     /**
      * Deletes logging data older than 30 days.
      */
     public function delete(): bool
     {
-        $query = sprintf(
-            'DELETE FROM %sfaqadminlog WHERE time < %d',
-            Database::getTablePrefix(),
-            Request::createFromGlobals()->server->get('REQUEST_TIME') - (30 * 86400),
-        );
-
-        return (bool) $this->configuration->getDb()->query($query);
+        $timestamp = (int) Request::createFromGlobals()->server->get('REQUEST_TIME') - (30 * 86400);
+        return $this->repository->deleteOlderThan($timestamp);
     }
 }

phpmyfaq/src/phpMyFAQ/Administration/AdminLog.php

@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * AdminLog Repository.
+ *
+ * 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
+ * obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * @package   phpMyFAQ
+ * @author    Thorsten Rinne <[email protected]>
+ * @copyright 2025 phpMyFAQ Team
+ * @license   https://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+ * @link      https://www.phpmyfaq.de
+ * @since     2025-10-16
+ */
+
+declare(strict_types=1);
+
+namespace phpMyFAQ\Administration;
+
+use phpMyFAQ\Configuration;
+use phpMyFAQ\Database;
+use phpMyFAQ\Entity\AdminLog as AdminLogEntity;
+use phpMyFAQ\User;
+use Symfony\Component\HttpFoundation\Request;
+
+readonly class AdminLogRepository
+{
+    public function __construct(
+        private Configuration $configuration,
+    ) {
+    }
+
+    public function getNumberOfEntries(): int
+    {
+        $query = sprintf('SELECT id FROM %sfaqadminlog', Database::getTablePrefix());
+
+        return $this->configuration->getDb()->numRows($this->configuration->getDb()->query($query));
+    }
+
+    /**
+     * @return array<int, AdminLogEntity>
+     */
+    public function getAll(): array
+    {
+        $data = [];
+
+        $query = sprintf(
+            'SELECT id, time, usr AS user, text, ip FROM %sfaqadminlog ORDER BY id DESC',
+            Database::getTablePrefix(),
+        );
+
+        $result = $this->configuration->getDb()->query($query);
+
+        while ($row = $this->configuration->getDb()->fetchObject($result)) {
+            $adminLog = new AdminLogEntity();
+            $adminLog
+                ->setId($row->id)
+                ->setTime($row->time)
+                ->setUserId($row->user)
+                ->setText($row->text)
+                ->setIp($row->ip);
+            $data[$row->id] = $adminLog;
+        }
+
+        return $data;
+    }
+
+    public function add(User $user, string $logText, Request $request): bool
+    {
+        $table = Database::getTablePrefix() . 'faqadminlog';
+        $id = $this->configuration->getDb()->nextId($table, 'id');
+        $time = (int) $request->server->get('REQUEST_TIME');
+        $userId = $user->getUserId();
+        $text = $this->configuration->getDb()->escape(nl2br($logText));
+        $ip = $this->configuration->getDb()->escape((string) $request->getClientIp());
+
+        $query = strtr("INSERT INTO table: (id, time, usr, text, ip) VALUES (id:, time:, userId:, 'text:', 'ip:')", [
+            'table:' => $table,
+            'id:' => (string) $id,
+            'time:' => (string) $time,
+            'userId:' => (string) $userId,
+            'text:' => $text,
+            'ip:' => $ip,
+        ]);
+
+        return (bool) $this->configuration->getDb()->query($query);
+    }
+
+    public function deleteOlderThan(int $timestamp): bool
+    {
+        $table = Database::getTablePrefix() . 'faqadminlog';
+        $query = strtr('DELETE FROM table: WHERE time < ts:', [
+            'table:' => $table,
+            'ts:' => (string) $timestamp,
+        ]);
+
+        return (bool) $this->configuration->getDb()->query($query);
+    }
+}