Merge branch '5.2-dev' into 4.4-dev

AlexanderCkm · Nov 13, 2024 · 6a3df64 · 6a3df64
2 parents 07c5ebe + c6a54c1
commit 6a3df64
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 27 deletions.
diff --git a/administrator/components/com_finder/src/Controller/IndexerController.php b/administrator/components/com_finder/src/Controller/IndexerController.php
@@ -365,7 +365,7 @@ class_alias(DebugAdapter::class, Adapter::class);
             $output .= '<dl class="row">';
 
             foreach (DebugIndexer::$item as $key => $value) {
-                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10">' . $value . '</dd>';
+                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10 text-break">' . $value . '</dd>';
             }
 
             $output .= '</dl>';
@@ -375,7 +375,7 @@ class_alias(DebugAdapter::class, Adapter::class);
             $output .= '<dl class="row">';
 
             foreach (DebugIndexer::$item->getElements() as $key => $element) {
-                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10">' . $element . '</dd>';
+                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10 text-break">' . $element . '</dd>';
             }
 
             $output .= '</dl>';
@@ -392,7 +392,7 @@ class_alias(DebugAdapter::class, Adapter::class);
             ];
 
             foreach (DebugIndexer::$item->getInstructions() as $key => $element) {
-                $output .= '<dt class="col-sm-2">' . $contexts[$key] . '</dt><dd class="col-sm-10">' . json_encode($element) . '</dd>';
+                $output .= '<dt class="col-sm-2">' . $contexts[$key] . '</dt><dd class="col-sm-10 text-break">' . json_encode($element) . '</dd>';
             }
 
             $output .= '</dl>';
@@ -402,7 +402,7 @@ class_alias(DebugAdapter::class, Adapter::class);
             $output .= '<dl class="row">';
 
             foreach (DebugIndexer::$item->getTaxonomy() as $key => $element) {
-                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10">' . json_encode($element) . '</dd>';
+                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10 text-break">' . json_encode($element) . '</dd>';
             }
 
             $output .= '</dl>';

diff --git a/composer.json b/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",

diff --git a/composer.lock b/composer.lock
diff --git a/libraries/src/Form/Rule/EmailRule.php b/libraries/src/Form/Rule/EmailRule.php
@@ -164,7 +164,9 @@ public function test(\SimpleXMLElement $element, $value, $group = null, ?Registr
             $query = $db->getQuery(true);
 
             // Get the extra field check attribute.
-            $userId = ($form instanceof Form) ? (int) $form->getValue('id') : 0;
+            $userId = ($form instanceof Form) && $form->getValue('id')
+                ? (int) $form->getValue('id')
+                : (($input instanceof Registry) ? (int) $input->get('id') : 0);
 
             // Build the query.
             $query->select('COUNT(*)')

diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "watch": "node build/build.js --watch",
     "watch:com_media": "node build/build.js --watch-com-media",
     "lint:js": "eslint --config build/.eslintrc --ignore-pattern '/media/' --ext .es6.js,.es6,.vue .",
-    "lint:testjs": "eslint --config build/.eslintrc --ext .js tests/System",
+    "lint:testjs": "eslint --config build/.eslintrc --ext .js,.mjs tests/System",
     "lint:css": "stylelint --config build/.stylelintrc.json \"administrator/components/com_media/resources/**/*.scss\" \"administrator/templates/**/*.scss\" \"build/media_source/**/*.scss\" \"build/media_source/**/*.css\" \"templates/**/*.scss\" \"installation/template/**/*.scss\"",
     "install": "node build/build.js --prepare",
     "update": "node build/build.js --copy-assets && node build/build.js --build-pages && node build/build.js --compile-js && node build/build.js --compile-css && node build/build.js --compile-bs && node --env-file=./build/production.env build/build.js --com-media",

diff --git a/tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js b/tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js
@@ -19,7 +19,7 @@ describe('Test in backend that the action logs', () => {
     cy.doAdministratorLogout();
     cy.doAdministratorLogin();
     cy.visit('/administrator/index.php?option=com_actionlogs&view=actionlogs');
-    cy.contains('User ci-admin logged in to admin');
+    cy.contains(`User ${Cypress.env('username')} logged in to admin`);
     cy.task('queryDB', 'TRUNCATE #__action_logs');
   });
 

diff --git a/tests/System/plugins/fs.mjs b/tests/System/plugins/fs.mjs
@@ -1,5 +1,5 @@
 import {
-  chmodSync, existsSync, writeFileSync, mkdirSync, rmSync, copyFileSync
+  chmodSync, existsSync, writeFileSync, mkdirSync, rmSync, copyFileSync,
 } from 'fs';
 import { dirname, join } from 'path';
 import { umask } from 'node:process';