Merge pull request #8 from mambax7/master

mambax7 · web-flow · commit f5fa52fd3c22 · 2026-04-28T05:23:50.000-04:00
version updates, cosmetics
diff --git a/apps/docs-27/astro.config.mjs b/apps/docs-27/astro.config.mjs
@@ -388,7 +388,7 @@ export default defineConfig({
 				{
 					label: 'Migration',
 					items: [
-						{ slug: 'migration/from-2-6' },
+						{ slug: 'migration/from-2-5' },
 					],
 				},
 
diff --git a/apps/docs-27/src/content/docs/contributing/adrs/adr-006.md b/apps/docs-27/src/content/docs/contributing/adrs/adr-006.md
@@ -11,7 +11,7 @@ description: "Architecture Decision Record for fine-grained module permission co
 
 ## Status
 
-**Accepted** - Implemented in XOOPS 2.5.x and extended in 2026
+**Accepted** - Implemented in XOOPS 2.5.x and extended in XOOPS 4.0
 
 ---
 
diff --git a/apps/docs-27/src/content/docs/contributing/guidelines/issue-reporting.md b/apps/docs-27/src/content/docs/contributing/guidelines/issue-reporting.md
@@ -100,7 +100,7 @@ What actually happens.
 
 ## Environment
 - XOOPS Version: X.Y.Z
-- PHP Version: 7.4/8.0/8.1
+- PHP Version: 8.2/8.3/8.4
 - Database: MySQL/MariaDB version
 - Operating System: Windows/macOS/Linux
 - Browser: Chrome/Firefox/Safari
@@ -278,7 +278,7 @@ Environment:
 ✅ Add two-factor authentication support
 ✅ Form validation not preventing SQL injection in name field
 ✅ Improve performance of user list query
-✅ Update installation documentation for PHP 8.1
+✅ Update installation documentation for PHP 8.2
 ```
 
 ### Poor Titles
@@ -418,7 +418,7 @@ Error: "SQL Error - Unknown column 'deleted_at' in ON clause"
 
 ## Environment
 - XOOPS Version: 2.7.0
-- PHP Version: 8.1.5
+- PHP Version: 8.2.0
 - Database: MySQL 8.0.32 with STRICT_TRANS_TABLES
 - Operating System: Ubuntu 22.04
 - Browser: Firefox 120
diff --git a/apps/docs-27/src/content/docs/core-concepts/database/index.md b/apps/docs-27/src/content/docs/core-concepts/database/index.md
@@ -10,7 +10,7 @@ description: "Comprehensive guide to XOOPS database abstraction, XoopsObject, ha
 > Understanding XOOPS database abstraction, object persistence, and query building.
 
 :::tip[Future-Proof Your Data Access]
-The handler/Criteria pattern works in both versions. To prepare for 2026, consider wrapping handlers in [Repository classes](../../03-Module-Development/Patterns/Repository-Pattern.md) for better testability. See [Choosing a Data Access Pattern](../../03-Module-Development/Choosing-Data-Access-Pattern.md).
+The handler/Criteria pattern works in both versions. To prepare for XOOPS 4.0, consider wrapping handlers in [Repository classes](../../03-Module-Development/Patterns/Repository-Pattern.md) for better testability. See [Choosing a Data Access Pattern](../../03-Module-Development/Choosing-Data-Access-Pattern.md).
 :::
 
 ---
diff --git a/apps/docs-27/src/content/docs/core-concepts/dependency-injection.md b/apps/docs-27/src/content/docs/core-concepts/dependency-injection.md
@@ -7,7 +7,7 @@ title: "Dependency Injection in XOOPS"
 |---------|-------------|------------|
 | Manual DI (constructor injection) | ✅ Available | ✅ Available |
 | PSR-11 Container | ❌ Not built-in | ✅ Native support |
-| `\Xmf\Module\Helper::getContainer()` | ❌ 2026 only | ✅ Available |
+| `\Xmf\Module\Helper::getContainer()` | ❌ 4.0 only | ✅ Available |
 
 In **XOOPS 2.5.x**, use manual constructor injection (passing dependencies explicitly). The PSR-11 container examples below are for **XOOPS 4.0**.
 :::
diff --git a/apps/docs-27/src/content/docs/core-concepts/event-system.md b/apps/docs-27/src/content/docs/core-concepts/event-system.md
@@ -14,7 +14,7 @@ See [Choosing an Event System](Choosing-Event-System.md) for a decision tree wit
 | **Preload System** | ✅ XOOPS 2.5.x (current) | Hook into core events via `class/Preload.php` |
 | **PSR-14 Event Dispatcher** | 🚧 XOOPS 4.0 (future) | Modern event dispatching with typed events |
 
-**For XOOPS 2.5.x modules**, use the [Preload System](#preload-system-legacy) section below. The PSR-14 section is for future 2026 development.
+**For XOOPS 2.5.x modules**, use the [Preload System](#preload-system-legacy) section below. The PSR-14 section is for XOOPS 4.0 development.
 :::
 
 ## Overview
diff --git a/apps/docs-27/src/content/docs/getting-started/configure-email.md b/apps/docs-27/src/content/docs/getting-started/configure-email.md
@@ -1,5 +1,5 @@
 ---
-title: "Configure Emai​l"
+title: "Configure Email"
 ---
 
 ![XOOPS Email Configuration](/xoops-docs/2.7/img/installation/xoops-04-email-setup.png)
diff --git a/apps/docs-27/src/content/docs/installation.md b/apps/docs-27/src/content/docs/installation.md
diff --git a/apps/docs-27/src/content/docs/installation/requirements.md b/apps/docs-27/src/content/docs/installation/requirements.md
@@ -1,5 +1,5 @@
 ---
-title: "Requirements​"
+title: "Requirements"
 ---
 
 ## Software Environment (the Stack)
diff --git a/apps/docs-27/src/content/docs/installation/upgrade/step-01.md b/apps/docs-27/src/content/docs/installation/upgrade/step-01.md
@@ -1,5 +1,5 @@
 ---
-title: "Preparations for Upgrade​"
+title: "Preparations for Upgrade"
 ---
 
 ## Turn Site Off
diff --git a/apps/docs-27/src/content/docs/installation/upgrade/step-02.md b/apps/docs-27/src/content/docs/installation/upgrade/step-02.md
@@ -1,5 +1,5 @@
 ---
-title: "Running Upgrade​"
+title: "Running Upgrade"
 ---
 
 Before running the main upgrader, make sure you have completed the [Preflight Check](preflight.md). The upgrade UI requires preflight to be run at least once and will direct you there if you have not.
diff --git a/apps/docs-27/src/content/docs/installation/upgrade/step-03.md b/apps/docs-27/src/content/docs/installation/upgrade/step-03.md
@@ -1,5 +1,5 @@
 ---
-title: "Troubleshooting​"
+title: "Troubleshooting"
 ---
 
 ## Smarty 4 Template Errors
diff --git a/apps/docs-27/src/content/docs/installation/upgrade/step-04.md b/apps/docs-27/src/content/docs/installation/upgrade/step-04.md
@@ -1,5 +1,5 @@
 ---
-title: "​After the Upgrade​"
+title: "After the Upgrade"
 ---
 
 ## Update the System Module
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-01.md b/apps/docs-27/src/content/docs/installation/wizard/step-01.md
@@ -1,5 +1,5 @@
 ---
-title: "Language Selection​"
+title: "Language Selection"
 ---
 
 The main XOOPS distribution comes with English support. Support for additional locales is supplied by [XOOPS Local support sites](https://xoops.org/modules/xoopspartners/). This support can come in the form of a customized distribution, or additional files to add to the main distribution.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-02.md b/apps/docs-27/src/content/docs/installation/wizard/step-02.md
@@ -1,5 +1,5 @@
 ---
-title: "Welcome​"
+title: "Welcome"
 ---
 
 The _Welcome to the XOOPS Installation Wizard_ briefly covers the requirements for XOOPS.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-03.md b/apps/docs-27/src/content/docs/installation/wizard/step-03.md
@@ -1,5 +1,5 @@
 ---
-title: "​Configuration Check​"
+title: "Configuration Check"
 ---
 
 _Checking your server configuration_ is a review of the environment the installer is running in.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-04.md b/apps/docs-27/src/content/docs/installation/wizard/step-04.md
@@ -1,5 +1,5 @@
 ---
-title: "​Path Setting​"
+title: "Path Setting"
 ---
 
 This page collects the information about the file system and web address that XOOPS needs to operate. The installer will attempt to guess this information based on the URL you are using to access it, and the locations of the running PHP scripts.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-05.md b/apps/docs-27/src/content/docs/installation/wizard/step-05.md
@@ -1,5 +1,5 @@
 ---
-title: "Database Connection​"
+title: "Database Connection"
 ---
 
 This page collects the information about about the database user account that XOOPS will use.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-06.md b/apps/docs-27/src/content/docs/installation/wizard/step-06.md
@@ -1,5 +1,5 @@
 ---
-title: "Database Configuration​"
+title: "Database Configuration"
 ---
 
 This page collects the information about the database that XOOPS will use.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-07.md b/apps/docs-27/src/content/docs/installation/wizard/step-07.md
@@ -1,5 +1,5 @@
 ---
-title: "Save Configuration​"
+title: "Save Configuration"
 ---
 
 This page displays the results of saving the configuration information you have entered up to this point.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-08.md b/apps/docs-27/src/content/docs/installation/wizard/step-08.md
@@ -1,5 +1,5 @@
 ---
-title: "Table Creation​"
+title: "Table Creation"
 ---
 
 This page displays the results of creating the XOOPS tables in the database.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-09.md b/apps/docs-27/src/content/docs/installation/wizard/step-09.md
@@ -1,5 +1,5 @@
 ---
-title: "Initial Settings​"
+title: "Initial Settings"
 ---
 
 This page collects the information used to create the primary Administrator (AKA Webmaster) account.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-10.md b/apps/docs-27/src/content/docs/installation/wizard/step-10.md
@@ -1,5 +1,5 @@
 ---
-title: "​Data Insertion​"
+title: "Data Insertion"
 ---
 
 This page displays the results of creating the XOOPS tables in the database.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-11.md b/apps/docs-27/src/content/docs/installation/wizard/step-11.md
@@ -1,5 +1,5 @@
 ---
-title: "Site Configuration​"
+title: "Site Configuration"
 ---
 
 This page collects the information used to set the intial state of your new XOOPS site. This includes things like titles and HTML meta tag values.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-12.md b/apps/docs-27/src/content/docs/installation/wizard/step-12.md
@@ -1,5 +1,5 @@
 ---
-title: "Select Theme​"
+title: "Select Theme"
 ---
 
 This page collects your choice for the initial theme for your new site. Themes control the visual character of your site. Themes may be changed at any time, if desired.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-13.md b/apps/docs-27/src/content/docs/installation/wizard/step-13.md
@@ -1,5 +1,5 @@
 ---
-title: "Modules Installation​"
+title: "Modules Installation"
 ---
 
 This page collects your choice for the modules to install in your new site. Modules may be added or removed at any time, if desired.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-14.md b/apps/docs-27/src/content/docs/installation/wizard/step-14.md
@@ -1,5 +1,5 @@
 ---
-title: "​Welcome​"
+title: "Welcome"
 ---
 
 The _Welcome to your XOOPS site_ briefly covers some available XOOPS resources and offers a few suggestions for managing your site.
diff --git a/apps/docs-27/src/content/docs/installation/wizard/step-15.md b/apps/docs-27/src/content/docs/installation/wizard/step-15.md
@@ -1,5 +1,5 @@
 ---
-title: "Cleanup​"
+title: "Cleanup"
 ---
 
 For security purposes, you should remove the _install_ directory from your site. The installer will have renamed the directory to _installremove_ followed by some lengthy random string.
diff --git a/apps/docs-27/src/content/docs/module-guide/patterns/domain-model.md b/apps/docs-27/src/content/docs/module-guide/patterns/domain-model.md
@@ -173,7 +173,7 @@ final class ArticlePublishedEvent
 
 ## Enums for Status
 
-Use PHP 8.1+ enums for type-safe status values:
+Use PHP 8.2+ enums for type-safe status values:
 
 ```php
 enum ArticleStatus: string
diff --git a/apps/docs-27/src/content/docs/module-guide/patterns/repository.md b/apps/docs-27/src/content/docs/module-guide/patterns/repository.md
@@ -18,7 +18,7 @@ The Repository pattern **works in both XOOPS 2.5.x and XOOPS 4.0.x**. In 2.5.x,
 | Repository wrapper | ✅ Recommended | ✅ Native pattern |
 | Testing with mocks | ✅ With manual DI | ✅ Container autowiring |
 
-**Start with Repository pattern today** to prepare your modules for easier 2026 migration.
+**Start with Repository pattern today** to prepare your modules for XOOPS 4.0 migration.
 :::
 
 The Repository Pattern is a data access pattern that abstracts database operations, providing a clean interface for accessing data. It acts as a middleman between the business logic and data mapping layers.
diff --git a/apps/docs-27/src/content/docs/xmf/index.md b/apps/docs-27/src/content/docs/xmf/index.md
@@ -6,7 +6,7 @@ description: "The XOOPS Module Framework - A comprehensive library for modern XO
 <span class="version-badge version-25x">2.5.x ✅</span> <span class="version-badge version-40x">4.0.x ✅</span>
 
 :::tip[The Bridge to Modern XOOPS]
-XMF works in **both XOOPS 2.5.x and XOOPS 4.0.x**. It's the recommended way to modernize your modules today while preparing for 2026. XMF provides PSR-4 autoloading, namespaces, and helpers that smooth the transition.
+XMF works in **both XOOPS 2.5.x and XOOPS 4.0.x**. It's the recommended way to modernize your modules today while preparing for XOOPS 4.0. XMF provides PSR-4 autoloading, namespaces, and helpers that smooth the transition.
 :::
 
 The **XOOPS Module Framework (XMF)** is a powerful library designed to simplify and standardize XOOPS module development. XMF provides modern PHP practices including namespaces, autoloading, and a comprehensive set of helper classes that reduce boilerplate code and improve maintainability.
diff --git a/apps/docs-4x/src/content/docs/implementation/module-json.md b/apps/docs-4x/src/content/docs/implementation/module-json.md
@@ -68,7 +68,7 @@ modules/
     "name": "mymodule",
     "version": "1.0.0",
     "xoops": {
-        "min": "2026.1"
+        "min": "4.0"
     }
 }
 ```
@@ -102,9 +102,9 @@ modules/
     },
 
     "xoops": {
-        "min": "2026.1",
+        "min": "4.0",
         "max": null,
-        "php": ">=8.2",
+        "php": ">=8.4",
         "extensions": ["pdo", "json", "mbstring"],
         "category": "content"
     },
@@ -421,9 +421,9 @@ XOOPS compatibility requirements.
 ```json
 {
     "xoops": {
-        "min": "2026.1",
-        "max": "2026.99",
-        "php": ">=8.2",
+        "min": "4.0",
+        "max": "4.99",
+        "php": ">=8.4",
         "extensions": ["pdo", "json"],
         "category": "content"
     }
@@ -771,8 +771,8 @@ flowchart LR
 ```json
 {
     "xoops": {
-        "min": "2026.1",
-        "php": ">=8.2",
+        "min": "4.0",
+        "php": ">=8.4",
         "extensions": ["pdo_mysql", "json", "mbstring", "gd"]
     }
 }
diff --git a/apps/docs-4x/src/content/docs/implementation/xmf-components.md b/apps/docs-4x/src/content/docs/implementation/xmf-components.md
@@ -283,7 +283,7 @@ $slug = Slug::create('مرحبا');
 echo $slug; // "mrhba"
 
 // Mixed content
-$slug = Slug::create('PHP 8.3 新機能');
+$slug = Slug::create('PHP 8.4 新機能');
 echo $slug; // "php-8-3-xin-ji-neng"
 ```
 
diff --git a/apps/docs-4x/src/content/docs/index.mdx b/apps/docs-4x/src/content/docs/index.mdx
diff --git a/apps/docs-4x/src/content/docs/migration/from-2-5.md b/apps/docs-4x/src/content/docs/migration/from-2-5.md
diff --git a/apps/docs-4x/src/content/docs/migration/modules.md b/apps/docs-4x/src/content/docs/migration/modules.md
diff --git a/apps/docs-4x/src/content/docs/migration/php-8.md b/apps/docs-4x/src/content/docs/migration/php-8.md
diff --git a/apps/docs-4x/src/content/docs/module-guide/getting-started.md b/apps/docs-4x/src/content/docs/module-guide/getting-started.md
diff --git a/apps/docs-4x/src/content/docs/module-guide/introduction.md b/apps/docs-4x/src/content/docs/module-guide/introduction.md
diff --git a/apps/docs-4x/src/content/docs/psr-standards/index.md b/apps/docs-4x/src/content/docs/psr-standards/index.md
diff --git a/apps/docs-4x/src/content/docs/psr-standards/psr-4.md b/apps/docs-4x/src/content/docs/psr-standards/psr-4.md
diff --git a/apps/docs-4x/src/content/docs/quick-start.md b/apps/docs-4x/src/content/docs/quick-start.md
diff --git a/apps/docs-4x/src/content/docs/roadmap/index.md b/apps/docs-4x/src/content/docs/roadmap/index.md
diff --git a/apps/docs-4x/src/content/docs/roadmap/specification.md b/apps/docs-4x/src/content/docs/roadmap/specification.md
diff --git a/apps/docs-4x/src/content/docs/roadmap/vision.md b/apps/docs-4x/src/content/docs/roadmap/vision.md
diff --git a/apps/docs-4x/src/content/docs/tools/ci.md b/apps/docs-4x/src/content/docs/tools/ci.md
diff --git a/apps/docs-4x/src/content/docs/tools/module-generator.md b/apps/docs-4x/src/content/docs/tools/module-generator.md
diff --git a/apps/docs-4x/src/content/docs/whats-new.md b/apps/docs-4x/src/content/docs/whats-new.md

Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ export default defineConfig({`
`388`	`388`	`{`
`389`	`389`	`label: 'Migration',`
`390`	`390`	`items: [`
`391`		`- { slug: 'migration/from-2-6' },`
	`391`	`+ { slug: 'migration/from-2-5' },`
`392`	`392`	`],`
`393`	`393`	`},`
`394`	`394`