Merge pull request joomla#44797 from Bodge-IT/upmerges/2025-01-28

[6.0] Upmerges - 2025-01-28

Author: Bodge-IT

composer.json

@@ -89,7 +89,7 @@
     "symfony/web-link": "^6.4.8",
     "symfony/yaml": "^6.4.11",
     "typo3/phar-stream-wrapper": "^3.1.7",
-    "wamania/php-stemmer": "^3.0.1",
+    "wamania/php-stemmer": "^4.0.0",
     "maximebf/debugbar": "^1.23.0",
     "tobscure/json-api": "dev-joomla-backports",
     "willdurand/negotiation": "^3.1.0",

composer.lock

@@ -67,7 +67,7 @@
 
 $attributes = [
     $class,
-    !empty($width) ? ' style="width:' . $width . ';"' : '',
+    !empty($width) ? 'style="width:' . $width . ';"' : '',
     $data,
     $dataAttribute,
 ];

layouts/joomla/form/field/meter.php

@@ -84,11 +84,11 @@
     $dataAttribute,
     $list,
     strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
-    $onchange ? ' onchange="' . $onchange . '"' : '',
+    $onchange ? 'onchange="' . $onchange . '"' : '',
     !empty($maxLength) ? $maxLength : '',
     $required ? 'required' : '',
     !empty($autocomplete) ? 'autocomplete="' . $autocomplete . '"' : '',
-    $autofocus ? ' autofocus' : '',
+    $autofocus ? 'autofocus' : '',
     $spellcheck ? '' : 'spellcheck="false"',
     !empty($inputmode) ? $inputmode : '',
     !empty($counterlabel) ? $counterlabel : '',

layouts/joomla/form/field/text.php

@@ -50,17 +50,17 @@
  */
 
 $attributes = [
-    !empty($size) ? ' size="' . $size . '"' : '',
-    !empty($description) ? ' aria-describedby="' . ($id ?: $name) . '-desc"' : '',
-    $disabled ? ' disabled' : '',
-    $readonly ? ' readonly' : '',
-    strlen($hint) ? ' placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
+    !empty($size) ? 'size="' . $size . '"' : '',
+    !empty($description) ? 'aria-describedby="' . ($id ?: $name) . '-desc"' : '',
+    $disabled ? 'disabled' : '',
+    $readonly ? 'readonly' : '',
+    strlen($hint) ? 'placeholder="' . htmlspecialchars($hint, ENT_COMPAT, 'UTF-8') . '"' : '',
     !empty($autocomplete) ? 'autocomplete="' . $autocomplete . '"' : '',
-    $autofocus ? ' autofocus' : '',
-    $spellcheck ? '' : ' spellcheck="false"',
-    $onchange ? ' onchange="' . $onchange . '"' : '',
+    $autofocus ? 'autofocus' : '',
+    $spellcheck ? '' : 'spellcheck="false"',
+    $onchange ? 'onchange="' . $onchange . '"' : '',
     !empty($maxLength) ? $maxLength : '',
-    $required ? ' required' : '',
+    $required ? 'required' : '',
     $dataAttribute,
 ];
 

layouts/joomla/form/field/url.php

@@ -145,7 +145,9 @@ protected function writeNamespaceFile($elements)
         $error_reporting = error_reporting(0);
 
         try {
-            File::write($this->file, implode("\n", $content));
+            if (!File::write($this->file, implode("\n", $content))) {
+                throw new Exception('Could not save ' . $this->file, 500);
+            }
         } catch (Exception $e) {
             Log::add('Could not save ' . $this->file, Log::WARNING);