Upmerges 2026-02-27

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,8 +18,8 @@ Pull Request for Issue # .
 
 ### Link to documentations
 Please select:
-- [ ] Documentation link for docs.joomla.org: <link>
-- [ ] No documentation changes for docs.joomla.org needed
+- [ ] Documentation link for guide.joomla.org: <link>
+- [ ] No documentation changes for guide.joomla.org needed
 
 - [ ] Pull Request link for manual.joomla.org: <link>
 - [ ] No documentation changes for manual.joomla.org needed

.github/workflows/ci.yml

@@ -20,6 +20,11 @@ jobs:
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache@v4
+        id: cache-webauthn
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Install PHP dependencies
         if: steps.cache-php.outputs.cache-hit != 'true'
         run: |
@@ -49,6 +54,10 @@ jobs:
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@v4
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Build assets
         if: steps.cache-assets.outputs.cache-hit != 'true'
         run: npm ci --unsafe-perm
@@ -67,6 +76,10 @@ jobs:
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@v4
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Check PHP code style
         env:
           PHP_CS_FIXER_IGNORE_ENV: true
@@ -105,6 +118,10 @@ jobs:
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@v4
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Run PHPstan
         run: |
           ./libraries/vendor/bin/phpstan --error-format=github
@@ -122,7 +139,11 @@ jobs:
       - uses: actions/cache/restore@v4
         with:
           path: libraries/vendor
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@v4
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Run Unit tests
         run: ./libraries/vendor/bin/phpunit --testsuite Unit
 
@@ -168,7 +189,11 @@ jobs:
       - uses: actions/cache/restore@v4
         with:
           path: libraries/vendor
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@v4
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Run Integration tests
         env:
           JTEST_DB_ENGINE: ${{ matrix.config.engine }}
@@ -218,7 +243,12 @@ jobs:
         id: cache-php-windows
         with:
           path: libraries/vendor
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@v4
+        id: cache-webauthn-windows
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -243,7 +273,11 @@ jobs:
       - uses: actions/cache/restore@v4
         with:
           path: libraries/vendor
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@v4
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - uses: shogo82148/actions-setup-mysql@v1
         with:
           mysql-version: "mariadb-10.4"
@@ -341,6 +375,10 @@ jobs:
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@v4
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - uses: actions/cache/restore@v4
         with:
           path: |

.github/workflows/clean-cache.yml

@@ -0,0 +1,29 @@
+name: Cleanup github runner caches on closed pull requests
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - name: Cleanup
+        run: |
+          echo "Fetching list of cache keys"
+          cacheKeysForPR=$(gh cache list --ref $BRANCH --limit 100 --json id --jq '.[].id')
+
+          ## Setting this to not fail the workflow while deleting cache keys.
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh cache delete $cacheKey
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
+          BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge

administrator/components/com_actionlogs/src/Plugin/ActionLogPlugin.php

@@ -71,15 +71,15 @@ protected function addLog($messages, $messageLanguageKey, $context, $userId = nu
         $user = $app->getIdentity();
 
         foreach ($messages as $index => $message) {
-            if (!\array_key_exists('userid', $message)) {
+            if (!\array_key_exists('userid', $message) && $user) {
                 $message['userid'] = $user->id;
             }
 
-            if (!\array_key_exists('username', $message)) {
+            if (!\array_key_exists('username', $message) && $user) {
                 $message['username'] = $user->username;
             }
 
-            if (!\array_key_exists('accountlink', $message)) {
+            if (!\array_key_exists('accountlink', $message) && $user) {
                 $message['accountlink'] = 'index.php?option=com_users&task=user.edit&id=' . $user->id;
             }
 

administrator/components/com_admin/script.php

@@ -920,6 +920,9 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/media/vendor/tinymce/langs/bg.js',
             '/media/vendor/tinymce/langs/bg.min.js',
             '/media/vendor/tinymce/langs/bg.min.js.gz',
+            '/media/vendor/tinymce/langs/bs.js',
+            '/media/vendor/tinymce/langs/bs.min.js',
+            '/media/vendor/tinymce/langs/bs.min.js.gz',
             '/media/vendor/tinymce/langs/fo.js',
             '/media/vendor/tinymce/langs/fo.min.js',
             '/media/vendor/tinymce/langs/fo.min.js.gz',
@@ -1048,6 +1051,43 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/libraries/vendor/webmozart/assert/src/Assert.php',
             '/libraries/vendor/webmozart/assert/src/InvalidArgumentException.php',
             '/libraries/vendor/webmozart/assert/src/Mixin.php',
+            // From 6.1.0-alpha2 to 6.1.0-alpha3
+            '/build.xml',
+            // From 6.0.2 to 6.0.3
+            '/libraries/vendor/symfony/http-client-contracts/Test/Fixtures/web/index.php',
+            '/libraries/vendor/symfony/http-client-contracts/Test/HttpClientTestCase.php',
+            '/libraries/vendor/symfony/http-client-contracts/Test/TestHttpServer.php',
+            '/libraries/vendor/symfony/http-client/Test/HarFileResponseFactory.php',
+            '/libraries/vendor/symfony/service-contracts/Test/ServiceLocatorTest.php',
+            '/libraries/vendor/symfony/service-contracts/Test/ServiceLocatorTestCase.php',
+            '/libraries/vendor/symfony/translation-contracts/Test/TranslatorTest.php',
+            '/libraries/vendor/symfony/validator/Test/ConstraintValidatorTestCase.php',
+            '/libraries/vendor/symfony/var-dumper/Test/VarDumperTestTrait.php',
+            // From 6.1.0-alpha3 to 6.1.0-beta1
+            '/media/vendor/tinymce/langs/cy.js',
+            '/media/vendor/tinymce/langs/cy.min.js',
+            '/media/vendor/tinymce/langs/cy.min.js.gz',
+            '/media/vendor/tinymce/langs/dv.js',
+            '/media/vendor/tinymce/langs/dv.min.js',
+            '/media/vendor/tinymce/langs/dv.min.js.gz',
+            '/media/vendor/tinymce/langs/ga.js',
+            '/media/vendor/tinymce/langs/ga.min.js',
+            '/media/vendor/tinymce/langs/ga.min.js.gz',
+            '/media/vendor/tinymce/langs/ku.js',
+            '/media/vendor/tinymce/langs/ku.min.js',
+            '/media/vendor/tinymce/langs/ku.min.js.gz',
+            '/media/vendor/tinymce/langs/ky.js',
+            '/media/vendor/tinymce/langs/ky.min.js',
+            '/media/vendor/tinymce/langs/ky.min.js.gz',
+            '/media/vendor/tinymce/langs/sq.js',
+            '/media/vendor/tinymce/langs/sq.min.js',
+            '/media/vendor/tinymce/langs/sq.min.js.gz',
+            '/media/vendor/tinymce/langs/uz.js',
+            '/media/vendor/tinymce/langs/uz.min.js',
+            '/media/vendor/tinymce/langs/uz.min.js.gz',
+            '/media/vendor/tinymce/langs/zh-SG.js',
+            '/media/vendor/tinymce/langs/zh-SG.min.js',
+            '/media/vendor/tinymce/langs/zh-SG.min.js.gz',
         ];
 
         $folders = [
@@ -1118,6 +1158,15 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/libraries/vendor/webmozart/assert',
             '/libraries/vendor/webmozart',
             '/libraries/vendor/symfony/var-dumper/Cloner/Internal',
+            // From 6.0.2 to 6.0.3
+            '/libraries/vendor/symfony/var-dumper/Test',
+            '/libraries/vendor/symfony/validator/Test',
+            '/libraries/vendor/symfony/translation-contracts/Test',
+            '/libraries/vendor/symfony/service-contracts/Test',
+            '/libraries/vendor/symfony/http-client/Test',
+            '/libraries/vendor/symfony/http-client-contracts/Test/Fixtures/web',
+            '/libraries/vendor/symfony/http-client-contracts/Test/Fixtures',
+            '/libraries/vendor/symfony/http-client-contracts/Test',
         ];
 
         $status['files_checked']   = $files;

administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-01-29.sql

@@ -0,0 +1 @@
+INSERT INTO `#__content_types` (`type_id`,`type_title`, `type_alias`, `table`, `rules`, `field_mappings`, `router`, `content_history_options`) VALUES	(14, 'Module', 'com_modules.module', '{"special":{"dbtable":"#__modules","key":"id","type":"Module","prefix":"Joomla\\\\CMS\\\\Table\\\\\"}}', '', '{}', '', '{"formFile":"administrator\\/components\\/com_modules\\/forms\\/module.xml", "hideFields":["checked_out", "checked_out_time", "publish_up", "publish_down"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"checked_out", "targetTable":"#__users", "targetColumn":"id", "displayColumn":"name"}]}');

administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-02-06.sql

@@ -0,0 +1,5 @@
+--
+-- Add position column to workflow stages table
+--
+
+ALTER TABLE `#__workflow_stages` ADD COLUMN `position` text NULL AFTER `default` /** CAN FAIL **/;

administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-01-29.sql

@@ -0,0 +1 @@
+INSERT INTO `#__content_types` (`type_id`,`type_title`, `type_alias`, `table`, `rules`, `field_mappings`, `router`, `content_history_options`) VALUES	(14, 'Module', 'com_modules.module', '{"special":{"dbtable":"#__modules","key":"id","type":"Module","prefix":"Joomla\\\\CMS\\\\Table\\\\\"}}', '', '{}', '', '{"formFile":"administrator\\/components\\/com_modules\\/forms\\/module.xml", "hideFields":["checked_out", "checked_out_time", "publish_up", "publish_down"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"checked_out", "targetTable":"#__users", "targetColumn":"id", "displayColumn":"name"}]}');

administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-02-06.sql

@@ -0,0 +1,5 @@
+--
+-- Add position column to workflow stages table
+--
+
+ALTER TABLE "#__workflow_stages" ADD COLUMN "position" text NULL /** CAN FAIL **/;

administrator/components/com_associations/src/View/Association/HtmlView.php

@@ -250,6 +250,32 @@ public function display($tpl = null): void
             if (!empty($this->typeSupports['save2copy'])) {
                 $this->save2copy = true;
             }
+
+            if (\array_key_exists('urlOptions', $details)) {
+                $urlOptions     = $details['urlOptions'];
+                $specialOptions = [];
+
+                foreach ($urlOptions as $tag => $urlOption) {
+                    $helper = $extension->get('helper');
+
+                    if (\array_key_exists('functionName', $urlOption)) {
+                        $func = $urlOption['functionName'];
+                        $args = [];
+
+                        if (\array_key_exists('params', $urlOption)) {
+                            $params = $urlOption['params'];
+
+                            foreach ($params as $param) {
+                                $args[] = $input->get($param);
+                            }
+                        }
+
+                        $value = \call_user_func_array([$helper, $func], $args);
+                    }
+
+                    $specialOptions[$tag] = $value;
+                }
+            }
         }
 
         $this->extensionName = $extensionName;
@@ -289,6 +315,10 @@ public function display($tpl = null): void
             ];
         }
 
+        if (!empty($specialOptions)) {
+            $options = array_merge($options, $specialOptions);
+        }
+
         // Reference and target edit links.
         $this->editUri = 'index.php?' . http_build_query($options);
 

administrator/components/com_banners/tmpl/banners/emptystate.php

@@ -17,7 +17,7 @@
 $displayData = [
     'textPrefix' => 'COM_BANNERS',
     'formURL'    => 'index.php?option=com_banners&view=banners',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/banners/banners-banners',
     'icon'       => 'icon-bookmark banners',
 
     'controlFields' => $this->filterForm->renderControlFields(),

administrator/components/com_banners/tmpl/clients/emptystate.php

@@ -17,7 +17,7 @@
 $displayData = [
     'textPrefix' => 'COM_BANNERS_CLIENT',
     'formURL'    => 'index.php?option=com_banners&view=clients',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners:_Clients',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/banners/banners-banners',
     'icon'       => 'icon-bookmark banners',
 
     'controlFields' => $this->filterForm->renderControlFields(),

administrator/components/com_banners/tmpl/tracks/emptystate.php

@@ -14,7 +14,7 @@
 
 $displayData = [
     'textPrefix' => 'COM_BANNERS_TRACKS',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners:_Tracks',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/banners/banners-banners',
     'icon'       => 'icon-bookmark banners',
 
     'controlFields' => $this->filterForm->renderControlFields(),

administrator/components/com_cache/tmpl/cache/emptystate.php

@@ -14,7 +14,7 @@
 
 $displayData = [
     'textPrefix' => 'COM_CACHE',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Cache',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/system/system-cache',
     'icon'       => 'icon-bolt clear',
 
     'controlFields' => $this->filterForm->renderControlFields(),