diff --git a/administrator/components/com_fields/src/Helper/FieldsHelper.php b/administrator/components/com_fields/src/Helper/FieldsHelper.php index a80d834387ace..ca41ddc57b050 100644 --- a/administrator/components/com_fields/src/Helper/FieldsHelper.php +++ b/administrator/components/com_fields/src/Helper/FieldsHelper.php @@ -240,7 +240,7 @@ function ($f) { 'context' => $context, 'item' => $item, 'subject' => $field, - 'value' => &$value, // @todo: Remove reference in Joomla 6, see AfterPrepareFieldEvent::__constructor() + 'value' => $value, ]); $dispatcher->dispatch('onCustomFieldsAfterPrepareField', $eventAfter); $value = $eventAfter->getValue(); diff --git a/administrator/components/com_installer/src/Model/InstallModel.php b/administrator/components/com_installer/src/Model/InstallModel.php index 12c6cc02088a5..63b9eff414a19 100644 --- a/administrator/components/com_installer/src/Model/InstallModel.php +++ b/administrator/components/com_installer/src/Model/InstallModel.php @@ -98,7 +98,7 @@ public function install() // (e.g. from a \JSON description). $eventBefore = new BeforeInstallationEvent('onInstallerBeforeInstallation', [ 'subject' => $this, - 'package' => &$package, // @todo: Remove reference in Joomla 6, see InstallerEvent::__constructor() + 'package' => $package, ]); $results = $dispatcher->dispatch('onInstallerBeforeInstallation', $eventBefore)->getArgument('result', []); $package = $eventBefore->getPackage(); @@ -145,7 +145,7 @@ public function install() // This event allows a custom installation of the package or a customization of the package: $eventBeforeInst = new BeforeInstallerEvent('onInstallerBeforeInstaller', [ 'subject' => $this, - 'package' => &$package, // @todo: Remove reference in Joomla 6, see InstallerEvent::__constructor() + 'package' => $package, ]); $results = $dispatcher->dispatch('onInstallerBeforeInstaller', $eventBeforeInst)->getArgument('result', []); $package = $eventBeforeInst->getPackage(); @@ -227,10 +227,10 @@ public function install() // This event allows a custom a post-flight: $eventAfterInst = new AfterInstallerEvent('onInstallerAfterInstaller', [ 'subject' => $this, - 'package' => &$package, // @todo: Remove reference in Joomla 6, see InstallerEvent::__constructor() + 'package' => $package, 'installer' => $installer, - 'installerResult' => &$result, // @todo: Remove reference in Joomla 6, see AfterInstallerEvent::__constructor() - 'message' => &$msg, // @todo: Remove reference in Joomla 6, see AfterInstallerEvent::__constructor() + 'installerResult' => $result, + 'message' => $msg, ]); $dispatcher->dispatch('onInstallerAfterInstaller', $eventAfterInst); $package = $eventAfterInst->getPackage(); diff --git a/administrator/components/com_menus/src/Helper/MenusHelper.php b/administrator/components/com_menus/src/Helper/MenusHelper.php index 57c2d81dd3044..dbfa89a64c12e 100644 --- a/administrator/components/com_menus/src/Helper/MenusHelper.php +++ b/administrator/components/com_menus/src/Helper/MenusHelper.php @@ -450,7 +450,7 @@ protected static function installPresetItems($node, $menutype) $dispatcher = Factory::getApplication()->getDispatcher(); $items = $dispatcher->dispatch('onPreprocessMenuItems', new PreprocessMenuItemsEvent('onPreprocessMenuItems', [ 'context' => 'com_menus.administrator.import', - 'subject' => &$items, // @todo: Remove reference in Joomla 6, see PreprocessMenuItemsEvent::__constructor() + 'subject' => $items, 'params' => null, 'enabled' => true, ]))->getArgument('subject', $items); diff --git a/administrator/components/com_menus/src/Model/MenutypesModel.php b/administrator/components/com_menus/src/Model/MenutypesModel.php index 1f3acec65a872..6fc9323085fc8 100644 --- a/administrator/components/com_menus/src/Model/MenutypesModel.php +++ b/administrator/components/com_menus/src/Model/MenutypesModel.php @@ -127,7 +127,7 @@ public function getTypeOptions() // Allow a system plugin to insert dynamic menu types to the list shown in menus: return $this->getDispatcher()->dispatch('onAfterGetMenuTypeOptions', new AfterGetMenuTypeOptionsEvent('onAfterGetMenuTypeOptions', [ - 'items' => &$list, // @todo: Remove reference in Joomla 6, see AfterGetMenuTypeOptionsEvent::__constructor() + 'items' => $list, 'subject' => $this, ]))->getArgument('items', $list); } diff --git a/administrator/modules/mod_menu/src/Menu/CssMenu.php b/administrator/modules/mod_menu/src/Menu/CssMenu.php index 0b6fa25f280a6..0b06baecf6a8e 100644 --- a/administrator/modules/mod_menu/src/Menu/CssMenu.php +++ b/administrator/modules/mod_menu/src/Menu/CssMenu.php @@ -291,7 +291,7 @@ protected function preprocess($parent) */ $children = $dispatcher->dispatch('onPreprocessMenuItems', new PreprocessMenuItemsEvent('onPreprocessMenuItems', [ 'context' => 'com_menus.administrator.module', - 'subject' => &$children, // @todo: Remove reference in Joomla 6, see PreprocessMenuItemsEvent::__constructor() + 'subject' => $children, 'params' => $this->params, 'enabled' => $this->enabled, ]))->getArgument('subject', $children); diff --git a/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php b/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php index 828d1c0691883..769b354322305 100644 --- a/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php +++ b/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php @@ -61,7 +61,7 @@ public function getPrivacyPolicyInformation(CMSApplicationInterface $app) return $dispatcher->dispatch( 'onPrivacyCheckPrivacyPolicyPublished', new CheckPrivacyPolicyPublishedEvent('onPrivacyCheckPrivacyPolicyPublished', [ - 'subject' => &$policy, // @todo: Remove reference in Joomla 6, see CheckPrivacyPolicyPublishedEvent::__constructor() + 'subject' => $policy, ]) )->getArgument('subject', $policy); } diff --git a/administrator/modules/mod_submenu/src/Menu/Menu.php b/administrator/modules/mod_submenu/src/Menu/Menu.php index adf939c2ea12a..c1df4d5d8b8cc 100644 --- a/administrator/modules/mod_submenu/src/Menu/Menu.php +++ b/administrator/modules/mod_submenu/src/Menu/Menu.php @@ -55,7 +55,7 @@ public static function preprocess($parent) */ $children = $dispatcher->dispatch('onPreprocessMenuItems', new PreprocessMenuItemsEvent('onPreprocessMenuItems', [ 'context' => 'administrator.module.mod_submenu', - 'subject' => &$children, // @todo: Remove reference in Joomla 6, see PreprocessMenuItemsEvent::__constructor() + 'subject' => $children, 'params' => null, 'enabled' => true, ]))->getArgument('subject', $children); diff --git a/api/components/com_contact/src/Controller/ContactController.php b/api/components/com_contact/src/Controller/ContactController.php index e9f77ec0a790c..0998b853d8bfc 100644 --- a/api/components/com_contact/src/Controller/ContactController.php +++ b/api/components/com_contact/src/Controller/ContactController.php @@ -160,7 +160,7 @@ public function submitForm($id = null) // Validation succeeded, continue with custom handlers $results = $this->getDispatcher()->dispatch('onValidateContact', new ValidateContactEvent('onValidateContact', [ 'subject' => $contact, - 'data' => &$data, // @todo: Remove reference in Joomla 6, @deprecated: Data modification onValidateContact is not allowed, use onSubmitContact instead + 'data' => $data, ]))->getArgument('result', []); foreach ($results as $result) { @@ -172,7 +172,7 @@ public function submitForm($id = null) // Passed Validation: Process the contact plugins to integrate with other applications $event = $this->getDispatcher()->dispatch('onSubmitContact', new SubmitContactEvent('onSubmitContact', [ 'subject' => $contact, - 'data' => &$data, // @todo: Remove reference in Joomla 6, see SubmitContactEvent::__constructor() + 'data' => $data, ])); // Get the final data $data = $event->getArgument('data', $data); diff --git a/components/com_contact/src/Controller/ContactController.php b/components/com_contact/src/Controller/ContactController.php index 3ebab35ce7f9c..ad84ed076f54e 100644 --- a/components/com_contact/src/Controller/ContactController.php +++ b/components/com_contact/src/Controller/ContactController.php @@ -180,7 +180,7 @@ public function submit() // Validation succeeded, continue with custom handlers $results = $this->getDispatcher()->dispatch('onValidateContact', new ValidateContactEvent('onValidateContact', [ 'subject' => $contact, - 'data' => &$data, // @todo: Remove reference in Joomla 6, @deprecated: Data modification onValidateContact is not allowed, use onSubmitContact instead + 'data' => $data, ]))->getArgument('result', []); $passValidation = true; @@ -203,7 +203,7 @@ public function submit() // Passed Validation: Process the contact plugins to integrate with other applications $event = $this->getDispatcher()->dispatch('onSubmitContact', new SubmitContactEvent('onSubmitContact', [ 'subject' => $contact, - 'data' => &$data, // @todo: Remove reference in Joomla 6, see SubmitContactEvent::__constructor() + 'data' => $data, ])); // Get the final data $data = $event->getArgument('data', $data); diff --git a/libraries/src/Document/Renderer/Html/ModulesRenderer.php b/libraries/src/Document/Renderer/Html/ModulesRenderer.php index f245e57f1b425..fc494fc0dec24 100644 --- a/libraries/src/Document/Renderer/Html/ModulesRenderer.php +++ b/libraries/src/Document/Renderer/Html/ModulesRenderer.php @@ -60,7 +60,7 @@ public function render($position, $params = [], $content = null) // Dispatch onAfterRenderModules event $event = new Module\AfterRenderModulesEvent('onAfterRenderModules', [ - 'content' => &$buffer, // @todo: Remove reference in Joomla 7, see AfterRenderModulesEvent::__constructor() + 'content' => $buffer, 'attributes' => $params, ]); $app->getDispatcher()->dispatch('onAfterRenderModules', $event); diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php index 8ae3d7dfcf28f..04fa167d36f1a 100644 --- a/libraries/src/Helper/ModuleHelper.php +++ b/libraries/src/Helper/ModuleHelper.php @@ -208,7 +208,7 @@ public static function renderModule($module, $attribs = []) // If the $module is nulled it will return an empty content, otherwise it will render the module normally. $brEvent = $dispatcher->dispatch('onRenderModule', new Module\BeforeRenderModuleEvent('onRenderModule', [ 'subject' => $module, - 'attributes' => &$attribs, // @todo: Remove reference in Joomla 7, see BeforeRenderModuleEvent::__constructor() + 'attributes' => $attribs, ])); // Get final attributes $attribs = $brEvent->getArgument('attributes', $attribs); @@ -374,7 +374,7 @@ protected static function &load() $modules = []; $modules = $dispatcher->dispatch('onPrepareModuleList', new Module\PrepareModuleListEvent('onPrepareModuleList', [ - 'modules' => &$modules, // @todo: Remove reference in Joomla 7, see PrepareModuleListEvent::__constructor() + 'modules' => $modules, ]))->getArgument('modules', $modules); // If the onPrepareModuleList event returns an array of modules, then ignore the default module list creation @@ -383,13 +383,13 @@ protected static function &load() } $modules = $dispatcher->dispatch('onAfterModuleList', new Module\AfterModuleListEvent('onAfterModuleList', [ - 'modules' => &$modules, // @todo: Remove reference in Joomla 7, see AfterModuleListEvent::__constructor() + 'modules' => $modules, ]))->getArgument('modules', $modules); $modules = static::cleanModuleList($modules); $modules = $dispatcher->dispatch('onAfterCleanModuleList', new Module\AfterCleanModuleListEvent('onAfterCleanModuleList', [ - 'modules' => &$modules, // @todo: Remove reference in Joomla 7, see AfterCleanModuleListEvent::__constructor() + 'modules' => $modules, ]))->getArgument('modules', $modules); return $modules; diff --git a/libraries/src/Installer/InstallerHelper.php b/libraries/src/Installer/InstallerHelper.php index db864c96aa480..ef2a0c2451573 100644 --- a/libraries/src/Installer/InstallerHelper.php +++ b/libraries/src/Installer/InstallerHelper.php @@ -79,8 +79,8 @@ public static function downloadPackage($url, $target = false) $dispatcher = Factory::getApplication()->getDispatcher(); PluginHelper::importPlugin('installer', null, true, $dispatcher); $event = new BeforePackageDownloadEvent('onInstallerBeforePackageDownload', [ - 'url' => &$url, // @todo: Remove reference in Joomla 7, see BeforePackageDownloadEvent::__constructor() - 'headers' => &$headers, // @todo: Remove reference in Joomla 7, see BeforePackageDownloadEvent::__constructor() + 'url' => $url, + 'headers' => $headers, ]); $dispatcher->dispatch('onInstallerBeforePackageDownload', $event); $url = $event->getArgument('url', $url); diff --git a/libraries/src/MVC/Model/FormBehaviorTrait.php b/libraries/src/MVC/Model/FormBehaviorTrait.php index 35dede28711c0..d07908ea436c9 100644 --- a/libraries/src/MVC/Model/FormBehaviorTrait.php +++ b/libraries/src/MVC/Model/FormBehaviorTrait.php @@ -162,7 +162,7 @@ protected function preprocessData($context, &$data, $group = 'content') 'onContentPrepareData', new Model\PrepareDataEvent('onContentPrepareData', [ 'context' => $context, - 'data' => &$data, // @todo: Remove reference in Joomla 7, see PrepareDataEvent::__constructor() + 'data' => $data, 'subject' => new \stdClass(), ]) )->getArgument('data', $data); diff --git a/libraries/src/MVC/Model/FormModel.php b/libraries/src/MVC/Model/FormModel.php index 545ae15e0f844..9ab96ef081726 100644 --- a/libraries/src/MVC/Model/FormModel.php +++ b/libraries/src/MVC/Model/FormModel.php @@ -206,13 +206,13 @@ public function validate($form, $data, $group = null) $data = $dispatcher->dispatch('onUserBeforeDataValidation', new Model\BeforeValidateDataEvent('onUserBeforeDataValidation', [ 'subject' => $form, - 'data' => &$data, // @todo: Remove reference in Joomla 7, see BeforeValidateDataEvent::__constructor() + 'data' => $data, ]))->getArgument('data', $data); } $data = $dispatcher->dispatch('onContentBeforeValidateData', new Model\BeforeValidateDataEvent('onContentBeforeValidateData', [ 'subject' => $form, - 'data' => &$data, // @todo: Remove reference in Joomla 7, see AfterRenderModulesEvent::__constructor() + 'data' => $data, ]))->getArgument('data', $data); // Filter and validate the form data.