build: updated version strings to 4.2

Author: thorsten

CHANGELOG.md

@@ -1,11 +1,15 @@
-# phpMyFAQ 4.1
+# phpMyFAQ 4.2
 
-**Codename "Porus"**
+**Codename "Palaimon"**
 
 ## CHANGELOG
 
 This is a log of major user-visible changes in each phpMyFAQ release.
 
+### phpMyFAQ v4.2.0-dev - unreleased
+
+- n/a
+
 ### phpMyFAQ v4.1.0-RC - 2025-12-29
 
 - fixed security vulnerabilities (Thorsten)

docker-compose.yml

@@ -148,7 +148,7 @@ services:
       - pnpm
 
   pnpm:
-    image: node:22-alpine
+    image: node:24-alpine
     restart: 'no'
     command: sh -c "corepack enable && corepack prepare pnpm@latest --activate && pnpm install && pnpm build"
     working_dir: /app
@@ -195,7 +195,7 @@ services:
 
   elasticsearch:
     image: elasticsearch:8.16.5
-    container_name: phpmyfaq-41_elasticsearch-v8
+    container_name: phpmyfaq-42_elasticsearch-v8
     restart: always
     environment:
       - cluster.name=phpmyfaq-cluster

docs/update.md

@@ -1,29 +1,29 @@
 # 5. Updating phpMyFAQ
 
-First, please download the latest package of phpMyFAQ. Upgrading to phpMyFAQ 4.1 is possible from the following
+First, please download the latest package of phpMyFAQ. Upgrading to phpMyFAQ 4.2 is possible from the following
 versions:
 
-- phpMyFAQ 3.0.x
 - phpMyFAQ 3.1.x
 - phpMyFAQ 3.2.x
 - phpMyFAQ 4.0.x
 - phpMyFAQ 4.1.x
 
 If you're running an older version of phpMyFAQ than listed above, we recommend a new and fresh installation. If you need
-support for updating an old FAQ from the 1.x or 2.x series, [please email us](mailto:thorsten_AT_phpmyfaq_DOT_de).
+support for updating an old FAQ from the 1.x, 2.x, or 3.0 series, [please email us](mailto:thorsten_AT_phpmyfaq_DOT_de).
 
 Please note that the requirements of phpMyFAQ have to be fulfilled.
 
 ## Before you upgrade
 
 Please make sure that you're running at least PHP 8.3, otherwise the upgrade won't work.
 
-## Upgrading from phpMyFAQ 3.0.x
+## Upgrading from phpMyFAQ 3.1.x
 
-Upgrading from 3.0.x is a major upgrade.
-Your existing templates will not work with phpMyFAQ 4.1.
+Upgrading from 3.1.x is a major upgrade.
+Your existing templates will not work with phpMyFAQ 4.2.
 Please make a full backup before you run the upgrade!
 First, log in as admin into the admin section and enable the maintenance mode.
+(Configuration >> Edit Configuration >> Set FAQ in maintenance mode)
 Second, you have to delete all files **except**:
 
 - in the directory **config/**
@@ -40,10 +40,10 @@ URL in your browser:
 
 Click the button of the update script, your version will automatically be updated.
 
-## Upgrading from phpMyFAQ 3.1.x
+## Upgrading from phpMyFAQ 3.2.x
 
-Upgrading from 3.1.x is a major upgrade.
-Your existing templates will not work with phpMyFAQ 4.1.
+Upgrading from 3.2.x is a major upgrade.
+Your existing templates will not work with phpMyFAQ 4.2.
 Please make a full backup before you run the upgrade!
 First, log in as admin into the admin section and enable the maintenance mode.
 (Configuration >> Edit Configuration >> Set FAQ in maintenance mode)
@@ -52,6 +52,7 @@ Second, you have to delete all files **except**:
 - in the directory **config/**
     - keep the file **database.php**
     - only if using LDAP/ActiveDirectory support also keep the file **ldap.php**
+    - only if using EntraID support also keep the file **azure.php**
 - the directory **attachments/**
 - the directory **data/**
 - the directory **images/**
@@ -63,31 +64,25 @@ URL in your browser:
 
 Click the button of the update script, your version will automatically be updated.
 
-## Upgrading from phpMyFAQ 3.2.x
+## Upgrading from phpMyFAQ 4.0.x
+
+### Manual upgrade
 
-Upgrading from 3.2.x is a major upgrade.
-Your existing templates will not work with phpMyFAQ 4.1.
 Please make a full backup before you run the upgrade!
 First, log in as admin into the admin section and enable the maintenance mode.
 (Configuration >> Edit Configuration >> Set FAQ in maintenance mode)
 Second, you have to delete all files **except**:
 
-- in the directory **config/**
-    - keep the file **database.php**
-    - only if using LDAP/ActiveDirectory support also keep the file **ldap.php**
-    - only if using EntraID support also keep the file **azure.php**
-- the directory **attachments/**
-- the directory **data/**
-- the directory **images/**
+- all files in the directory **content/**
 
-Download the latest phpMyFAQ package and copy the contents into your existing FAQ directory, then open the following
+Download the latest phpMyFAQ package and copy the contents into your existing FAQ directory, the open the following
 URL in your browser:
 
 `http://www.example.com/faq/update`
 
 Click the button of the update script, your version will automatically be updated.
 
-## Upgrading from phpMyFAQ 4.0.x
+## Upgrading from phpMyFAQ 4.1.x
 
 ### Manual upgrade
 
@@ -105,7 +100,24 @@ URL in your browser:
 
 Click the button of the update script, your version will automatically be updated.
 
-## Upgrading from phpMyFAQ 4.1.x
+### Online update (Experimental feature)
+
+If you're running phpMyFAQ 4.0.0 or later, you can use the built-in online update feature.
+Log in as admin into the admin section and enable the maintenance mode.
+(Configuration >> Edit Configuration >> Set FAQ in maintenance mode)
+Then go to the "phpMyFAQ Update" page in the configuration section and click through the update wizard:
+
+1. Check for System Health: this checks if your system is ready for the upgrade
+2. Check for Updates: this checks if there is a new version of phpMyFAQ available
+3. Download of phpMyFAQ: this downloads the latest version of phpMyFAQ in the background, this can take some seconds
+4. Extracting phpMyFAQ: this extracts the downloaded archive, this can take a while
+5. Install downloaded package: first, it creates a backup of your current installation, then it copies the downloaded
+   files into your installation, and in the end, the database is updated
+
+Note:
+The online update feature is experimental and might not work in all environments.
+
+## Upgrading from phpMyFAQ 4.2.x
 
 ### Manual upgrade
 
@@ -140,7 +152,7 @@ Then go to the "phpMyFAQ Update" page in the configuration section and click thr
 Note:
 The online update feature is experimental and might not work in all environments.
 
-## Modifying templates for phpMyFAQ 4.1
+## Modifying templates for phpMyFAQ 4.2
 
 We recommend you take a look at the main [Bootstrap documentation](https://getbootstrap.com/).
 Please remember that the style sheets are written with [SCSS](https://sass-lang.com/).

mkdocs.yml

@@ -1,4 +1,4 @@
-site_name: phpMyFAQ v4.1
+site_name: phpMyFAQ v4.2
 theme:
   name: readthedocs
   highlightjs: true

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thorsten/phpmyfaq",
-  "version": "4.1.0-RC",
+  "version": "4.2.0-dev",
   "description": "phpMyFAQ",
   "repository": "git://github.com/thorsten/phpMyFAQ.git",
   "author": "Thorsten Rinne",

phpmyfaq/src/phpMyFAQ/Setup/AbstractSetup.php

@@ -40,11 +40,11 @@ public function checkMinimumPhpVersion(): bool
     }
 
     /**
-     * We only support updates from 3.0.0 and later.
+     * We only support updates from 3.1.0 and later.
      */
     public function checkMinimumUpdateVersion(string $version): bool
     {
-        return version_compare(version1: $version, version2: '3.0.0', operator: '>');
+        return version_compare(version1: $version, version2: '3.1.0', operator: '>');
     }
 
     /**

phpmyfaq/src/phpMyFAQ/Setup/Installer.php

@@ -268,7 +268,7 @@ class Installer extends Setup
         'main.enableUserTracking' => 'true',
         'main.metaDescription' => 'phpMyFAQ should be the answer for all questions in life',
         'main.metaPublisher' => '__PHPMYFAQ_PUBLISHER__',
-        'main.titleFAQ' => 'phpMyFAQ Codename Porus',
+        'main.titleFAQ' => 'phpMyFAQ Codename Palaimon',
         'main.enableWysiwygEditor' => 'true',
         'main.enableWysiwygEditorFrontend' => 'false',
         'main.enableMarkdownEditor' => 'false',

phpmyfaq/src/phpMyFAQ/Setup/Update.php

@@ -158,12 +158,6 @@ public function checkInitialRewriteBasePath(Request $request): bool
      */
     public function applyUpdates(): bool
     {
-        // 3.1 updates
-        $this->applyUpdates310Alpha();
-        $this->applyUpdates310Alpha3();
-        $this->applyUpdates310Beta();
-        $this->applyUpdates310RC();
-
         // 3.2 updates
         $this->applyUpdates320Alpha();
         $this->applyUpdates320Beta();
@@ -243,68 +237,6 @@ private function executeQueries(): void
         }
     }
 
-    private function applyUpdates310Alpha(): void
-    {
-        if (version_compare($this->version, '3.1.0-alpha', '<')) {
-            // Add is_visible flag for user data
-            if ('sqlite3' === Database::getType()) {
-                $this->queries[] = sprintf(
-                    'ALTER TABLE %sfaquserdata ADD COLUMN is_visible INT(1) DEFAULT 0',
-                    Database::getTablePrefix(),
-                );
-            } else {
-                $this->queries[] = sprintf(
-                    'ALTER TABLE %sfaquserdata ADD is_visible INTEGER DEFAULT 0',
-                    Database::getTablePrefix(),
-                );
-            }
-
-            // Remove RSS support
-            $this->configuration->delete('main.enableRssFeeds');
-
-            // Add API-related configuration
-            $this->configuration->add('api.enableAccess', true);
-            $this->configuration->add('api.apiClientToken', '');
-
-            // Add passlist for domains
-            $this->configuration->add('security.domainWhiteListForRegistrations', '');
-        }
-    }
-
-    private function applyUpdates310Alpha3(): void
-    {
-        if (version_compare($this->version, '3.1.0-alpha.3', '<')) {
-            // Add "Login with email address" configuration
-            $this->configuration->add('main.loginWithEmailAddress', false);
-        }
-    }
-
-    private function applyUpdates310Beta(): void
-    {
-        if (version_compare($this->version, '3.1.0-beta', '<')) {
-            $this->queries[] = match (Database::getType()) {
-                'mysqli' => sprintf(
-                    'CREATE TABLE %sfaqcategory_order
-                    (category_id int(11) NOT NULL, position int(11) NOT NULL, PRIMARY KEY (category_id))',
-                    Database::getTablePrefix(),
-                ),
-                'pgsql', 'sqlite3', 'sqlsrv' => sprintf(
-                    'CREATE TABLE %sfaqcategory_order
-                    (category_id INTEGER NOT NULL, position INTEGER NOT NULL, PRIMARY KEY (category_id))',
-                    Database::getTablePrefix(),
-                ),
-            };
-        }
-    }
-
-    private function applyUpdates310RC(): void
-    {
-        if (version_compare($this->version, '3.1.0-RC', '<')) {
-            $this->configuration->delete('records.autosaveActive');
-            $this->configuration->delete('records.autosaveSecs');
-        }
-    }
-
     private function applyUpdates320Alpha(): void
     {
         if (version_compare($this->version, '3.2.0-alpha', '<')) {

phpmyfaq/src/phpMyFAQ/Setup/UpdateRunner.php

@@ -249,7 +249,6 @@ private function withProgress(SymfonyStyle $io, callable $fn): bool
         };
 
         try {
-            /** @var bool $result */
             $result = (bool) $fn($setProgress);
         } finally {
             $progressBar->finish();

phpmyfaq/src/phpMyFAQ/System.php

@@ -44,7 +44,7 @@ class System
     /**
      * Minor version.
      */
-    private const int VERSION_MINOR = 1;
+    private const int VERSION_MINOR = 2;
 
     /**
      * Patch level.
@@ -54,7 +54,7 @@ class System
     /**
      * Pre-release version.
      */
-    private const string VERSION_PRE_RELEASE = 'RC';
+    private const string VERSION_PRE_RELEASE = 'dev';
 
     /**
      * API version.