Merge branch '5.4-dev' into fix/fields-repeatable-table-th

Author: laoneo

.devcontainer/devcontainer.json

@@ -14,8 +14,13 @@
         "6080": {
             "label": "Cypress GUI",
             "onAutoForward": "silent"
+        },
+        "8025": {
+            "label": "Mailpit Web UI",
+            "onAutoForward": "openPreview"
         }
     },
+    "forwardPorts": [80, 443, 6080, 8025],
     "postCreateCommand": "bash ./.devcontainer/post-create.sh",
     "customizations": {
         "vscode": {

.devcontainer/docker-compose.yml

@@ -25,5 +25,11 @@ services:
     volumes:
       - "mysql-data:/var/lib/mysql"
 
+  mailpit:
+    image: axllent/mailpit:latest
+    restart: unless-stopped
+    ports:
+      - "8025:8025"
+
 volumes:
   mysql-data:

.devcontainer/post-create.sh

@@ -54,6 +54,12 @@ echo "✅ Joomla installed."
 echo "--> Applying development settings..."
 # Enable debug mode and maximum error reporting for easier troubleshooting.
 php cli/joomla.php config:set error_reporting=maximum
+# Configure mail settings for Mailpit
+php cli/joomla.php config:set mailer=smtp
+php cli/joomla.php config:set smtphost=mailpit
+php cli/joomla.php config:set smtpport=1025
+php cli/joomla.php config:set smtpauth=0
+php cli/joomla.php config:set smtpsecure=none
 echo "✅ Development settings applied."
 
 # --- 5. Install and Configure phpMyAdmin ---
@@ -148,6 +154,10 @@ DETAILS_FILE="${JOOMLA_ROOT}/codespace-details.txt"
     echo "  Username: $DB_USER"
     echo "  Password: $DB_PASS"
     echo ""
+    echo "Mailpit (Email Testing):"
+    echo "  URL: Open the 'Ports' tab, find 'Mailpit Web UI' (8025), and click the Globe icon"
+    echo "  All emails sent by Joomla will appear here for testing"
+    echo ""
     echo "Cypress E2E Testing:"
     echo "  Run interactive tests: npx cypress open"
     echo "  Run headless tests:   npx cypress run"

.github/CODEOWNERS

@@ -9,6 +9,7 @@ plugins/finder/*  @hackwar
 build/build.php  @rdeutz
 build/bump.php  @rdeutz
 build/deleted_file_check.php  @rdeutz
+.drone.yml  @rdeutz @hackwar
 
 # Core/Extension Install/Update Tools
 administrator/components/com_joomlaupdate/*  @rdeutz
@@ -19,9 +20,7 @@ libraries/src/Updater/*  @rdeutz
 .github/workflows/ci.yml  @rdeutz @hackwar @laoneo
 tests/*  @hackwar @laoneo
 tests/Unit/*  @rdeutz @laoneo
-.drone.yml  @rdeutz @hackwar @laoneo
 phpunit.xml.dist  @rdeutz @hackwar @laoneo
-phpunit-pgsql.xml.dist  @rdeutz @hackwar @laoneo
 phpunit-windows.xml.dist  @rdeutz @hackwar @laoneo
 
 # Workflow

.github/CONTRIBUTING.md

@@ -15,12 +15,11 @@ You are welcome to submit a contribution for review and possible inclusion in th
 Please be patient as not all items will be viewed or tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
 
 #### Branches
-Joomla 4.4 is in security maintenance mode, until 14th October 2025, which means it will only receive security fixes. Bug fixing PRs should be made to the `5.3-dev` branch. Merged bugfixes will be upmerged into the current branches. New features that do not break backwards compatibility should be made to the `5.4-dev` branch otherwise they should be made to the `6.0-dev` branch.
+Bug fixing PRs should be made to the `5.4-dev` branch. Merged bugfixes will be upmerged into the current branches. New features that do not break backwards compatibility should be made to the `6.1-dev`.
 
 
-| Branch | Purpose |
-| ------ | ------- |
-| 4.4-dev | Branch for the current 4.x Joomla version. Currently in security maintenance mode. |
-| 5.3-dev | Branch for the current 5.x Joomla version. Bugfix only for 5.x go into this branch. |
-| 5.4-dev | Branch for the next minor 5.x Joomla version. New features go into this branch. |
-| 6.0-dev | Branch for the next major Joomla version. New features that include a b/c break have to go into this branch. |
+| Branch  | Purpose                                                                                 |
+|---------|-----------------------------------------------------------------------------------------|
+| 5.4-dev | Branch for the current 5.x Joomla version.                                              |
+| 6.0-dev | Branch for the current 6.x Joomla version. Bugfixes only for 6.x go into this branch.   |
+| 6.1-dev | Branch for the next minor 6.x Joomla version. New features have to go into this branch. |

.github/workflows/ci.yml

@@ -134,7 +134,31 @@ jobs:
     strategy:
       matrix:
         php_version: ['8.1', '8.2', '8.3', '8.4']
-        config: ['phpunit.xml.dist', 'phpunit-pgsql.xml.dist']
+        config:
+          - my_version: '8.4'
+            engine: 'mysqli'
+            host: 'mysql'
+            user: 'joomla_ut'
+          - my_version: '8.0.13'
+            engine: 'mysqli'
+            host: 'mysql'
+            user: 'joomla_ut'
+          - maria_version: '12.0'
+            engine: 'mysqli'
+            host: 'maria'
+            user: 'joomla_ut'
+          - maria_version: '10.4'
+            engine: 'mysqli'
+            host: 'maria'
+            user: 'joomla_ut'
+          - pg_version: '12.0'
+            engine: 'pgsql'
+            host: 'postgres'
+            user: 'root'
+          - pg_version: '18.0'
+            engine: 'pgsql'
+            host: 'postgres'
+            user: 'root'
     steps:
       - uses: actions/checkout@v4
       - name: Start LDAP container
@@ -146,23 +170,36 @@ jobs:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
       - name: Run Integration tests
+        env:
+          JTEST_DB_ENGINE: ${{ matrix.config.engine }}
+          JTEST_DB_HOST: ${{ matrix.config.host }}
+          JTEST_DB_USER: ${{ matrix.config.user }}
+          JTEST_DB_NAME: test_joomla
+          JTEST_DB_PASSWORD: joomla_ut
         run: |
          sleep 3
-          ./libraries/vendor/bin/phpunit --testsuite Integration --configuration ${{ matrix.config }}
+          ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit.xml.dist
       - name: Stop LDAP container
         uses: docker://docker
         with:
           args: docker kill openldap
     services:
       mysql:
-        image: mariadb
+        image: mysql:${{ matrix.config.my_version || '8.4' }}
+        env:
+          MYSQL_USER: joomla_ut
+          MYSQL_PASSWORD: joomla_ut
+          MYSQL_ROOT_PASSWORD: joomla_ut
+          MYSQL_DATABASE: test_joomla
+      maria:
+        image: mariadb:${{ matrix.config.maria_version || '12.0' }}
         env:
           MARIADB_USER: joomla_ut
           MARIADB_PASSWORD: joomla_ut
           MARIADB_ROOT_PASSWORD: joomla_ut
           MARIADB_DATABASE: test_joomla
       postgres:
-        image: postgres:12-alpine
+        image: postgres:${{ matrix.config.pg_version || '18' }}-alpine
         env:
           POSTGRES_USER: root
           POSTGRES_PASSWORD: joomla_ut
@@ -270,18 +307,32 @@ jobs:
             test_group: cmysqlmax
             db_engine: mysqli
             db_host: mysql
+            my_version: '8.4'
           - php_version: '8.1'
             test_group: cmysql
             db_engine: mysqli
             db_host: mysql
+            my_version: '8.0.13'
+          - php_version: '8.4'
+            test_group: cmariamax
+            db_engine: mysqli
+            db_host: maria
+            maria_version: '12.0'
+          - php_version: '8.1'
+            test_group: cmaria
+            db_engine: mysqli
+            db_host: maria
+            maria_version: '10.4'
           - php_version: '8.1'
             test_group: cpostgres
             db_engine: pgsql
             db_host: postgres
+            pg_version: '12.0'
           - php_version: '8.4'
             test_group: cpostgresmax
             db_engine: pgsql
             db_host: postgres
+            pg_version: '18.0'
     env:
       JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
     steps:
@@ -313,14 +364,21 @@ jobs:
           if-no-files-found: ignore
     services:
       mysql:
-        image: mariadb
+        image: mysql:${{ matrix.config.my_version || '8.4' }}
+        env:
+          MYSQL_USER: joomla_ut
+          MYSQL_PASSWORD: joomla_ut
+          MYSQL_ROOT_PASSWORD: joomla_ut
+          MYSQL_DATABASE: test_joomla
+      maria:
+        image: mariadb:${{ matrix.config.maria_version || '12.0' }}
         env:
           MARIADB_USER: joomla_ut
           MARIADB_PASSWORD: joomla_ut
           MARIADB_ROOT_PASSWORD: joomla_ut
           MARIADB_DATABASE: test_joomla
       postgres:
-        image: postgres:12-alpine
+        image: postgres:${{ matrix.config.pg_version || '18' }}-alpine
         env:
           POSTGRES_USER: root
           POSTGRES_PASSWORD: joomla_ut

.github/workflows/create-translation-pull-request-v4.yml

@@ -718,6 +718,7 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/libraries/vendor/beberlei/assert/LICENSE',
             '/libraries/vendor/google/recaptcha/ARCHITECTURE.md',
             '/libraries/vendor/jfcherng/php-color-output/src/helpers.php',
+            '/libraries/vendor/joomla/filter/PATCHES.txt',
             '/libraries/vendor/joomla/ldap/LICENSE',
             '/libraries/vendor/joomla/ldap/src/LdapClient.php',
             '/libraries/vendor/laminas/laminas-zendframework-bridge/config/replacements.php',

administrator/components/com_admin/script.php

@@ -0,0 +1,2 @@
+-- Remove wrong unique constraint from "#__ucm_content" table
+ALTER TABLE "#__ucm_content" DROP CONSTRAINT "#__ucm_content_idx_type_alias_item_id" /** CAN FAIL **/;