[6.0] Upmerges - 2025-10-30

Merge pull request #46380 from Bodge-IT/upmerges/2025-10-29

Author: Bodge-IT

.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/workflows/ci.yml

@@ -134,7 +134,31 @@ jobs:
     strategy:
       matrix:
         php_version: ['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.3'
             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.3'
+            test_group: cmaria
+            db_engine: mysqli
+            db_host: maria
+            maria_version: '10.4'
           - php_version: '8.3'
             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

administrator/language/en-GB/com_installer.ini

@@ -192,9 +192,9 @@ COM_INSTALLER_MSG_WARNINGS_MEDMEMORYWARN="Potentially low PHP memory limit."
 COM_INSTALLER_MSG_WARNINGS_NONE="No warnings detected."
 COM_INSTALLER_MSG_WARNINGS_NOTCOMPLETE="<h1>Warning: Update Not Complete!</h1><p>The update is only partially complete. Please do the second update to complete the process.</p>"
 COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSET="The PHP temporary folder is not set."
-COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSETDESC="This folder is the folder that PHP uses to store an uploaded file before Joomla can access this file. Whilst the folder not being set isn't always a problem, if you are having issues with manifest files not being detected or uploaded files not being detected, setting this in your php.ini file might fix the issue."
+COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTSETDESC="This folder is the folder that PHP uses to store an uploaded file before Joomla can access this file. Whilst the folder not being set isn't always a problem, if you are having issues with manifest files not being detected or uploaded files not being detected, setting <code>upload_tmp_dir</code> in your php.ini file might fix the issue."
 COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLE="The PHP temporary folder is not writeable."
-COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC="This folder is not writeable by the Joomla! instance, which may cause issues when trying to upload extensions to Joomla. If you are having issues uploading extensions, check the '%s' and set it to be writeable and see if this fixes the issue."
+COM_INSTALLER_MSG_WARNINGS_PHPUPLOADNOTWRITEABLEDESC="This folder specified by <code>upload_tmp_dir</code> in your php.ini is not writeable by the Joomla! instance, which may cause issues when trying to upload extensions to Joomla. If you are having issues uploading extensions, check the '%s' and set it to be writeable and see if this fixes the issue."
 COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZE="Small PHP maximum POST size."
 COM_INSTALLER_MSG_WARNINGS_SMALLPOSTSIZEDESC="This is the maximum amount of data that can be sent via POST to the server. This includes form submissions for articles, media (images, videos) and extensions. This value is less than 16MB which may impact on uploading large extensions. This is set in the php.ini under post_max_size."
 COM_INSTALLER_MSG_WARNINGS_SMALLUPLOADSIZE="Maximum PHP file upload size is too small."

build/build.php

@@ -449,7 +449,6 @@ function capture_or_fail(string $command): string
     'package.json',
     'phpstan-baseline.neon',
     'phpstan.neon',
-    'phpunit-pgsql.xml.dist',
     'phpunit-windows.xml.dist',
     'phpunit.xml.dist',
     'plugins/sampledata/testing/language/en-GB/en-GB.plg_sampledata_testing.ini',