[6.0] Upmerges - 2025-03-26

Merge pull request #45222 from Bodge-IT/upmerges/2025-03-26

Author: Bodge-IT

administrator/components/com_templates/src/View/Templates/HtmlView.php

@@ -142,7 +142,7 @@ protected function addToolbar()
         $toolbar  = $this->getDocument()->getToolbar();
 
         // Add a shortcut to the styles list view.
-        $toolbar->linkButton('', 'COM_TEMPLATES_MANAGER_STYLES_BUTTON')
+        $toolbar->linkButton('styles', 'COM_TEMPLATES_MANAGER_STYLES_BUTTON')
             ->url('index.php?option=com_templates&view=styles&client_id=' . $clientId)
             ->icon('icon-brush thememanager');
 

administrator/components/com_users/src/Model/BackupcodesModel.php

@@ -252,7 +252,7 @@ public function isBackupCode($code, ?User $user = null): bool
          */
         $otherResult = false;
 
-        $temp1 = '';
+        $temp1 = [];
 
         for ($i = 0; $i < 10; $i++) {
             $temp1[$i] = random_int(0, 99999999);

administrator/components/com_users/src/Model/CaptiveModel.php

@@ -426,7 +426,7 @@ public function checkTryLimit(MfaTable $method)
         $maxTries   = (int) $params->get('mfatrycount', 10);
         $blockHours = (int) $params->get('mfatrytime', 1);
 
-        $lastTryTime       = strtotime($method->last_try) ?: 0;
+        $lastTryTime       = $method->last_try !== null ? strtotime($method->last_try) : 0;
         $hoursSinceLastTry = (strtotime(Factory::getDate()->toSql()) - $lastTryTime) / 3600;
 
         if ($method->last_try !== null && $hoursSinceLastTry > $blockHours) {

build/build-modules-js/javascript/build-bootstrap-js.mjs

@@ -3,7 +3,7 @@ import {
 } from 'node:fs/promises';
 import { resolve } from 'node:path';
 import { transform } from 'esbuild';
-import rimraf from 'rimraf';
+import { rimrafSync } from 'rimraf';
 import { rollup } from 'rollup';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
@@ -65,6 +65,13 @@ const build = async () => {
         ],
       }),
     ],
+  });
+
+  await bundle.write({
+    format: 'es',
+    sourcemap: false,
+    dir: outputFolder,
+    chunkFileNames: '[name].js',
     manualChunks: {
       alert: ['build/media_source/vendor/bootstrap/js/alert.es6.js'],
       button: ['build/media_source/vendor/bootstrap/js/button.es6.js'],
@@ -86,19 +93,12 @@ const build = async () => {
     },
   });
 
-  await bundle.write({
-    format: 'es',
-    sourcemap: false,
-    dir: outputFolder,
-    chunkFileNames: '[name].js',
-  });
-
   // closes the bundle
   await bundle.close();
 };
 
 export const bootstrapJs = async () => {
-  rimraf.sync(resolve(outputFolder));
+  rimrafSync(resolve(outputFolder));
 
   try {
     await build(resolve(inputFolder, 'index.es6.js'));

build/build.php

@@ -122,6 +122,8 @@ function clean_checkout(string $dir)
     system('find libraries/vendor -name _config.yml | xargs rm -rf -');
     system('find libraries/vendor -name .bowerrc | xargs rm -rf -');
     system('find libraries/vendor -name bower.json | xargs rm -rf -');
+    system('find libraries/vendor -name .drone.yml | xargs rm -rf -');
+    system('find libraries/vendor -name .drone.jsonnet | xargs rm -rf -');
     system('rm -rf libraries/vendor/bin');
 
     // aldo26-matthias/idna-convert

build/media_source/plg_installer_webinstaller/js/client.es6.js

@@ -413,7 +413,7 @@ customElements.whenDefined('joomla-tab').then(() => {
     link.click();
   }
 
-  if (link.hasAttribute('aria-expanded') && link.getAttribute('aria-expanded') === 'true' && !instance) {
+  if (link.hasAttribute('aria-selected') && link.getAttribute('aria-selected') === 'true' && !instance) {
     instance = new WebInstaller();
     instance.initialise();
   }

build/media_source/templates/administrator/atum/scss/pages/_com_users.scss

@@ -100,4 +100,10 @@
       margin-inline-start: 2rem;
     }
   }
+
+  &.view-user {
+    table thead th {
+      color: var(--bs-body-color);
+    }
+  }
 }

composer.json

@@ -63,7 +63,7 @@
     "joomla/event": "^3.0.1",
     "joomla/filter": "^3.0.2",
     "joomla/filesystem": "^3.1.0",
-    "joomla/http": "^3.0.1",
+    "joomla/http": "^3.1.0",
     "joomla/input": "~3.0",
     "joomla/language": "~3.0",
     "joomla/oauth1": "~3.0",
@@ -74,7 +74,7 @@
     "joomla/string": "^3.0.1",
     "joomla/uri": "~3.0",
     "joomla/utilities": "~3.0",
-    "algo26-matthias/idna-convert": "^3.1.1",
+    "algo26-matthias/idna-convert": "^4.0.4",
     "defuse/php-encryption": "^2.4.0",
     "doctrine/inflector": "^1.4.4",
     "fig/link-util": "^1.2.0",
@@ -108,13 +108,13 @@
     "phpseclib/bcmath_compat": "^2.0.3",
     "jfcherng/php-diff": "^6.16.2",
     "voku/portable-utf8": "dev-joomla-5.3 as 6.0.13",
-    "php-tuf/php-tuf": "^1.0.2",
+    "php-tuf/php-tuf": "^1.0.3",
     "php-debugbar/php-debugbar": "^2.1.6"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.6.22",
     "friendsofphp/php-cs-fixer": "^3.72.0",
-    "squizlabs/php_codesniffer": "^3.11.3",
+    "squizlabs/php_codesniffer": "^3.12.0",
     "joomla/mediawiki": "^3.0",
     "joomla/test": "~3.0",
     "phpstan/phpstan": "^2.1.8",

composer.lock

@@ -403,6 +403,12 @@ public function createConfiguration($options)
         // Locale settings.
         $registry->set('offset', 'UTC');
 
+        // CORS settings.
+        $registry->set('cors', false);
+        $registry->set('cors_allow_origin', '*');
+        $registry->set('cors_allow_methods', '');
+        $registry->set('cors_allow_headers', 'Content-Type,X-Joomla-Token');
+
         // Mail settings.
         $registry->set('mailonline', true);
         $registry->set('mailer', 'mail');