[5.3] Upmerge changes from 5.2-dev 2024-11-11

administrator/components/com_content/src/Model/ArticlesModel.php

@@ -143,6 +143,14 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
             $this->context .= '.' . $forcedLanguage;
         }
 
+        // Required content filters for the administrator menu
+        $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id');
+        $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level');
+        $this->getUserStateFromRequest($this->context . '.filter.author_id', 'filter_author_id');
+        $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '');
+        $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access');
+        $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '');
+
         // List state information.
         parent::populateState($ordering, $direction);
 

administrator/components/com_guidedtours/src/Controller/StepController.php

@@ -23,4 +23,21 @@
  */
 class StepController extends FormController
 {
+    /**
+     * Gets the URL arguments to append to a list redirect.
+     *
+     * @return  string  The arguments to append to the redirect URL.
+     *
+     * @since  __DEPLOY_VERSION__
+     */
+    protected function getRedirectToListAppend()
+    {
+        $append = parent::getRedirectToListAppend();
+        $tourId = $this->app->getUserState('com_guidedtours.tour_id');
+        if (!empty($tourId)) {
+            $append .= '&tour_id=' . $tourId;
+        }
+
+        return $append;
+    }
 }

administrator/components/com_installer/src/Model/UpdateModel.php

@@ -24,6 +24,7 @@
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
 use Joomla\Database\QueryInterface;
+use Joomla\Filesystem\Path;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -358,10 +359,24 @@ public function update($uids, $minimumStability = Updater::STABILITY_STABLE)
                 $update->set('extra_query', $updateSiteInstance->extra_query);
             }
 
-            $this->preparePreUpdate($update, $instance);
-
-            // Install sets state and enqueues messages
-            $res = $this->install($update);
+            try {
+                $this->preparePreUpdate($update, $instance);
+
+                // Install sets state and enqueues messages
+                $res = $this->install($update);
+            } catch (\Throwable $t) {
+                $res = false;
+
+                Factory::getApplication()->enqueueMessage(
+                    Text::sprintf(
+                        'COM_INSTALLER_UPDATE_ERROR',
+                        $instance->name,
+                        $t->getMessage(),
+                        (JDEBUG ? str_replace(JPATH_ROOT, 'JROOT', Path::clean($t->getFile())) . ':' . $t->getLine() : '')
+                    ),
+                    'error'
+                );
+            }
 
             if ($res) {
                 $instance->delete($uid);

administrator/components/com_menus/src/Model/MenutypesModel.php

@@ -411,7 +411,14 @@ protected function getTypeOptionsFromManifest($component)
                 $request['sub']        = (string) $attributes->sub;
             }
 
-            $o->request = array_filter($request, 'strlen');
+            $o->request = array_filter($request, function ($value) {
+                if (\is_array($value)) {
+                    return !empty($value);
+                }
+
+                return \strlen($value);
+            });
+
             $options[]  = new CMSObject($o);
 
             // Do not repeat the default view link (index.php?option=com_abc).

administrator/components/com_users/tmpl/captive/select.php

@@ -31,7 +31,7 @@
         </p>
     </div>
 
-    <div class="com-users-select-methods p-2">
+    <div class="com-users-methods-list-method com-users-methods-list-method-name-backupcodes com-users-methods-list-method-active">
         <?php foreach ($this->records as $record) :
             if (!array_key_exists($record->method, $this->mfaMethods) && ($record->method != 'backupcodes')) {
                 continue;
@@ -48,11 +48,13 @@
 
             $methodName = $this->getModel()->translateMethodName($record->method);
             ?>
-            <a class="com-users-method p-2 border-top border-dark bg-light d-flex flex-row flex-wrap justify-content-start align-items-center text-decoration-none gap-2 text-body"
+            <a class="com-users-method list-group-item-action p-2 border-top border-dark d-flex flex-row flex-wrap justify-content-start align-items-center text-decoration-none gap-2"
                href="<?php echo Route::_('index.php?option=com_users&view=captive&record_id=' . $record->id)?>">
+                <div class="com-users-methods-list-method-image">
                 <img src="<?php echo Uri::root() . $this->getModel()->getMethodImage($record->method) ?>"
                      alt="<?php echo $this->escape(strip_tags($record->title)) ?>"
-                     class="com-users-method-image img-fluid" />
+                     class="img-fluid" />
+                </div>
                 <?php if (!$this->allowEntryBatching || !$allowEntryBatching) : ?>
                     <span class="com-users-method-title flex-grow-1 fs-5 fw-bold">
                     <?php if ($record->method === 'backupcodes') : ?>

administrator/language/en-GB/com_installer.ini

@@ -258,6 +258,7 @@ COM_INSTALLER_UNINSTALL_ERROR="Error uninstalling %s."
 COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION="The extension \"%1$s\" (ID %2$s) is locked and cannot be uninstalled."
 COM_INSTALLER_UNINSTALL_SUCCESS="Uninstalling the %s was successful."
 COM_INSTALLER_UNPACK_ERROR="Failed to extract file: %s"
+COM_INSTALLER_UPDATE_ERROR="Error updating: %1$s<br>%2$s<br>%3$s<br>"
 COM_INSTALLER_UPDATE_FILTER_SEARCH_DESC="Search in extension name. Prefix with ID:, UID: or EID: to search for an update ID, update site ID or extension ID."
 COM_INSTALLER_UPDATE_FILTER_SEARCH_LABEL="Search Extensions with Updates"
 COM_INSTALLER_UPDATE_FORM_EDIT="Edit Update Site"

administrator/templates/atum/component.php

@@ -27,23 +27,36 @@
 $linkColorDark = $this->params->get('link-color-dark', '#6fbfdb');
 list($rd, $gd, $bd) = sscanf($linkColorDark, "#%02x%02x%02x");
 
+$adjustColorLightness = function ($r, $g, $b, $percent) {
+    $adjust = function ($color) use ($percent) {
+        $newColor = $color + ($color * $percent / 100);
+        return min(max(0, $newColor), 255);
+    };
+    return [$adjust($r), $adjust($g), $adjust($b)];
+};
+
+list($lighterRd, $lighterGd, $lighterBd) = $adjustColorLightness($rd, $gd, $bd, 10);
+$linkColorDarkHvr = sprintf("%d, %d, %d", $lighterRd, $lighterGd, $lighterBd);
+
 // Enable assets
 $wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
     ->useStyle('template.active.language')
     ->useStyle('template.user')
     ->addInlineStyle(':root {
-		--hue: ' . $matches[1] . ';
-		--template-bg-light: ' . $this->params->get('bg-light', 'var(--template-bg-light)') . ';
-		--template-text-dark: ' . $this->params->get('text-dark', 'var(--template-text-dark)') . ';
-		--template-text-light: ' . $this->params->get('text-light', 'var(--template-text-light)') . ';
-		--link-color: ' . $linkColor . ';
+        --hue: ' . $matches[1] . ';
+        --template-bg-light: ' . $this->params->get('bg-light', 'var(--template-bg-light)') . ';
+        --template-text-dark: ' . $this->params->get('text-dark', 'var(--template-text-dark)') . ';
+        --template-text-light: ' . $this->params->get('text-light', 'var(--template-text-light)') . ';
+        --link-color: ' . $linkColor . ';
         --link-color-rgb: ' . $r . ',' . $g . ',' . $b . ';
-		--template-special-color: ' . $this->params->get('special-color', 'var(--template-special-color)') . ';
-	}')
-   ->addInlineStyle('@media (prefers-color-scheme: dark) { :root {
-		--link-color: ' . $linkColorDark . ';
-		--link-color-rgb: ' . $rd . ',' . $gd . ',' . $bd . ';
-	}}');
+        --template-special-color: ' . $this->params->get('special-color', 'var(--template-special-color)') . ';
+    }')
+    ->addInlineStyle(':root[data-color-scheme="dark"] {
+        --link-color: ' . $linkColorDark . ';
+        --link-color-rgb: ' . $rd . ',' . $gd . ',' . $bd . ';
+        --link-color-rgb-hvr: ' . $linkColorDarkHvr . ';
+        --template-special-color: #6fbfdb;
+    }');
 
 // No template.js for modals
 $wa->disableScript('template.atum');
@@ -75,14 +88,17 @@
 ?>
 
 <!DOCTYPE html>
-<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>"<?php echo $themeModeAttr; ?>>
+<html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>" <?php echo $themeModeAttr; ?>>
+
 <head>
     <jdoc:include type="metas" />
     <jdoc:include type="styles" />
     <jdoc:include type="scripts" />
 </head>
+
 <body class="contentpane component">
     <jdoc:include type="message" />
     <jdoc:include type="component" />
 </body>
+
 </html>

build/media_source/com_finder/js/debug.es6.js

@@ -24,11 +24,14 @@
         headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
         onSuccess: (response) => {
           const output = document.getElementById('indexer-output');
+          const allowedHtml = {
+            fieldset: [], legend: [], dl: ['class'], dt: ['class'], dd: ['class'],
+          };
           try {
             const parsed = JSON.parse(response);
-            output.innerHTML = parsed.rendered;
+            output.innerHTML = Joomla.sanitizeHtml(parsed.rendered, allowedHtml);
           } catch (e) {
-            output.innerHTML = response;
+            output.innerHTML = Joomla.sanitizeHtml(response, allowedHtml);
           }
         },
         onError: (xhr) => {

build/media_source/com_menus/js/admin-item-edit_container.es6.js

@@ -35,7 +35,7 @@
     const selfChecked = isChecked(target);
 
     if (root) {
-      getTreeElements(root).map((element) => toggleState(element, selfChecked));
+      getTreeElements(root).forEach((element) => toggleState(element, selfChecked));
     }
   };
 

build/media_source/mod_articles/css/mod-articles.css

@@ -1,23 +1,3 @@
-.mod-articles-item-card .mod-articles-link::before {
-  position: absolute;
-  z-index: 1;
-  content: "";
-  inset: 0;
-}
-.mod-articles-item-card {
-  position: relative;
-}
-.mod-articles-item-card:focus-within {
-  box-shadow: 0 0 0 var(--focus-ring-width) var(--focus-ring-color);
-}
-.mod-articles-item-card:focus-within :focus {
-  border: none;
-  outline: none;
-  box-shadow: none;
-}
-.mod-articles-item-card:hover {
-  box-shadow: 1px 1px 4px #0000001a;
-}
 .mod-articles-item {
   display: flex;
   flex-direction: column;
@@ -29,8 +9,8 @@
   margin-bottom: .5rem;
 }
 @supports (container-type: inline-size) {
-  div:has(.mod-articles-grid),
-  section:has(.mod-articles-grid) {
+  div:has(> .mod-articles-grid),
+  section:has(> .mod-articles-grid) {
     container-type: inline-size;
   }
 }

build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.es6.js

@@ -10,7 +10,7 @@
   window.JoomlainitReCaptchaInvisible = () => {
     const optionKeys = ['sitekey', 'badge', 'size', 'tabindex', 'callback', 'expired-callback', 'error-callback'];
 
-    document.getElementsByClassName('g-recaptcha').forEach((element) => {
+    document.querySelectorAll('.g-recaptcha').forEach((element) => {
       let options = {};
 
       if (element.dataset) {

build/media_source/system/js/treeselectmenu.es6.js

@@ -3,7 +3,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-const treeselectmenu = document.getElementById('treeselectmenu').innerHTML;
+const treeselectmenu = document.getElementById('treeselectmenu');
 const direction = (document.dir !== undefined) ? document.dir : document.documentElement.dir;
 
 document.querySelectorAll('.treeselect li').forEach((li) => {
@@ -20,11 +20,14 @@ document.querySelectorAll('.treeselect li').forEach((li) => {
     li.querySelector('span.icon-').classList.add('treeselect-toggle', 'icon-chevron-down');
 
     // Append drop down menu in nodes
-    li.querySelector('div.treeselect-item label').insertAdjacentHTML('afterend', treeselectmenu);
+    if (treeselectmenu) {
+      li.querySelector('div.treeselect-item label').insertAdjacentHTML('afterend', treeselectmenu.innerHTML);
+    }
 
     const sub = li.querySelector('ul.treeselect-sub');
-    if (!sub.querySelector('ul.treeselect-sub')) {
-      li.querySelector('div.treeselect-menu-expand').remove();
+    const expand = li.querySelector('div.treeselect-menu-expand');
+    if (!sub.querySelector('ul.treeselect-sub') && expand) {
+      expand.remove();
     }
   }
 });

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

@@ -21,7 +21,7 @@
     }
   }
 
-  &.view-user, &.view-methods {
+  &.view-user, &.view-methods, &.view-captive {
     #com-users-methods-reset-container {
       background-color: $users-methods-reset-cont-bg;
     }

components/com_tags/src/Service/Router.php

@@ -76,7 +76,12 @@ public function __construct(SiteApplication $app, AbstractMenu $menu, ?CategoryF
         parent::__construct($app, $menu);
 
         $sefPlugin       = PluginHelper::getPlugin('system', 'sef');
-        $this->sefparams = new Registry($sefPlugin->params);
+
+        if ($sefPlugin) {
+            $this->sefparams = new Registry($sefPlugin->params);
+        } else {
+            $this->sefparams = new Registry();
+        }
 
         $this->buildLookup();
     }

components/com_wrapper/tmpl/wrapper/default.xml

@@ -18,6 +18,7 @@
 				type="url"
 				validate="url"
 				filter="url"
+				relative="true"
 				label="COM_WRAPPER_FIELD_URL_LABEL"
 				required="true"
 			/>

composer.json

@@ -116,8 +116,8 @@
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
     "joomla/mediawiki": "^3.0",
     "joomla/test": "~3.0",
-    "phpstan/phpstan": "^1.12.4",
-    "phpstan/phpstan-deprecation-rules": "^1.2.1"
+    "phpstan/phpstan": "^2.0",
+    "phpstan/phpstan-deprecation-rules": "^2.0"
   },
   "replace": {
     "paragonie/random_compat": "9.99.99",