[6.0] Upmerges - 2025-07-16

Merge pull request #45734 from Bodge-IT/upmerges/2025-07-16

Drone failure expected and overridden.

Author: Bodge-IT

.drone.yml

@@ -34,7 +34,6 @@ steps:
   - name: phpstan
     image: joomlaprojects/docker-images:php8.2
     depends_on: [ phpcs ]
-    failure: ignore
     commands:
       - ./libraries/vendor/bin/phpstan
 
@@ -415,6 +414,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 99da78521b10f37ddf6731e695fe52f85ee3db142bccac66901ae5372e332aae
+hmac: e7e97cddd98bd4db561056d6eb59c5eea2ae3fd55e20870bf800beaa773fbf6b
 
 ...

.github/workflows/ci.yml

@@ -107,7 +107,7 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
       - name: Run PHPstan
         run: |
-          ./libraries/vendor/bin/phpstan --error-format=github || :
+          ./libraries/vendor/bin/phpstan --error-format=github
 
   tests-unit:
     name: Run Unit tests
@@ -264,3 +264,14 @@ jobs:
           POSTGRES_USER: root
           POSTGRES_PASSWORD: joomla_ut
           POSTGRES_DB: test_joomla
+
+  typos:
+    name: Check for typos
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Actions Repository
+      uses: actions/checkout@v4
+    - name: Spell Check Repository
+      uses: crate-ci/[email protected]
+      with:
+        config: .github/workflows/typos.toml

.github/workflows/typos.toml

@@ -0,0 +1,49 @@
+# Custom configuration file for the typos action
+# Excludes some folders with non-english language content
+# Excludes certain words as false-positives - mainly in js or
+# that can't be changed for b/c
+
+[files]
+extend-exclude = [
+    "/templates/system/*.html",
+    "/administrator/components/com_admin/sql/*",
+    "/build/media_source/vendor/tinymce/langs/*",
+    "/installation/language/*",
+    "includes/*.html",
+    "/plugins/sampledata/testing/*",
+]
+
+[default.extend-words]
+accordian="accordian"       # Not changed for B/C see #36821
+assigments="assigments"     # Not changed for B/C see #36822
+ba="ba"                     # Used for filename for Bosnian flag
+cachable="cachable"         # Not changed for B/C see #29808#discussion_r446681316
+cll="cll"                   # Mysql version name
+chck="chck"                 # Used in modal-content-select-field.es6.js
+childs="childs"             # Used in config-filters.es6.js and language string
+cose="cose"                 # Webauthn COSE algorithm
+credate="credate"           # Selector in queries
+cript="cript"               # Used in regex for htaccess.txt and web.config.txt
+crypted="crypted"           # Used in MD5Handler
+datas="datas"               # Used in showon.es6.js
+deactive="deactive"         # Used in searchtools.es6.js
+exept="exept"               # Used in El.php Greek language stemmer
+fof="fof"                   # To be fixed - outdated code comment in com_postinstall
+Formater="Formater"         # Used in AbstractDataCollector of debug plugin
+hel="hel"                   # Variable name in MenusHelper
+identicals="identicals"     # administrator\components\com_templates\tmpl\template\default.php
+linke="linke"               # name of com_content field
+occurence="occurence"       # Used in plg_system_debug\widgets\languageStrings\widget.es5.js
+ot="ot"                     # Valid use as OTP and Livelap[bB]ot
+Querys="Querys"             # $backupExtraQuerys in administrator\components\com_installer\src\Model\UpdatesitesModel.php
+shepard="shepard"           # CSS filename reference to upstream library
+supercedes="supercedes"     # Valid spelling rejected https://github.com/crate-ci/typos/issues/1325
+ue="ue"                     # selector in queries
+vertexes="vertexes"         # Valid spelling waiting fix https://github.com/crate-ci/typos/issues/1150
+wheres="wheres"             # $wheres in modules\mod_related_items\src\Helper\RelatedItemsHelper.php
+
+# deprecated strings can be removed in 6.0
+configurated="configurated"
+discernable="discernable"
+hilight="hilight"
+mis="mis"

administrator/components/com_finder/config.xml

@@ -234,7 +234,7 @@
 		<field
 			name="highlight_terms"
 			type="radio"
-			label="COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_LABEL"
+			label="COM_FINDER_CONFIG_HIGHLIGHT_CONTENT_SEARCH_TERMS_LABEL"
 			description="COM_FINDER_CONFIG_HIGHLIGHT_CONTENT_SEARCH_TERMS_DESC"
 			layout="joomla.form.field.radio.switcher"
 			default="1"

administrator/components/com_joomlaupdate/config.xml

@@ -121,12 +121,5 @@
 			class="alert alert-info w-100"
 			showon="updatesource!:default[OR]minimum_stability!:4"
 		/>
-		<field
-			name="automated_updates_email"
-			type="text"
-			label="COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_UPDATE_EMAIL_LABEL"
-			description="COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_UPDATE_EMAIL_DESCRIPTION"
-			showon="updatesource:default[AND]minimum_stability:4[AND]autoupdate:1"
-		/>
 	</fieldset>
 </config>

administrator/components/com_joomlaupdate/src/Model/NotificationModel.php

@@ -48,19 +48,8 @@ public function sendNotification($type, $oldVersion): void
     {
         $params = ComponentHelper::getParams('com_joomlaupdate');
 
-        // Load the parameters.
-        $specificEmail = $params->get('automated_updates_email');
-
-        // Let's find out the email addresses to notify
-        $superUsers = [];
-
-        if (!empty($specificEmail)) {
-            $superUsers = $this->getSuperUsers($specificEmail);
-        }
-
-        if (empty($superUsers)) {
-            $superUsers = $this->getSuperUsers();
-        }
+        // Send a notification to all super users
+        $superUsers = $this->getSuperUsers();
 
         if (empty($superUsers)) {
             throw new \RuntimeException();

administrator/language/en-GB/com_finder.ini

@@ -18,6 +18,8 @@ COM_FINDER_CONFIG_FILTER_COMMONWORDS_LABEL="Filter Common Words"
 COM_FINDER_CONFIG_FILTER_NUMERICS_LABEL="Filter Numeric Terms"
 COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_LABEL="Gather Search Statistics"
 COM_FINDER_CONFIG_HIGHLIGHT_CONTENT_SEARCH_TERMS_DESC="For performance reasons, this will not highlight more than 10 different terms in the search results."
+COM_FINDER_CONFIG_HIGHLIGHT_CONTENT_SEARCH_TERMS_LABEL="Highlight Search Terms"
+; deprecated will be removed in 6.0
 COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_LABEL="Highlight Search Terms"
 COM_FINDER_CONFIG_IMAGE_CLASS_LABEL="Image Class"
 COM_FINDER_CONFIG_LANGUAGE_DEFAULT_DEFAULT_LANGUAGE="Default Site Language"

administrator/language/en-GB/com_joomlaupdate.ini

@@ -16,8 +16,6 @@ COM_JOOMLAUPDATE_CONFIG_AUTOMATED_UPDATES_DISABLED_LABEL="<span class=\"fa-fw me
 COM_JOOMLAUPDATE_CONFIG_AUTOMATED_UPDATES_LABEL="Automated Updates"
 COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_DESC="Automatically update Joomla to the latest version when it is available."
 COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_LABEL="Automated Update"
-COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_UPDATE_EMAIL_DESCRIPTION="A comma separated list of the email addresses which will receive the update notification emails. The addresses in the list MUST belong to existing users of your site who have the Super User privilege. If none of the listed emails belongs to Super Users, or if it's left blank, all Super Users of this site will receive the update notification email."
-COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_UPDATE_EMAIL_LABEL="Super User Emails"
 COM_JOOMLAUPDATE_CONFIG_BACKUPCHECK_DESC="Shows the checkbox to confirm you have taken a backup and you're ready to update in the final step before the update is actually applied."
 COM_JOOMLAUPDATE_CONFIG_BACKUPCHECK_LABEL="Confirm Backup Checkbox"
 COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_LABEL="Custom URL"

administrator/language/en-GB/plg_system_schemaorg.ini

@@ -1,22 +1,25 @@
-; Joomla! Project
-; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-PLG_SYSTEM_SCHEMAORG="System - Schema.org"
-PLG_SYSTEM_SCHEMAORG_BASETYPE_DESCRIPTION="Choose whether your website represents an organization or a single person."
-PLG_SYSTEM_SCHEMAORG_BASETYPE_LABEL="Base Type"
-PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_ORGANIZATION="Organization"
-PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_PERSON="Person"
-PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION="Structured data is a standardised format for organising and representing information on the web. It provides a way to describe the content and meaning of data in a structured manner, making it easier for search engines and other applications to understand and process the information. <a href=\"https://schema.org\" target=\"_blank\" rel=\"noopener noreferrer\">More information on schema.org</a>."
-PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED="To use the schema.org functionality, you have to configure the plugin first. Please contact an administrator of the page to get it configured."
-PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED_ADMIN="To use the schema.org functionality, you have to configure the plugin first. Please select <a href=\"index.php?option=com_plugins&amp;task=plugin.edit&amp;extension_id=%s\" target=\"_blank\">this link to open the plugin</a>, configure and save."
-PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_EXTEND_JED_DESC="<strong>Need more Schema types?</strong> Extend with <a href=\"https://extensions.joomla.org/category/core-enhancements/schema-plugins\" target=\"_blank\" rel=\"noopener noreferrer\">Schema Plugins from Joomla! Extension Directory</a>."
-PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_LABEL="Schema"
-PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_TYPE_LABEL="Schema Type"
-PLG_SYSTEM_SCHEMAORG_IMAGE_LABEL="Image"
-PLG_SYSTEM_SCHEMAORG_NAME_LABEL="Name"
-PLG_SYSTEM_SCHEMAORG_SOCIALMEDIA_LABEL="Social Media Accounts"
-PLG_SYSTEM_SCHEMAORG_SOCIALMEDIA_URL_LABEL="URL"
-PLG_SYSTEM_SCHEMAORG_USER_LABEL="Select User"
-PLG_SYSTEM_SCHEMAORG_XML_DESCRIPTION="Adds custom form field in article view and then injects that data in JSON+LD format in the head tag of that particular article."
+; Joomla! Project
+; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+PLG_SYSTEM_SCHEMAORG="System - Schema.org"
+PLG_SYSTEM_SCHEMAORG_BASETYPE_DESCRIPTION="Choose whether your website represents an organization or a single person."
+PLG_SYSTEM_SCHEMAORG_BASETYPE_LABEL="Base Type"
+PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_ORGANIZATION="Organization"
+PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_PERSON="Person"
+PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION="Structured data is a standardised format for organising and representing information on the web. It provides a way to describe the content and meaning of data in a structured manner, making it easier for search engines and other applications to understand and process the information. <a href=\"https://schema.org\" target=\"_blank\" rel=\"noopener noreferrer\">More information on schema.org</a>."
+; The following two strings are deprecated and will be removed with 6.0
+PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED="To use the schema.org functionality, you have to configure the plugin first. Please contact an administrator of the page to get it configured."
+PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED_ADMIN="To use the schema.org functionality, you have to configure the plugin first. Please select <a href=\"index.php?option=com_plugins&amp;task=plugin.edit&amp;extension_id=%s\" target=\"_blank\">this link to open the plugin</a>, configure and save."
+PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURED="To use the schema.org functionality, you have to configure the plugin first. Please contact an administrator of the page to get it configured."
+PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURED_ADMIN="To use the schema.org functionality, you have to configure the plugin first. Please select <a href=\"index.php?option=com_plugins&amp;task=plugin.edit&amp;extension_id=%s\" target=\"_blank\">this link to open the plugin</a>, configure and save."
+PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_EXTEND_JED_DESC="<strong>Need more Schema types?</strong> Extend with <a href=\"https://extensions.joomla.org/category/core-enhancements/schema-plugins\" target=\"_blank\" rel=\"noopener noreferrer\">Schema Plugins from Joomla! Extension Directory</a>."
+PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_LABEL="Schema"
+PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_TYPE_LABEL="Schema Type"
+PLG_SYSTEM_SCHEMAORG_IMAGE_LABEL="Image"
+PLG_SYSTEM_SCHEMAORG_NAME_LABEL="Name"
+PLG_SYSTEM_SCHEMAORG_SOCIALMEDIA_LABEL="Social Media Accounts"
+PLG_SYSTEM_SCHEMAORG_SOCIALMEDIA_URL_LABEL="URL"
+PLG_SYSTEM_SCHEMAORG_USER_LABEL="Select User"
+PLG_SYSTEM_SCHEMAORG_XML_DESCRIPTION="Adds custom form field in article view and then injects that data in JSON+LD format in the head tag of that particular article."