diff --git a/.drone.yml b/.drone.yml index e7050b7641f49..41889d3c84726 100644 --- a/.drone.yml +++ b/.drone.yml @@ -219,7 +219,7 @@ steps: environment: CYPRESS_VERIFY_TIMEOUT: 100000 commands: - - mv cypress.config.dist.js cypress.config.js + - mv cypress.config.dist.mjs cypress.config.mjs - npx cypress install - npx cypress verify @@ -504,6 +504,6 @@ trigger: --- kind: signature -hmac: 4883ca31950b6197886ad6e53fa6ec4bd19152852ea3e016a95a27b7ff27eece +hmac: ccc71c7a0c6643aef1000b49a0125d4a9bf2bacedc3875c9106b31449e7f50f8 ... diff --git a/.gitignore b/.gitignore index 6772a69665f3b..b936fdbaa9b6e 100644 --- a/.gitignore +++ b/.gitignore @@ -103,7 +103,7 @@ RoboFile.ini !/tests/System/output/screenshots/.gitkeep /tests/System/output/videos !/tests/System/output/videos/.gitkeep -cypress.config.js +cypress.config.mjs # WebAuthn FIDO metadata cache /plugins/system/webauthn/fido.jwt diff --git a/administrator/components/com_associations/src/Helper/AssociationsHelper.php b/administrator/components/com_associations/src/Helper/AssociationsHelper.php index 5fd7523383e18..3ca4d55a2d1af 100644 --- a/administrator/components/com_associations/src/Helper/AssociationsHelper.php +++ b/administrator/components/com_associations/src/Helper/AssociationsHelper.php @@ -72,7 +72,7 @@ public static function getAssociationList($extensionName, $typeName, $itemId) } /** - * Get the the instance of the extension helper class + * Get the instance of the extension helper class * * @param string $extensionName The extension name with com_ * diff --git a/administrator/components/com_installer/src/Model/DatabaseModel.php b/administrator/components/com_installer/src/Model/DatabaseModel.php index 3a42033ed276f..4d190376e8584 100644 --- a/administrator/components/com_installer/src/Model/DatabaseModel.php +++ b/administrator/components/com_installer/src/Model/DatabaseModel.php @@ -537,7 +537,7 @@ public function compareUpdateVersion($extension) /** * Get a message of the tables skipped and checked * - * @param array $status status of of the update files + * @param array $status status of the update files * * @return array Messages with the errors with the update version * diff --git a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue index 70f938292f55c..99269aa27d795 100644 --- a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue +++ b/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue @@ -80,7 +80,7 @@ export default { }, }, methods: { - /* Check if the the form is valid */ + /* Check if the form is valid */ isValid() { return (this.folder); }, diff --git a/administrator/components/com_messages/src/Field/UserMessagesField.php b/administrator/components/com_messages/src/Field/UserMessagesField.php index 4589cd94e9dda..ff6324dd8e30d 100644 --- a/administrator/components/com_messages/src/Field/UserMessagesField.php +++ b/administrator/components/com_messages/src/Field/UserMessagesField.php @@ -78,7 +78,7 @@ protected function getGroups() /** * Method to get the users to exclude from the list of users * - * @return array|null array of users to exclude or null to to not exclude them + * @return array|null array of users to exclude or null to not exclude them * * @since 1.6 */ diff --git a/administrator/language/en-GB/plg_content_pagenavigation.ini b/administrator/language/en-GB/plg_content_pagenavigation.ini index ae698f5398d5b..5b7f4f6ff3f2a 100644 --- a/administrator/language/en-GB/plg_content_pagenavigation.ini +++ b/administrator/language/en-GB/plg_content_pagenavigation.ini @@ -4,6 +4,7 @@ ; Note : All ini files need to be saved as UTF-8 PLG_CONTENT_PAGENAVIGATION="Content - Page Navigation" +PLG_PAGENAVIGATION_ARIA_LABEL="Page Navigation" PLG_PAGENAVIGATION_FIELD_DISPLAY_LABEL="Link Text" PLG_PAGENAVIGATION_FIELD_POSITION_LABEL="Position" PLG_PAGENAVIGATION_FIELD_RELATIVE_LABEL="Relative To" diff --git a/build/media_source/com_associations/js/sidebyside.es5.js b/build/media_source/com_associations/js/sidebyside.es5.js index 9c3b755a1d277..f4cc690ed00af 100644 --- a/build/media_source/com_associations/js/sidebyside.es5.js +++ b/build/media_source/com_associations/js/sidebyside.es5.js @@ -108,7 +108,7 @@ jQuery(document).ready(function($) { var target = document.getElementById('target-association'); var selected = $(this).val(); - // Populate the data attributes and load the the edit page in target frame. + // Populate the data attributes and load the edit page in target frame. if (selected !== '' && typeof selected !== 'undefined') { target.setAttribute('data-action', selected.split(':')[2]); target.setAttribute('data-id', selected.split(':')[1]); diff --git a/cypress.config.dist.js b/cypress.config.dist.mjs similarity index 89% rename from cypress.config.dist.js rename to cypress.config.dist.mjs index c402c269e5db0..e4d00070815a3 100644 --- a/cypress.config.dist.js +++ b/cypress.config.dist.mjs @@ -1,7 +1,7 @@ -const { defineConfig } = require('cypress'); -const setupPlugins = require('./tests/System/plugins/index'); +import { defineConfig } from 'cypress'; +import setupPlugins from './tests/System/plugins/index.mjs'; -module.exports = defineConfig({ +export default defineConfig({ fixturesFolder: 'tests/System/fixtures', videosFolder: 'tests/System/output/videos', screenshotsFolder: 'tests/System/output/screenshots', diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql index 4c619994a11db..82c068008e121 100644 --- a/installation/sql/mysql/base.sql +++ b/installation/sql/mysql/base.sql @@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS `#__assets` ( `lft` int NOT NULL DEFAULT 0 COMMENT 'Nested set lft.', `rgt` int NOT NULL DEFAULT 0 COMMENT 'Nested set rgt.', `level` int unsigned NOT NULL COMMENT 'The cached level in the nested tree.', - `name` varchar(50) NOT NULL COMMENT 'The unique name for the asset.\n', + `name` varchar(50) NOT NULL COMMENT 'The unique name for the asset.', `title` varchar(100) NOT NULL COMMENT 'The descriptive title for the asset.', `rules` varchar(5120) NOT NULL COMMENT 'JSON encoded access control.', PRIMARY KEY (`id`), diff --git a/libraries/src/Form/Field/UserField.php b/libraries/src/Form/Field/UserField.php index 49331d06b263f..305bb8e6f0c75 100644 --- a/libraries/src/Form/Field/UserField.php +++ b/libraries/src/Form/Field/UserField.php @@ -164,7 +164,7 @@ protected function getGroups() /** * Method to get the users to exclude from the list of users * - * @return string[] Array of users to exclude or null to to not exclude them + * @return string[] Array of users to exclude or null to not exclude them * * @since 1.6 */ diff --git a/libraries/src/HTML/Helpers/Select.php b/libraries/src/HTML/Helpers/Select.php index 71c232381eea6..a5faf6466a00b 100644 --- a/libraries/src/HTML/Helpers/Select.php +++ b/libraries/src/HTML/Helpers/Select.php @@ -356,10 +356,10 @@ public static function integerlist($start, $end, $inc, $name, $attribs = null, $ * option.label: The property in each option array to use as the * selection label attribute. If a "label" option is provided, defaults to * "label", if no label is given, defaults to null (none). - * option.text: The property that will hold the the displayed text. + * option.text: The property that will hold the displayed text. * Defaults to "text". If set to null, the option array is assumed to be a * list of displayable scalars. - * @param string $optText The property that will hold the the displayed text. This + * @param string $optText The property that will hold the displayed text. This * parameter is ignored if an options array is passed. * @param boolean $disable Not used. * @@ -451,7 +451,7 @@ public static function option($value, $text = '', $optKey = 'value', $optText = * Defaults to "disable". * -option.key: The property that will hold the selection value. * Defaults to "value". - * -option.text: The property that will hold the the displayed text. + * -option.text: The property that will hold the displayed text. * Defaults to "text". If set to null, the option array is assumed to be a * list of displayable scalars. * @param string $optText The name of the object variable for the option text. diff --git a/libraries/src/Helper/TagsHelper.php b/libraries/src/Helper/TagsHelper.php index 9da9eb0ddef45..f5c69e18bf648 100644 --- a/libraries/src/Helper/TagsHelper.php +++ b/libraries/src/Helper/TagsHelper.php @@ -297,7 +297,7 @@ public function createTagsFromField($tags) } /** - * Method to delete the tag mappings and #__ucm_content record for for an item + * Method to delete the tag mappings and #__ucm_content record for an item * * @param TableInterface $table Table object of content table where delete occurred * @param integer|array $contentItemId ID of the content item. Or an array of key/value pairs with array key @@ -338,7 +338,7 @@ public function deleteTagData(TableInterface $table, $contentItemId) * @param integer $id Id of the item to retrieve tags for. * @param boolean $getTagData If true, data from the tags table will be included, defaults to true. * - * @return array Array of of tag objects + * @return array Array of tag objects * * @since 3.1 */ @@ -397,7 +397,7 @@ public function getItemTags($contentType, $id, $getTagData = true) * @param array $ids Id of the item to retrieve tags for. * @param boolean $getTagData If true, data from the tags table will be included, defaults to true. * - * @return array Array of of tag objects grouped by Id. + * @return array Array of tag objects grouped by Id. * * @since 4.2.0 */ @@ -766,7 +766,7 @@ public function getTagTreeArray($id, &$tagTreeArray = []) * @param array $selectTypes Optional array of type ids or aliases to limit the results to. Often from a request. * @param boolean $useAlias If true, the alias is used to match, if false the type_id is used. * - * @return array Array of of types + * @return array Array of types * * @since 3.1 */ diff --git a/libraries/src/Layout/BaseLayout.php b/libraries/src/Layout/BaseLayout.php index 212a6e40e574d..2fe6a69a95fc0 100644 --- a/libraries/src/Layout/BaseLayout.php +++ b/libraries/src/Layout/BaseLayout.php @@ -266,7 +266,7 @@ public function set($key, $value) } /** - * Set the the data passed the layout + * Set the data passed the layout * * @param array $data Array with the data for the layout * diff --git a/libraries/src/MVC/View/HtmlView.php b/libraries/src/MVC/View/HtmlView.php index b76f2636fc4c7..d98a9dc746e44 100644 --- a/libraries/src/MVC/View/HtmlView.php +++ b/libraries/src/MVC/View/HtmlView.php @@ -347,7 +347,7 @@ public function addHelperPath($path) * * @param string $tpl The name of the template source file; automatically searches the template paths and compiles as needed. * - * @return string The output of the the template script. + * @return string The output of the template script. * * @since 3.0 * @throws \Exception diff --git a/plugins/content/pagenavigation/tmpl/default.php b/plugins/content/pagenavigation/tmpl/default.php index 1245c39e3d4ac..d9b8bcc5d7a50 100644 --- a/plugins/content/pagenavigation/tmpl/default.php +++ b/plugins/content/pagenavigation/tmpl/default.php @@ -13,10 +13,12 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; +$this->loadLanguage(); + $lang = $this->getLanguage(); ?> -