diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 0a37ad74b58c5..17b15d011707a 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -287,6 +287,8 @@ protected function uninstallExtensions() * ['type' => 'plugin', 'element' => 'demotasks', 'folder' => 'task', 'client_id' => 0, 'pre_function' => null], * ['type' => 'plugin', 'element' => 'compat', 'folder' => 'system', 'client_id' => 0, 'pre_function' => 'migrateCompatPlugin'], */ + // Uninstall the old joomla 5 compatibility plugin + ['type' => 'plugin', 'element' => 'compat', 'folder' => 'behaviour', 'client_id' => 0, 'pre_function' => null], ]; $db = Factory::getDbo(); diff --git a/administrator/language/en-GB/plg_behaviour_compat.ini b/administrator/language/en-GB/plg_behaviour_compat.ini deleted file mode 100644 index 28e45d712c7b7..0000000000000 --- a/administrator/language/en-GB/plg_behaviour_compat.ini +++ /dev/null @@ -1,15 +0,0 @@ -; Joomla! Project -; (C) 2023 Open Source Matters, Inc. -; License GNU General Public License version 2 or later; see LICENSE.txt -; Note : All ini files need to be saved as UTF-8 - -PLG_BEHAVIOUR_COMPAT="Behaviour - Backward Compatibility" -PLG_COMPAT_FIELD_CLASSES_ALIASES_LABEL="Classes Aliases" -PLG_COMPAT_FIELD_CLASSES_ALIASES_DESCRIPTION="Add class aliases for classes which have been renamed or moved to a namespace." -PLG_COMPAT_FIELD_ES5_ASSETS_DESCRIPTION="Activate this option if your extension requires *.es5 assets which has resulted in an exception. The assets provided are empty but prevent the exception." -PLG_COMPAT_FIELD_ES5_ASSETS_LABEL="ES5 Assets" -PLG_COMPAT_FIELD_LEGACY_CLASSES_DESCRIPTION="Activate this option if your extension requires classes deprecated for the current version of Joomla. This includes those removed classes from the folder /plugins/behavior/compat/classes/." -PLG_COMPAT_FIELD_LEGACY_CLASSES_LABEL="Include Deprecated Classes" -PLG_COMPAT_FIELD_REMOVED_ASSETS_DESCRIPTION="Activate this option if your extension requires removed assets which has resulted in an exception. The assets provided are empty but prevent the exception." -PLG_COMPAT_FIELD_REMOVED_ASSETS_LABEL="Removed Assets" -PLG_COMPAT_XML_DESCRIPTION="If you use extensions which are not using the current Joomla Coding standards then this plugin, when enabled, will provide backward compatibility to the prior major version." diff --git a/administrator/language/en-GB/plg_behaviour_compat.sys.ini b/administrator/language/en-GB/plg_behaviour_compat.sys.ini deleted file mode 100644 index 405d5a6c97b0d..0000000000000 --- a/administrator/language/en-GB/plg_behaviour_compat.sys.ini +++ /dev/null @@ -1,7 +0,0 @@ -; Joomla! Project -; (C) 2023 Open Source Matters, Inc. -; License GNU General Public License version 2 or later; see LICENSE.txt -; Note : All ini files need to be saved as UTF-8 - -PLG_BEHAVIOUR_COMPAT="Behaviour - Backward Compatibility" -PLG_COMPAT_XML_DESCRIPTION="Provides backward compatibility to the prior major version." diff --git a/administrator/language/en-GB/plg_behaviour_compat6.ini b/administrator/language/en-GB/plg_behaviour_compat6.ini index d550624dcc1b9..421c8d8d8890a 100644 --- a/administrator/language/en-GB/plg_behaviour_compat6.ini +++ b/administrator/language/en-GB/plg_behaviour_compat6.ini @@ -4,4 +4,10 @@ ; Note : All ini files need to be saved as UTF-8 PLG_BEHAVIOUR_COMPAT6="Behaviour - Backward Compatibility 6" -PLG_COMPAT6_XML_DESCRIPTION="This plugin should be enabled before updating to Joomla 6." +PLG_COMPAT6_FIELD_CLASSES_ALIASES_DESCRIPTION="Add class aliases for classes which have been renamed or moved to a namespace." +PLG_COMPAT6_FIELD_CLASSES_ALIASES_LABEL="Classes Aliases" +PLG_COMPAT6_FIELD_LEGACY_CLASSES_DESCRIPTION="Activate this option if your extension requires previously deprecated classes removed from the current version of Joomla. These removed classes can be found in the folder /plugins/behavior/compat6/classes/." +PLG_COMPAT6_FIELD_LEGACY_CLASSES_LABEL="Include Deprecated Classes" +PLG_COMPAT6_FIELD_REMOVED_ASSETS_DESCRIPTION="Activate this option if your extension requires removed assets which has resulted in an exception. The assets provided are empty but prevent the exception." +PLG_COMPAT6_FIELD_REMOVED_ASSETS_LABEL="Removed Assets" +PLG_COMPAT6_XML_DESCRIPTION="If you use extensions which are not using the current Joomla Coding standards then this plugin, when enabled, will provide backward compatibility to the previous major version, Joomla 5." diff --git a/administrator/language/en-GB/plg_behaviour_compat6.sys.ini b/administrator/language/en-GB/plg_behaviour_compat6.sys.ini index d550624dcc1b9..e412f703d03f9 100644 --- a/administrator/language/en-GB/plg_behaviour_compat6.sys.ini +++ b/administrator/language/en-GB/plg_behaviour_compat6.sys.ini @@ -4,4 +4,4 @@ ; Note : All ini files need to be saved as UTF-8 PLG_BEHAVIOUR_COMPAT6="Behaviour - Backward Compatibility 6" -PLG_COMPAT6_XML_DESCRIPTION="This plugin should be enabled before updating to Joomla 6." +PLG_COMPAT6_XML_DESCRIPTION="If you use extensions which are not using the current Joomla Coding standards then this plugin, when enabled, will provide backward compatibility to the previous major version, Joomla 5." diff --git a/build/media_source/plg_behaviour_compat/es5.asset.json b/build/media_source/plg_behaviour_compat/es5.asset.json deleted file mode 100644 index a2d72ce8e848b..0000000000000 --- a/build/media_source/plg_behaviour_compat/es5.asset.json +++ /dev/null @@ -1,1092 +0,0 @@ -{ - "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json", - "name": "plg_behaviour_compat", - "version": "5.0.0", - "description": "Joomla CMS ES5 b/c entries, the entries are only placeholders without functionality.", - "license": "GPL-2.0-or-later", - "assets": [ - { - "name": "bootstrap.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_actionlogs.admin-actionlogs.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_admin.admin-help.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_associations.admin-associations-default.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_associations.admin-associations-modal.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_associations.associations-edit.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_banners.admin-banner-edit.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_cache.admin-cache.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_categories.shared-categories-accordion.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_config.config.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_config.modules.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_config.templates.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_config.filters.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_contact.admin-contacts-modal.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_contact.contacts-list.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_content.admin-article-pagebreak.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_content.admin-article-readmore.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_content.admin-articles-batch.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_content.admin-articles-stage.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_content.admin-articles-modal.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_content.form-edit.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_content.articles-list.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_content.articles-status.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_contenthistory.admin-compare-compare.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core", - "diff" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_contenthistory.admin-history-modal.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_contenthistory.admin-history-versions.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_cpanel.admin-addmodule.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_cpanel.admin-cpanel.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_cpanel.admin-system-loader.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_fields.admin-field-changecontext.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_fields.admin-field-edit.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_fields.admin-field-typehaschanged.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_fields.admin-fields-batch.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_fields.admin-fields-modal.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_finder.debug.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_finder.filters.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_finder.finder.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_finder.finder-edit.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_finder.indexer.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_finder.maps.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_installer.changelog.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_installer.installer.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_joomlaupdate.admin-update-es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core", - "bootstrap.modal" - ], - "attributes": { - "defer": true, - "nomodule": true - } - }, - { - "name": "com_joomlaupdate.default-es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "defer": true, - "nomodule": true - } - }, - { - "name": "com_languages.admin-language-edit-change-flag.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_languages.admin-override-edit-refresh-searchstring.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_languages.overrider.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_mails.admin-email-template-edit.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_media.edit-images.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_media.mediamanager.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core", - "messages" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_menus.admin-item-edit.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_menus.admin-item-edit-container.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_menus.admin-item-edit-modules.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_menus.admin-item-modal.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_menus.admin-items-modal.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_menus.admin-menus.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_menus.batch-body.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_modules.admin-module-edit.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_modules.admin-module-edit-assignment.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_modules.admin-module-search.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_modules.admin-modules-modal.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_modules.admin-select-modal.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_templates.admin-templates.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "showon.es5", - "type": "script", - "deprecated": true, - "dependencies": [ - "core" - ], - "uri": "", - "attributes": { - "defer": true, - "nomodule": true - } - }, - { - "name": "com_scheduler.test-task.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_scheduler.admin-view-select-task-search.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_scheduler.scheduler-config.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true - } - }, - { - "name": "com_tags.tag-default.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_tags.tag-list.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_tags.tags-default.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_templates.admin-template-toggle-assignment.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_templates.admin-template-toggle-switch.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_users.admin-users-groups.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_users.two-factor-focus.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_users.two-factor-list.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "com_workflow.admin-items-workflow-buttons.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "plg_multifactorauth_totp.setup.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "qrcode", - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "plg_multifactorauth_webauthn.webauthn.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "plg_system_guidedtours.guidedtours.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "plg_system_jooa11y.jooa11y-es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "defer": true, - "nomodule": true - } - }, - { - "name": "plg_system_schedulerunner.run-schedule.es5", - "type": "script", - "deprecated": true, - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "template.atum-es5", - "description": "The file containing the javascript for this template.", - "deprecated": true, - "type": "script", - "uri": "", - "dependencies": [ - "core" - ], - "attributes": { - "nomodule": true, - "defer": true - } - }, - { - "name": "keepalive.es5", - "type": "script", - "deprecated": true, - "dependencies": [ - "core" - ], - "uri": "", - "attributes": { - "defer": true, - "nomodule": true - } - } - ] -} diff --git a/build/media_source/plg_behaviour_compat/removed.asset.json b/build/media_source/plg_behaviour_compat6/removed.asset.json similarity index 56% rename from build/media_source/plg_behaviour_compat/removed.asset.json rename to build/media_source/plg_behaviour_compat6/removed.asset.json index 2255caad1a967..cc9cb5a8dbe14 100644 --- a/build/media_source/plg_behaviour_compat/removed.asset.json +++ b/build/media_source/plg_behaviour_compat6/removed.asset.json @@ -1,15 +1,9 @@ { "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json", - "name": "plg_behaviour_compat", - "version": "5.0.0", + "name": "plg_behaviour_compat6", + "version": "6.0.0", "description": "Joomla CMS Removed Assets b/c entries, the entries are only placeholders without functionality.", "license": "GPL-2.0-or-later", "assets": [ - { - "name": "com_scheduler.admin-view-select-task-css", - "type": "style", - "deprecated": true, - "uri": "" - } ] } diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql index e2cdf5a5a4f34..ceb492c368b6e 100644 --- a/installation/sql/mysql/base.sql +++ b/installation/sql/mysql/base.sql @@ -262,10 +262,9 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, (0, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, 1, '', '', '', 1, 0), (0, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0, 1, 1, 1, 1, '', '', '', 2, 0), (0, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, 1, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', '', 3, 0), -(0, 'plg_behaviour_compat', 'plugin', 'compat', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","es5_assets":"1"}', '', 1, 0), -(0, 'plg_behaviour_compat6', 'plugin', 'compat6', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 2, 0), -(0, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 3, 0), -(0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 4, 0), +(0, 'plg_behaviour_compat6', 'plugin', 'compat6', 'behaviour', 0, 0, 1, 0, 1, '', '{"classes_aliases":"0","legacy_classes":"1"}', '', 1, 0), +(0, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 2, 0), +(0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 3, 0), (0, 'plg_content_confirmconsent', 'plugin', 'confirmconsent', 'content', 0, 0, 1, 0, 1, '', '{}', '', 1, 0), (0, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, 1, '', '', '', 2, 0), (0, 'plg_content_emailcloak', 'plugin', 'emailcloak', 'content', 0, 1, 1, 0, 1, '', '{"mode":"1"}', '', 3, 0), diff --git a/installation/sql/postgresql/base.sql b/installation/sql/postgresql/base.sql index 7e3223aa46024..38c04fb8d2fcf 100644 --- a/installation/sql/postgresql/base.sql +++ b/installation/sql/postgresql/base.sql @@ -268,10 +268,9 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", (0, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, 1, '', '', '', 1, 0), (0, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0, 1, 1, 1, 1, '', '', '', 2, 0), (0, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, 1, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', '', 3, 0), -(0, 'plg_behaviour_compat', 'plugin', 'compat', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","es5_assets":"1"}', '', 1, 0), -(0, 'plg_behaviour_compat6', 'plugin', 'compat6', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 2, 0), -(0, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 3, 0), -(0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 4, 0), +(0, 'plg_behaviour_compat6', 'plugin', 'compat6', 'behaviour', 0, 0, 1, 0, 1, '', '{"classes_aliases":"0","legacy_classes":"1"}', '', 1, 0), +(0, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 2, 0), +(0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 3, 0), (0, 'plg_content_confirmconsent', 'plugin', 'confirmconsent', 'content', 0, 0, 1, 0, 1, '', '{}', '', 1, 0), (0, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, 1, '', '', '', 2, 0), (0, 'plg_content_emailcloak', 'plugin', 'emailcloak', 'content', 0, 1, 1, 0, 1, '', '{"mode":"1"}', '', 3, 0), diff --git a/libraries/src/Extension/ExtensionHelper.php b/libraries/src/Extension/ExtensionHelper.php index 6182bf8008d5c..f29b1277aa64f 100644 --- a/libraries/src/Extension/ExtensionHelper.php +++ b/libraries/src/Extension/ExtensionHelper.php @@ -173,7 +173,6 @@ class ExtensionHelper ['plugin', 'ldap', 'authentication', 0], // Core plugin extensions - behaviour - ['plugin', 'compat', 'behaviour', 0], ['plugin', 'compat6', 'behaviour', 0], ['plugin', 'taggable', 'behaviour', 0], ['plugin', 'versionable', 'behaviour', 0], diff --git a/plugins/behaviour/compat/compat.xml b/plugins/behaviour/compat/compat.xml deleted file mode 100644 index 2e7ebb14983fa..0000000000000 --- a/plugins/behaviour/compat/compat.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - plg_behaviour_compat - Joomla! Project - 2023-09 - (C) 2023 Open Source Matters, Inc. - GNU General Public License version 2 or later; see LICENSE.txt - admin@joomla.org - www.joomla.org - 5.0.0 - PLG_COMPAT_XML_DESCRIPTION - Joomla\Plugin\Behaviour\Compat - - classes - services - src - - - language/en-GB/plg_behaviour_compat.ini - language/en-GB/plg_behaviour_compat.sys.ini - - - -
- - - - - - - - - - - - - - - - -
- - - diff --git a/plugins/behaviour/compat/services/provider.php b/plugins/behaviour/compat/services/provider.php deleted file mode 100644 index b239608b70959..0000000000000 --- a/plugins/behaviour/compat/services/provider.php +++ /dev/null @@ -1,45 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -\defined('_JEXEC') or die; - -use Joomla\CMS\Extension\PluginInterface; -use Joomla\CMS\Factory; -use Joomla\CMS\Plugin\PluginHelper; -use Joomla\DI\Container; -use Joomla\DI\ServiceProviderInterface; -use Joomla\Event\DispatcherInterface; -use Joomla\Plugin\Behaviour\Compat\Extension\Compat; - -return new class () implements ServiceProviderInterface { - /** - * Registers the service provider with a DI container. - * - * @param Container $container The DI container. - * - * @return void - * @since 4.4.0 - */ - public function register(Container $container) - { - $container->set( - PluginInterface::class, - function (Container $container) { - $plugin = PluginHelper::getPlugin('behaviour', 'compat'); - $dispatcher = $container->get(DispatcherInterface::class); - - $plugin = new Compat($dispatcher, (array) $plugin); - $plugin->setApplication(Factory::getApplication()); - - return $plugin; - } - ); - } -}; diff --git a/plugins/behaviour/compat/src/Extension/Compat.php b/plugins/behaviour/compat/src/Extension/Compat.php deleted file mode 100644 index 3621783f74e2d..0000000000000 --- a/plugins/behaviour/compat/src/Extension/Compat.php +++ /dev/null @@ -1,125 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -namespace Joomla\Plugin\Behaviour\Compat\Extension; - -use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent; -use Joomla\CMS\Plugin\CMSPlugin; -use Joomla\Event\DispatcherInterface; -use Joomla\Event\Priority; -use Joomla\Event\SubscriberInterface; - -// phpcs:disable PSR1.Files.SideEffects -\defined('_JEXEC') or die; -// phpcs:enable PSR1.Files.SideEffects - -/** - * Joomla! Compat Plugin. - * - * @since 4.4.0 - */ -final class Compat extends CMSPlugin implements SubscriberInterface -{ - /** - * Returns an array of CMS events this plugin will listen to and the respective handlers. - * - * @return array - * - * @since 4.4.0 - */ - public static function getSubscribedEvents(): array - { - /** - * Note that onAfterInitialise must be the first handlers to run for this - * plugin to operate as expected. These handlers load compatibility code which - * might be needed by other plugins - */ - return [ - 'onAfterInitialiseDocument' => ['onAfterInitialiseDocument', Priority::HIGH], - ]; - } - - /** - * Constructor - * - * @param DispatcherInterface $dispatcher The event dispatcher - * @param array $config An optional associative array of configuration settings. - * Recognized key values include 'name', 'group', 'params', 'language' - * (this list is not meant to be comprehensive). - * - * @since 1.5 - */ - public function __construct(DispatcherInterface $dispatcher, array $config = []) - { - parent::__construct($dispatcher, $config); - - /** - * Normally we should never use the constructor to execute any logic which would - * affect other parts of the cms, but since we need to load class aliases as - * early as possible we load the class aliases in the constructor so behaviour and system plugins - * which depend on the JPlugin alias for example still are working - */ - - /** - * Load class names which are deprecated in joomla 4.0 and which will - * likely be removed in Joomla 6.0 - */ - if ($this->params->get('classes_aliases', '1')) { - require_once \dirname(__DIR__) . '/classmap/classmap.php'; - } - - /** - * Include classes which are removed in 7.0 - */ - if ($this->params->get('legacy_classes', '1')) { - \JLoader::registerNamespace('\\Joomla\\CMS', JPATH_PLUGINS . '/behaviour/compat/classes'); - } - - /** - * Load the constant early as it is used in class files before the class itself is loaded. - * @deprecated 4.4.0 will be removed in 7.0 - */ - \defined('JPATH_PLATFORM') or \define('JPATH_PLATFORM', __DIR__); - } - - /** - * We run as early as possible, this should be the first event - * - * @param AfterInitialiseDocumentEvent $event - * @return void - * - * @since 5.0.0 - */ - public function onAfterInitialiseDocument(AfterInitialiseDocumentEvent $event) - { - /** - * Load the es5 assets stubs, they are needed if an extension - * directly uses a core es5 asset which has no function in Joomla 5+ - * and only provides an empty asset to not throw an exception - */ - if ($this->params->get('es5_assets', '1')) { - $event->getDocument() - ->getWebAssetManager() - ->getRegistry() - ->addRegistryFile('media/plg_behaviour_compat/es5.asset.json'); - } - /** - * Load the removed assets stubs, they are needed if an extension - * directly uses a core asset from Joomla 4 which is not present in Joomla 5+ - * and only provides an empty asset to not throw an exception - */ - if ($this->params->get('removed_asset', '1')) { - $event->getDocument() - ->getWebAssetManager() - ->getRegistry() - ->addRegistryFile('media/plg_behaviour_compat/removed.asset.json'); - } - } -} diff --git a/plugins/behaviour/compat/classes/Application/BaseApplication.php b/plugins/behaviour/compat6/classes/Application/BaseApplication.php similarity index 100% rename from plugins/behaviour/compat/classes/Application/BaseApplication.php rename to plugins/behaviour/compat6/classes/Application/BaseApplication.php diff --git a/plugins/behaviour/compat/classes/Application/CLI/CliInput.php b/plugins/behaviour/compat6/classes/Application/CLI/CliInput.php similarity index 100% rename from plugins/behaviour/compat/classes/Application/CLI/CliInput.php rename to plugins/behaviour/compat6/classes/Application/CLI/CliInput.php diff --git a/plugins/behaviour/compat/classes/Application/CLI/CliOutput.php b/plugins/behaviour/compat6/classes/Application/CLI/CliOutput.php similarity index 100% rename from plugins/behaviour/compat/classes/Application/CLI/CliOutput.php rename to plugins/behaviour/compat6/classes/Application/CLI/CliOutput.php diff --git a/plugins/behaviour/compat/classes/Application/CLI/ColorStyle.php b/plugins/behaviour/compat6/classes/Application/CLI/ColorStyle.php similarity index 100% rename from plugins/behaviour/compat/classes/Application/CLI/ColorStyle.php rename to plugins/behaviour/compat6/classes/Application/CLI/ColorStyle.php diff --git a/plugins/behaviour/compat/classes/Application/CLI/Output/Processor/ColorProcessor.php b/plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ColorProcessor.php similarity index 100% rename from plugins/behaviour/compat/classes/Application/CLI/Output/Processor/ColorProcessor.php rename to plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ColorProcessor.php diff --git a/plugins/behaviour/compat/classes/Application/CLI/Output/Processor/ProcessorInterface.php b/plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ProcessorInterface.php similarity index 100% rename from plugins/behaviour/compat/classes/Application/CLI/Output/Processor/ProcessorInterface.php rename to plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ProcessorInterface.php diff --git a/plugins/behaviour/compat/classes/Application/CLI/Output/Stdout.php b/plugins/behaviour/compat6/classes/Application/CLI/Output/Stdout.php similarity index 100% rename from plugins/behaviour/compat/classes/Application/CLI/Output/Stdout.php rename to plugins/behaviour/compat6/classes/Application/CLI/Output/Stdout.php diff --git a/plugins/behaviour/compat/classes/Application/CLI/Output/Xml.php b/plugins/behaviour/compat6/classes/Application/CLI/Output/Xml.php similarity index 100% rename from plugins/behaviour/compat/classes/Application/CLI/Output/Xml.php rename to plugins/behaviour/compat6/classes/Application/CLI/Output/Xml.php diff --git a/plugins/behaviour/compat/classes/Application/CliApplication.php b/plugins/behaviour/compat6/classes/Application/CliApplication.php similarity index 100% rename from plugins/behaviour/compat/classes/Application/CliApplication.php rename to plugins/behaviour/compat6/classes/Application/CliApplication.php diff --git a/plugins/behaviour/compat/classes/Filesystem/File.php b/plugins/behaviour/compat6/classes/Filesystem/File.php similarity index 100% rename from plugins/behaviour/compat/classes/Filesystem/File.php rename to plugins/behaviour/compat6/classes/Filesystem/File.php diff --git a/plugins/behaviour/compat/classes/Filesystem/FilesystemHelper.php b/plugins/behaviour/compat6/classes/Filesystem/FilesystemHelper.php similarity index 100% rename from plugins/behaviour/compat/classes/Filesystem/FilesystemHelper.php rename to plugins/behaviour/compat6/classes/Filesystem/FilesystemHelper.php diff --git a/plugins/behaviour/compat/classes/Filesystem/Folder.php b/plugins/behaviour/compat6/classes/Filesystem/Folder.php similarity index 100% rename from plugins/behaviour/compat/classes/Filesystem/Folder.php rename to plugins/behaviour/compat6/classes/Filesystem/Folder.php diff --git a/plugins/behaviour/compat/classes/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini b/plugins/behaviour/compat6/classes/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini similarity index 100% rename from plugins/behaviour/compat/classes/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini rename to plugins/behaviour/compat6/classes/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini diff --git a/plugins/behaviour/compat/classes/Filesystem/Patcher.php b/plugins/behaviour/compat6/classes/Filesystem/Patcher.php similarity index 100% rename from plugins/behaviour/compat/classes/Filesystem/Patcher.php rename to plugins/behaviour/compat6/classes/Filesystem/Patcher.php diff --git a/plugins/behaviour/compat/classes/Filesystem/Path.php b/plugins/behaviour/compat6/classes/Filesystem/Path.php similarity index 100% rename from plugins/behaviour/compat/classes/Filesystem/Path.php rename to plugins/behaviour/compat6/classes/Filesystem/Path.php diff --git a/plugins/behaviour/compat/classes/Filesystem/Stream.php b/plugins/behaviour/compat6/classes/Filesystem/Stream.php similarity index 100% rename from plugins/behaviour/compat/classes/Filesystem/Stream.php rename to plugins/behaviour/compat6/classes/Filesystem/Stream.php diff --git a/plugins/behaviour/compat/classes/Filesystem/Streams/StreamString.php b/plugins/behaviour/compat6/classes/Filesystem/Streams/StreamString.php similarity index 100% rename from plugins/behaviour/compat/classes/Filesystem/Streams/StreamString.php rename to plugins/behaviour/compat6/classes/Filesystem/Streams/StreamString.php diff --git a/plugins/behaviour/compat/classes/Filesystem/Support/StringController.php b/plugins/behaviour/compat6/classes/Filesystem/Support/StringController.php similarity index 100% rename from plugins/behaviour/compat/classes/Filesystem/Support/StringController.php rename to plugins/behaviour/compat6/classes/Filesystem/Support/StringController.php diff --git a/plugins/behaviour/compat/classes/Input/Cookie.php b/plugins/behaviour/compat6/classes/Input/Cookie.php similarity index 100% rename from plugins/behaviour/compat/classes/Input/Cookie.php rename to plugins/behaviour/compat6/classes/Input/Cookie.php diff --git a/plugins/behaviour/compat/classes/Input/Files.php b/plugins/behaviour/compat6/classes/Input/Files.php similarity index 100% rename from plugins/behaviour/compat/classes/Input/Files.php rename to plugins/behaviour/compat6/classes/Input/Files.php diff --git a/plugins/behaviour/compat/classes/Input/Input.php b/plugins/behaviour/compat6/classes/Input/Input.php similarity index 100% rename from plugins/behaviour/compat/classes/Input/Input.php rename to plugins/behaviour/compat6/classes/Input/Input.php diff --git a/plugins/behaviour/compat/classes/Input/Json.php b/plugins/behaviour/compat6/classes/Input/Json.php similarity index 100% rename from plugins/behaviour/compat/classes/Input/Json.php rename to plugins/behaviour/compat6/classes/Input/Json.php diff --git a/plugins/behaviour/compat6/compat6.xml b/plugins/behaviour/compat6/compat6.xml index 793dbd5a761b3..0ab8cadab9620 100644 --- a/plugins/behaviour/compat6/compat6.xml +++ b/plugins/behaviour/compat6/compat6.xml @@ -7,10 +7,11 @@ GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org - 5.4.0 + 6.0.0 PLG_COMPAT6_XML_DESCRIPTION Joomla\Plugin\Behaviour\Compat6 + classes services src @@ -18,4 +19,35 @@ language/en-GB/plg_behaviour_compat6.ini language/en-GB/plg_behaviour_compat6.sys.ini + + +
+ + + + + + + + + +
+ + diff --git a/plugins/behaviour/compat6/src/Extension/Compat6.php b/plugins/behaviour/compat6/src/Extension/Compat6.php index b4ad8bf437862..a7900a597bb37 100644 --- a/plugins/behaviour/compat6/src/Extension/Compat6.php +++ b/plugins/behaviour/compat6/src/Extension/Compat6.php @@ -10,7 +10,10 @@ namespace Joomla\Plugin\Behaviour\Compat6\Extension; +use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent; use Joomla\CMS\Plugin\CMSPlugin; +use Joomla\Event\DispatcherInterface; +use Joomla\Event\Priority; use Joomla\Event\SubscriberInterface; // phpcs:disable PSR1.Files.SideEffects @@ -34,8 +37,78 @@ final class Compat6 extends CMSPlugin implements SubscriberInterface public static function getSubscribedEvents(): array { /** - * This plugin does not listen to any events. + * Note that onAfterInitialise must be the first handlers to run for this + * plugin to operate as expected. These handlers load compatibility code which + * might be needed by other plugins */ - return []; + return [ + 'onAfterInitialiseDocument' => ['onAfterInitialiseDocument', Priority::HIGH], + ]; + } + + /** + * Constructor + * + * @param DispatcherInterface $dispatcher The event dispatcher + * @param array $config An optional associative array of configuration settings. + * Recognized key values include 'name', 'group', 'params', 'language' + * (this list is not meant to be comprehensive). + * + * @since 5.4.0 + */ + public function __construct(DispatcherInterface $dispatcher, array $config = []) + { + parent::__construct($dispatcher, $config); + + /** + * Normally we should never use the constructor to execute any logic which would + * affect other parts of the cms, but since we need to load class aliases as + * early as possible we load the class aliases in the constructor so behaviour and system plugins + * which depend on the JPlugin alias for example still are working + */ + + /** + * Load class names which are deprecated since joomla 4.0 and which will + * likely be removed in Joomla 7.0 + */ + if ($this->params->get('classes_aliases', '0')) { + require_once \dirname(__DIR__) . '/classmap/classmap.php'; + } + + /** + * Include classes which will likely be removed in 7.0 + */ + if ($this->params->get('legacy_classes', '1')) { + \JLoader::registerNamespace('\\Joomla\\CMS', JPATH_PLUGINS . '/behaviour/compat6/classes'); + } + + /** + * Load the constant early as it is used in class files before the class itself is loaded. + * @deprecated 4.4.0 will be removed in 7.0 + */ + \defined('JPATH_PLATFORM') or \define('JPATH_PLATFORM', __DIR__); + } + + /** + * We run as early as possible, this should be the first event + * + * @param AfterInitialiseDocumentEvent $event + * @return void + * + * @since 5.4.0 + */ + public function onAfterInitialiseDocument(AfterInitialiseDocumentEvent $event) + { + /** + * Load the removed assets stubs, they are needed if an extension + * directly uses a core asset from Joomla 5 which is not present in Joomla 6 + * and only provides an empty asset to not throw an exception + */ + if ($this->params->get('removed_asset', '1')) { + $event->getDocument() + ->getWebAssetManager() + ->getRegistry() + ->addRegistryFile('media/plg_behaviour_compat6/removed.asset.json'); + } } } diff --git a/plugins/behaviour/compat/src/classmap/classmap.php b/plugins/behaviour/compat6/src/classmap/classmap.php similarity index 100% rename from plugins/behaviour/compat/src/classmap/classmap.php rename to plugins/behaviour/compat6/src/classmap/classmap.php diff --git a/plugins/behaviour/compat/src/classmap/extensions.classmap.php b/plugins/behaviour/compat6/src/classmap/extensions.classmap.php similarity index 100% rename from plugins/behaviour/compat/src/classmap/extensions.classmap.php rename to plugins/behaviour/compat6/src/classmap/extensions.classmap.php diff --git a/ruleset.xml b/ruleset.xml index 2a35166baa154..972fa4d12a8e0 100644 --- a/ruleset.xml +++ b/ruleset.xml @@ -9,7 +9,7 @@ ^cache/* ^media/* ^node_modules/* - ^plugins/behaviour/compat/classes/* + ^plugins/behaviour/compat6/classes/* ^tmp/* diff --git a/tests/System/integration/install/Installation.cy.js b/tests/System/integration/install/Installation.cy.js index fd3f1ccc6088b..df763cc99a3ca 100644 --- a/tests/System/integration/install/Installation.cy.js +++ b/tests/System/integration/install/Installation.cy.js @@ -20,7 +20,7 @@ describe('Install Joomla', () => { cy.installJoomla(config); // Disable compat plugin - cy.db_enableExtension(0, 'plg_behaviour_compat'); + cy.db_enableExtension(0, 'plg_behaviour_compat6'); cy.doAdministratorLogin(config.username, config.password, false); cy.cancelTour();