Skip to content

Commit fbd724d

Browse files
HLeithnerrichard67brianteemanbembelimenlaoneo
authored
[6.0] Introduce Joomla 6.0 compatibility plugin (joomla#45480)
* Create backward compatibility 6 plugin * Moved relevant code from old compat plugin and removed it considered changes from prs: joomla#44926 joomla#44240 joomla#44638 joomla#44700 joomla#43209 joomla#43958 joomla#42884 * Add new plugin on install and uninstall old plugin * Remove compat media folder, add compat6 removed.asset.json * Fix cs exceptions * Update ExtensionHelper * Rename Compat.php to Compat6.php * Disable compat6 plugin for system tests * Update administrator/language/en-GB/plg_behaviour_compat6.ini Co-authored-by: Brian Teeman <[email protected]> * Update plugins/behaviour/compat6/compat6.xml Co-authored-by: Brian Teeman <[email protected]> * Update plugins/behaviour/compat6/compat6.xml Co-authored-by: Brian Teeman <[email protected]> * Update administrator/language/en-GB/plg_behaviour_compat6.ini Co-authored-by: Brian Teeman <[email protected]> * Update administrator/language/en-GB/plg_behaviour_compat6.sys.ini Co-authored-by: Brian Teeman <[email protected]> * Update plugins/behaviour/compat6/src/Extension/Compat6.php * Restore class aliases from compat 5 plugin * Relocate files from joomla#44925 * Apply language string improvement from review suggestion Co-authored-by: Brian Teeman <[email protected]> * Update plugins/behaviour/compat6/src/Extension/Compat6.php Co-authored-by: Allon Moritz <[email protected]> * Update plugins/behaviour/compat6/compat6.xml Co-authored-by: Allon Moritz <[email protected]> * Update installation/sql/mysql/base.sql Co-authored-by: Richard Fath <[email protected]> * Update installation/sql/postgresql/base.sql Co-authored-by: Richard Fath <[email protected]> * Fix wrong folder in uninstallation of compat (5) plugin. --------- Co-authored-by: Richard Fath <[email protected]> Co-authored-by: Richard Fath <[email protected]> Co-authored-by: Brian Teeman <[email protected]> Co-authored-by: Benjamin Trenkle <[email protected]> Co-authored-by: Allon Moritz <[email protected]>
1 parent aa7980a commit fbd724d

File tree

41 files changed

+128
-1384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+128
-1384
lines changed

administrator/components/com_admin/script.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@ protected function uninstallExtensions()
287287
* ['type' => 'plugin', 'element' => 'demotasks', 'folder' => 'task', 'client_id' => 0, 'pre_function' => null],
288288
* ['type' => 'plugin', 'element' => 'compat', 'folder' => 'system', 'client_id' => 0, 'pre_function' => 'migrateCompatPlugin'],
289289
*/
290+
// Uninstall the old joomla 5 compatibility plugin
291+
['type' => 'plugin', 'element' => 'compat', 'folder' => 'behaviour', 'client_id' => 0, 'pre_function' => null],
290292
];
291293

292294
$db = Factory::getDbo();

administrator/language/en-GB/plg_behaviour_compat.ini

Lines changed: 0 additions & 15 deletions
This file was deleted.

administrator/language/en-GB/plg_behaviour_compat.sys.ini

Lines changed: 0 additions & 7 deletions
This file was deleted.

administrator/language/en-GB/plg_behaviour_compat6.ini

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,10 @@
44
; Note : All ini files need to be saved as UTF-8
55

66
PLG_BEHAVIOUR_COMPAT6="Behaviour - Backward Compatibility 6"
7-
PLG_COMPAT6_XML_DESCRIPTION="This plugin should be enabled before updating to Joomla 6."
7+
PLG_COMPAT6_FIELD_CLASSES_ALIASES_DESCRIPTION="Add class aliases for classes which have been renamed or moved to a namespace."
8+
PLG_COMPAT6_FIELD_CLASSES_ALIASES_LABEL="Classes Aliases"
9+
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/."
10+
PLG_COMPAT6_FIELD_LEGACY_CLASSES_LABEL="Include Deprecated Classes"
11+
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."
12+
PLG_COMPAT6_FIELD_REMOVED_ASSETS_LABEL="Removed Assets"
13+
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."

administrator/language/en-GB/plg_behaviour_compat6.sys.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
; Note : All ini files need to be saved as UTF-8
55

66
PLG_BEHAVIOUR_COMPAT6="Behaviour - Backward Compatibility 6"
7-
PLG_COMPAT6_XML_DESCRIPTION="This plugin should be enabled before updating to Joomla 6."
7+
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."

0 commit comments

Comments
 (0)