From 51639ffd3aa739335ab8e6c9d7ddc70960c4546d Mon Sep 17 00:00:00 2001 From: TheCartpenter Date: Wed, 8 May 2024 08:08:38 -0400 Subject: [PATCH] Removed mixed type parameters on event outputs --- upload/admin/controller/event/currency.php | 2 +- upload/admin/controller/event/language.php | 2 +- upload/admin/controller/event/statistics.php | 8 +++---- .../controller/extension/advertise/google.php | 6 ++--- .../extension/extension/promotion.php | 2 +- upload/admin/controller/mail/affiliate.php | 4 ++-- upload/admin/controller/mail/customer.php | 4 ++-- upload/admin/controller/mail/forgotten.php | 2 +- upload/admin/controller/mail/gdpr.php | 2 +- upload/admin/controller/mail/returns.php | 2 +- upload/admin/controller/mail/reward.php | 2 +- upload/admin/controller/mail/subscription.php | 2 +- upload/admin/controller/mail/transaction.php | 2 +- upload/catalog/controller/event/activity.php | 24 +++++++++---------- upload/catalog/controller/event/debug.php | 2 +- upload/catalog/controller/event/language.php | 2 +- .../catalog/controller/event/statistics.php | 6 ++--- .../controller/extension/advertise/google.php | 14 +++++------ .../extension/module/fraudlabspro.php | 2 +- .../extension/payment/amazon_login_pay.php | 2 +- .../controller/extension/payment/paypal.php | 2 +- .../controller/extension/total/voucher.php | 2 +- upload/catalog/controller/mail/affiliate.php | 4 ++-- upload/catalog/controller/mail/forgotten.php | 2 +- upload/catalog/controller/mail/gdpr.php | 4 ++-- upload/catalog/controller/mail/register.php | 4 ++-- .../catalog/controller/mail/subscription.php | 4 ++-- .../catalog/controller/mail/transaction.php | 2 +- 28 files changed, 58 insertions(+), 58 deletions(-) diff --git a/upload/admin/controller/event/currency.php b/upload/admin/controller/event/currency.php index 1bd096e02..851b4f63d 100644 --- a/upload/admin/controller/event/currency.php +++ b/upload/admin/controller/event/currency.php @@ -18,7 +18,7 @@ class ControllerEventCurrency extends Controller { * * @return void */ - public function index(string &$route, array &$args, mixed &$output): void { + public function index(string &$route, array &$args, &$output): void { if ($route == 'model/setting/setting/editSetting' && $args[0] == 'config' && isset($args[1]['config_currency'])) { $this->load->controller('extension/currency/' . $this->config->get('config_currency_engine') . '/currency', $args[1]['config_currency']); } else { diff --git a/upload/admin/controller/event/language.php b/upload/admin/controller/event/language.php index 39a2cca07..3afe97214 100644 --- a/upload/admin/controller/event/language.php +++ b/upload/admin/controller/event/language.php @@ -54,7 +54,7 @@ public function before(string &$route, mixed &$args): void { * * controller/ * / * /after */ - public function after(string &$route, array &$args, mixed &$output): void { + public function after(string &$route, array &$args, &$output): void { $data = $this->language->get('backup'); if (is_array($data)) { diff --git a/upload/admin/controller/event/statistics.php b/upload/admin/controller/event/statistics.php index 2c47bd8b7..fa09e32ec 100644 --- a/upload/admin/controller/event/statistics.php +++ b/upload/admin/controller/event/statistics.php @@ -16,7 +16,7 @@ class ControllerEventStatistics extends Controller { * * admin/model/catalog/review/addReview/after */ - public function addReview(string &$route, array &$args, mixed &$output): void { + public function addReview(string &$route, array &$args, &$output): void { // Statistics $this->load->model('report/statistics'); @@ -34,7 +34,7 @@ public function addReview(string &$route, array &$args, mixed &$output): void { * * admin/model/catalog/review/deleteReview/after */ - public function deleteReview(string &$route, array &$args, mixed &$output): void { + public function deleteReview(string &$route, array &$args, &$output): void { // Statistics $this->load->model('report/statistics'); @@ -52,7 +52,7 @@ public function deleteReview(string &$route, array &$args, mixed &$output): void * * admin/model/sale/returns/addReturn/after */ - public function addReturn(string &$route, array &$args, mixed &$output): void { + public function addReturn(string &$route, array &$args, &$output): void { // Statistics $this->load->model('report/statistics'); @@ -70,7 +70,7 @@ public function addReturn(string &$route, array &$args, mixed &$output): void { * * admin/model/sale/returns/deleteReturn/after */ - public function deleteReturn(string &$route, array &$args, mixed &$output): void { + public function deleteReturn(string &$route, array &$args, &$output): void { // Statistics $this->load->model('report/statistics'); diff --git a/upload/admin/controller/extension/advertise/google.php b/upload/admin/controller/extension/advertise/google.php index a9bad46c0..74769a124 100644 --- a/upload/admin/controller/extension/advertise/google.php +++ b/upload/admin/controller/extension/advertise/google.php @@ -1932,7 +1932,7 @@ public function admin_link(string &$route, array &$data, mixed &$template): void * * admin/model/catalog/product/addProduct/after */ - public function addProduct(string &$route, array &$args, mixed &$output): void { + public function addProduct(string &$route, array &$args, &$output): void { // Products $this->load->model('catalog/product'); @@ -1955,7 +1955,7 @@ public function addProduct(string &$route, array &$args, mixed &$output): void { * * admin/model/catalog/product/copyProduct/after */ - public function copyProduct(string &$route, array &$args, mixed &$output): void { + public function copyProduct(string &$route, array &$args, &$output): void { // Products $this->load->model('catalog/product'); @@ -1982,7 +1982,7 @@ public function copyProduct(string &$route, array &$args, mixed &$output): void * * admin/model/catalog/product/deleteProduct/after */ - public function deleteProduct(string &$route, array &$args, mixed &$output): void { + public function deleteProduct(string &$route, array &$args, &$output): void { // Google $this->load->model('extension/advertise/google'); diff --git a/upload/admin/controller/extension/extension/promotion.php b/upload/admin/controller/extension/extension/promotion.php index a76a67893..ff9e9b431 100644 --- a/upload/admin/controller/extension/extension/promotion.php +++ b/upload/admin/controller/extension/extension/promotion.php @@ -40,7 +40,7 @@ public function index() { * * admin/controller/extension/extension/promotion/after */ - public function getList(string &$route, array &$args, mixed &$output): void { + public function getList(string &$route, array &$args, &$output): void { if ($this->request->get['route'] == 'extension/extension/promotion') { $this->load->language('extension/extension/promotion'); diff --git a/upload/admin/controller/mail/affiliate.php b/upload/admin/controller/mail/affiliate.php index 165d8139f..594c9d7ec 100644 --- a/upload/admin/controller/mail/affiliate.php +++ b/upload/admin/controller/mail/affiliate.php @@ -16,7 +16,7 @@ class ControllerMailAffiliate extends Controller { * * @return void */ - public function approve(string &$route, array &$args, mixed &$output): void { + public function approve(string &$route, array &$args, &$output): void { // Customers $this->load->model('customer/customer'); @@ -91,7 +91,7 @@ public function approve(string &$route, array &$args, mixed &$output): void { * * @return void */ - public function deny(string &$route, array &$args, mixed &$output): void { + public function deny(string &$route, array &$args, &$output): void { // Customers $this->load->model('customer/customer'); diff --git a/upload/admin/controller/mail/customer.php b/upload/admin/controller/mail/customer.php index d98c63b5b..02ee88661 100644 --- a/upload/admin/controller/mail/customer.php +++ b/upload/admin/controller/mail/customer.php @@ -16,7 +16,7 @@ class ControllerMailCustomer extends Controller { * * @return void */ - public function allow(string &$route, array &$args, mixed &$output): void { + public function allow(string &$route, array &$args, &$output): void { // Customers $this->load->model('customer/customer'); @@ -105,7 +105,7 @@ public function allow(string &$route, array &$args, mixed &$output): void { * * @return void */ - public function deny(string &$route, array &$args, mixed &$output): void { + public function deny(string &$route, array &$args, &$output): void { // Customers $this->load->model('customer/customer'); diff --git a/upload/admin/controller/mail/forgotten.php b/upload/admin/controller/mail/forgotten.php index ed2fa5312..bcd271a7b 100644 --- a/upload/admin/controller/mail/forgotten.php +++ b/upload/admin/controller/mail/forgotten.php @@ -16,7 +16,7 @@ class ControllerMailForgotten extends Controller { * * @return void */ - public function deny(string &$route, array &$args, mixed &$output): void { + public function deny(string &$route, array &$args, &$output): void { if (isset($args[0]) && isset($args[1]) && $args[0] && $args[1]) { $this->load->language('mail/forgotten'); diff --git a/upload/admin/controller/mail/gdpr.php b/upload/admin/controller/mail/gdpr.php index 9a8e42bd5..e6ce7a32a 100644 --- a/upload/admin/controller/mail/gdpr.php +++ b/upload/admin/controller/mail/gdpr.php @@ -16,7 +16,7 @@ class ControllerMailGdpr extends Controller { * * @return void */ - public function index(string &$route, array &$args, mixed &$output): void { + public function index(string &$route, array &$args, &$output): void { $this->load->model('customer/gdpr'); $gdpr_info = $this->model_customer_gdpr->getGdpr($args[0]); diff --git a/upload/admin/controller/mail/returns.php b/upload/admin/controller/mail/returns.php index 052170929..08d2f0ae7 100644 --- a/upload/admin/controller/mail/returns.php +++ b/upload/admin/controller/mail/returns.php @@ -16,7 +16,7 @@ class ControllerMailReturns extends Controller { * * admin/model/sale/returns/addHistory/after */ - public function deny(string &$route, array &$args, mixed &$output): void { + public function deny(string &$route, array &$args, &$output): void { if (isset($args[0])) { $return_id = $args[0]; } else { diff --git a/upload/admin/controller/mail/reward.php b/upload/admin/controller/mail/reward.php index 12e2bf163..646b0d4c9 100644 --- a/upload/admin/controller/mail/reward.php +++ b/upload/admin/controller/mail/reward.php @@ -16,7 +16,7 @@ class ControllerMailReward extends Controller { * * admin/model/customer/customer/addReward/after */ - public function deny(string &$route, array &$args, mixed &$output): void { + public function deny(string &$route, array &$args, &$output): void { if (isset($args[0])) { $customer_id = $args[0]; } else { diff --git a/upload/admin/controller/mail/subscription.php b/upload/admin/controller/mail/subscription.php index 8b0947f6c..01cc7e12f 100644 --- a/upload/admin/controller/mail/subscription.php +++ b/upload/admin/controller/mail/subscription.php @@ -176,7 +176,7 @@ public function history(string &$route, array &$args, &$output): void { * * admin/controller/sale/subscription/addTransaction/after */ - public function transaction(string &$route, array &$args, mixed &$output): void { + public function transaction(string &$route, array &$args, &$output): void { if (isset($args[0])) { $subscription_id = $args[0]; } else { diff --git a/upload/admin/controller/mail/transaction.php b/upload/admin/controller/mail/transaction.php index 91ae5c51b..c5ceee986 100644 --- a/upload/admin/controller/mail/transaction.php +++ b/upload/admin/controller/mail/transaction.php @@ -16,7 +16,7 @@ class ControllerMailTransaction extends Controller { * * admin/model/customer/customer/addTransaction/after */ - public function deny(string &$route, array &$args, mixed &$output): void { + public function deny(string &$route, array &$args, &$output): void { if (isset($args[0])) { $customer_id = $args[0]; } else { diff --git a/upload/catalog/controller/event/activity.php b/upload/catalog/controller/event/activity.php index 20c598357..6a71939a9 100644 --- a/upload/catalog/controller/event/activity.php +++ b/upload/catalog/controller/event/activity.php @@ -16,7 +16,7 @@ class ControllerEventActivity extends Controller { * * catalog/model/account/customer/addCustomer/after */ - public function addCustomer(string &$route, array &$args, mixed &$output): void { + public function addCustomer(string &$route, array &$args, &$output): void { if ($this->config->get('config_customer_activity')) { // Activities $this->load->model('account/activity'); @@ -41,7 +41,7 @@ public function addCustomer(string &$route, array &$args, mixed &$output): void * * catalog/model/account/customer/editCustomer/after */ - public function editCustomer(string &$route, array &$args, mixed &$output): void { + public function editCustomer(string &$route, array &$args, &$output): void { if ($this->config->get('config_customer_activity')) { // Activities $this->load->model('account/activity'); @@ -66,7 +66,7 @@ public function editCustomer(string &$route, array &$args, mixed &$output): void * * catalog/model/account/customer/editPassword/after */ - public function editPassword(string &$route, array &$args, mixed &$output): void { + public function editPassword(string &$route, array &$args, &$output): void { if ($this->config->get('config_customer_activity')) { // Activities $this->load->model('account/activity'); @@ -104,7 +104,7 @@ public function editPassword(string &$route, array &$args, mixed &$output): void * * catalog/model/account/customer/deleteLoginAttempts/after */ - public function login(string &$route, array &$args, mixed &$output): void { + public function login(string &$route, array &$args, &$output): void { if (isset($this->request->get['route']) && ($this->request->get['route'] == 'account/login' || $this->request->get['route'] == 'checkout/login/save') && $this->config->get('config_customer_activity')) { $customer_info = $this->model_account_customer->getCustomerByEmail($args[0]); @@ -133,7 +133,7 @@ public function login(string &$route, array &$args, mixed &$output): void { * * catalog/model/account/customer/editCode/after */ - public function forgotten(string &$route, array &$args, mixed &$output): void { + public function forgotten(string &$route, array &$args, &$output): void { if (isset($this->request->get['route']) && $this->request->get['route'] == 'account/forgotten' && $this->config->get('config_customer_activity')) { // Customers $this->load->model('account/customer'); @@ -165,7 +165,7 @@ public function forgotten(string &$route, array &$args, mixed &$output): void { * * catalog/model/account/customer/addTransaction/after */ - public function addTransaction(string &$route, array &$args, mixed &$output): void { + public function addTransaction(string &$route, array &$args, &$output): void { if ($this->config->get('config_customer_activity')) { // Customers $this->load->model('account/customer'); @@ -198,7 +198,7 @@ public function addTransaction(string &$route, array &$args, mixed &$output): vo * * catalog/model/account/customer/addAffiliate/after */ - public function addAffiliate(string &$route, array &$args, mixed &$output): void { + public function addAffiliate(string &$route, array &$args, &$output): void { if ($this->config->get('config_customer_activity')) { // Activities $this->load->model('account/activity'); @@ -223,7 +223,7 @@ public function addAffiliate(string &$route, array &$args, mixed &$output): void * * catalog/model/account/customer/editAffiliate/after */ - public function editAffiliate(string &$route, array &$args, mixed &$output): void { + public function editAffiliate(string &$route, array &$args, &$output): void { if ($this->config->get('config_customer_activity') && $output) { // Activities $this->load->model('account/activity'); @@ -248,7 +248,7 @@ public function editAffiliate(string &$route, array &$args, mixed &$output): voi * * catalog/model/account/address/addAddress/after */ - public function addAddress(string &$route, array &$args, mixed &$output): void { + public function addAddress(string &$route, array &$args, &$output): void { if ($this->config->get('config_customer_activity')) { // Activities $this->load->model('account/activity'); @@ -273,7 +273,7 @@ public function addAddress(string &$route, array &$args, mixed &$output): void { * * catalog/model/account/address/editAddress/after */ - public function editAddress(string &$route, array &$args, mixed &$output): void { + public function editAddress(string &$route, array &$args, &$output): void { if ($this->config->get('config_customer_activity')) { // Activities $this->load->model('account/activity'); @@ -298,7 +298,7 @@ public function editAddress(string &$route, array &$args, mixed &$output): void * * catalog/model/account/address/deleteAddress/after */ - public function deleteAddress(string &$route, array &$args, mixed &$output): void { + public function deleteAddress(string &$route, array &$args, &$output): void { if ($this->config->get('config_customer_activity')) { // Activities $this->load->model('account/activity'); @@ -323,7 +323,7 @@ public function deleteAddress(string &$route, array &$args, mixed &$output): voi * * catalog/model/account/returns/addReturn/after */ - public function addReturn(string &$route, array &$args, mixed &$output): void { + public function addReturn(string &$route, array &$args, &$output): void { if ($this->config->get('config_customer_activity') && $output) { // Activities $this->load->model('account/activity'); diff --git a/upload/catalog/controller/event/debug.php b/upload/catalog/controller/event/debug.php index c8a4b79dc..00bc8d969 100644 --- a/upload/catalog/controller/event/debug.php +++ b/upload/catalog/controller/event/debug.php @@ -43,7 +43,7 @@ public function before(string &$route, array &$args): void { * * @return void */ - public function after(string $route, array &$args, mixed &$output): void { + public function after(string $route, array &$args, &$output): void { // add the route you want to test /* if ($route == 'common/home') { diff --git a/upload/catalog/controller/event/language.php b/upload/catalog/controller/event/language.php index 9fd9b937f..54e58b436 100644 --- a/upload/catalog/controller/event/language.php +++ b/upload/catalog/controller/event/language.php @@ -53,7 +53,7 @@ public function before(string &$route, mixed &$args): void { * * 2. After controller load restore old language data */ - public function after(string &$route, mixed &$args, mixed &$output): void { + public function after(string &$route, mixed &$args, &$output): void { $data = $this->language->get('backup'); if (is_array($data)) { diff --git a/upload/catalog/controller/event/statistics.php b/upload/catalog/controller/event/statistics.php index 86df0d885..30d9ecac9 100644 --- a/upload/catalog/controller/event/statistics.php +++ b/upload/catalog/controller/event/statistics.php @@ -16,7 +16,7 @@ class ControllerEventStatistics extends Controller { * * catalog/model/catalog/review/addReview/after */ - public function addReview(string &$route, array &$args, mixed &$output): void { + public function addReview(string &$route, array &$args, &$output): void { // Statistics $this->load->model('report/statistics'); @@ -34,7 +34,7 @@ public function addReview(string &$route, array &$args, mixed &$output): void { * * catalog/model/account/returns/addReturn/after */ - public function addReturn(string &$route, array &$args, mixed &$output): void { + public function addReturn(string &$route, array &$args, &$output): void { // Statistics $this->load->model('report/statistics'); @@ -52,7 +52,7 @@ public function addReturn(string &$route, array &$args, mixed &$output): void { * * catalog/model/checkout/order/addHistory/before */ - public function addHistory(string &$route, array &$args, mixed &$output): void { + public function addHistory(string &$route, array &$args, &$output): void { // Orders $this->load->model('checkout/order'); diff --git a/upload/catalog/controller/extension/advertise/google.php b/upload/catalog/controller/extension/advertise/google.php index 40e04bb4b..05b62b9d0 100644 --- a/upload/catalog/controller/extension/advertise/google.php +++ b/upload/catalog/controller/extension/advertise/google.php @@ -44,7 +44,7 @@ public function __construct(object $registry) { * * catalog/view/common/header/after */ - public function google_global_site_tag(string &$route, array &$args, mixed &$output): string { + public function google_global_site_tag(string &$route, array &$args, &$output): string { // In case the extension is disabled, do nothing if (!$this->setting->get('advertise_google_status')) { return ''; @@ -169,7 +169,7 @@ public function before_checkout_success(string &$route, array &$data): void { * * catalog/view/common/success/after */ - public function google_dynamic_remarketing_purchase(string &$route, array &$data, mixed &$output): string { + public function google_dynamic_remarketing_purchase(string &$route, array &$data, &$output): string { // In case the extension is disabled, do nothing if (!$this->setting->get('advertise_google_status')) { return ''; @@ -211,7 +211,7 @@ public function google_dynamic_remarketing_purchase(string &$route, array &$data * * catalog/view/common/home/after */ - public function google_dynamic_remarketing_home(string &$route, array &$data, mixed &$output): string { + public function google_dynamic_remarketing_home(string &$route, array &$data, &$output): string { // In case the extension is disabled, do nothing if (!$this->setting->get('advertise_google_status')) { return ''; @@ -251,7 +251,7 @@ public function google_dynamic_remarketing_home(string &$route, array &$data, mi * * catalog/view/product/search/after */ - public function google_dynamic_remarketing_searchresults(string &$route, array &$data, mixed &$output): string { + public function google_dynamic_remarketing_searchresults(string &$route, array &$data, &$output): string { // In case the extension is disabled, do nothing if (!$this->setting->get('advertise_google_status')) { return ''; @@ -293,7 +293,7 @@ public function google_dynamic_remarketing_searchresults(string &$route, array & * * catalog/view/product/category/after */ - public function google_dynamic_remarketing_category(string &$route, array &$data, mixed &$output): string { + public function google_dynamic_remarketing_category(string &$route, array &$data, &$output): string { // In case the extension is disabled, do nothing if (!$this->setting->get('advertise_google_status')) { return ''; @@ -349,7 +349,7 @@ public function google_dynamic_remarketing_category(string &$route, array &$data * * catalog/view/product/product/after */ - public function google_dynamic_remarketing_product(string &$route, array &$data, mixed &$output): string { + public function google_dynamic_remarketing_product(string &$route, array &$data, &$output): string { // In case the extension is disabled, do nothing if (!$this->setting->get('advertise_google_status')) { return ''; @@ -412,7 +412,7 @@ public function google_dynamic_remarketing_product(string &$route, array &$data, * * catalog/view/checkout/cart/after */ - public function google_dynamic_remarketing_cart(string &$route, array &$data, mixed &$output): string { + public function google_dynamic_remarketing_cart(string &$route, array &$data, &$output): string { // In case the extension is disabled, do nothing if (!$this->setting->get('advertise_google_status')) { return ''; diff --git a/upload/catalog/controller/extension/module/fraudlabspro.php b/upload/catalog/controller/extension/module/fraudlabspro.php index 858541dc7..de232a526 100644 --- a/upload/catalog/controller/extension/module/fraudlabspro.php +++ b/upload/catalog/controller/extension/module/fraudlabspro.php @@ -16,7 +16,7 @@ class ControllerExtensionModuleFraudlabspro extends Controller { * * catalog/model/checkout/order/addHistory/after */ - public function addHistory(string &$route, array &$args, mixed &$output): void { + public function addHistory(string &$route, array &$args, &$output): void { if (isset($args[0])) { $order_id = $args[0]; } else { diff --git a/upload/catalog/controller/extension/payment/amazon_login_pay.php b/upload/catalog/controller/extension/payment/amazon_login_pay.php index d261e36dc..1f1b1e230 100644 --- a/upload/catalog/controller/extension/payment/amazon_login_pay.php +++ b/upload/catalog/controller/extension/payment/amazon_login_pay.php @@ -1058,7 +1058,7 @@ public function ipn(): void { * catalog/model/checkout/order/editOrder/after * catalog/model/checkout/order/addHistory/after */ - public function capture(string &$route, array &$args, mixed &$output): void { + public function capture(string &$route, array &$args, &$output): void { $this->load->language('extension/payment/amazon_login_pay'); // Amazon Login Pay diff --git a/upload/catalog/controller/extension/payment/paypal.php b/upload/catalog/controller/extension/payment/paypal.php index 65a4a939a..0318c566c 100644 --- a/upload/catalog/controller/extension/payment/paypal.php +++ b/upload/catalog/controller/extension/payment/paypal.php @@ -3253,7 +3253,7 @@ public function header_before(string &$route, array &$data): void { * @param array $data * @param mixed $output */ - public function extension_get_extensions_after(string &$route, array &$data, mixed &$output): void { + public function extension_get_extensions_after(string &$route, array &$data, &$output): void { if ($this->config->get('payment_paypal_status') && $this->config->get('payment_paypal_client_id') && $this->config->get('payment_paypal_secret')) { $type = $data[0]; diff --git a/upload/catalog/controller/extension/total/voucher.php b/upload/catalog/controller/extension/total/voucher.php index b998ccf33..369c46908 100644 --- a/upload/catalog/controller/extension/total/voucher.php +++ b/upload/catalog/controller/extension/total/voucher.php @@ -73,7 +73,7 @@ public function voucher(): void { * * catalog/model/checkout/order/addHistory/after */ - public function send(string &$route, array &$args, mixed &$output): void { + public function send(string &$route, array &$args, &$output): void { // Orders $this->load->model('checkout/order'); diff --git a/upload/catalog/controller/mail/affiliate.php b/upload/catalog/controller/mail/affiliate.php index 422cc0455..7498a6882 100644 --- a/upload/catalog/controller/mail/affiliate.php +++ b/upload/catalog/controller/mail/affiliate.php @@ -16,7 +16,7 @@ class ControllerMailAffiliate extends Controller { * * @return void */ - public function index(string &$route, array &$args, mixed &$output): void { + public function index(string &$route, array &$args, &$output): void { $this->load->language('mail/affiliate'); $store_name = html_entity_decode($this->config->get('config_name'), ENT_QUOTES, 'UTF-8'); @@ -82,7 +82,7 @@ public function index(string &$route, array &$args, mixed &$output): void { * * @return void */ - public function alert(string &$route, array &$args, mixed &$output): void { + public function alert(string &$route, array &$args, &$output): void { // Send to main admin email if new affiliate email is enabled if (in_array('affiliate', (array)$this->config->get('config_mail_alert'))) { $this->load->language('mail/affiliate'); diff --git a/upload/catalog/controller/mail/forgotten.php b/upload/catalog/controller/mail/forgotten.php index 6a210239b..c1175e012 100644 --- a/upload/catalog/controller/mail/forgotten.php +++ b/upload/catalog/controller/mail/forgotten.php @@ -18,7 +18,7 @@ class ControllerMailForgotten extends Controller { * * @return void */ - public function index(string &$route, array &$args, mixed &$output): void { + public function index(string &$route, array &$args, &$output): void { if ($args[0] && $args[1]) { // Customers $this->load->model('account/customer'); diff --git a/upload/catalog/controller/mail/gdpr.php b/upload/catalog/controller/mail/gdpr.php index e164bfdd3..c1d448312 100644 --- a/upload/catalog/controller/mail/gdpr.php +++ b/upload/catalog/controller/mail/gdpr.php @@ -18,7 +18,7 @@ class ControllerMailGdpr extends Controller { * * @return void */ - public function index(string &$route, array &$args, mixed &$output): void { + public function index(string &$route, array &$args, &$output): void { // $args[0] $code // $args[1] $email // $args[2] $action @@ -74,7 +74,7 @@ public function index(string &$route, array &$args, mixed &$output): void { * * @return void */ - public function remove(string &$route, array &$args, mixed &$output): void { + public function remove(string &$route, array &$args, &$output): void { if (isset($args[0])) { $gdpr_id = $args[0]; } else { diff --git a/upload/catalog/controller/mail/register.php b/upload/catalog/controller/mail/register.php index 4ac489987..34f6e9529 100644 --- a/upload/catalog/controller/mail/register.php +++ b/upload/catalog/controller/mail/register.php @@ -18,7 +18,7 @@ class ControllerMailRegister extends Controller { * * @return void */ - public function index(string &$route, array &$args, mixed &$output): void { + public function index(string &$route, array &$args, &$output): void { $this->load->language('mail/register'); $store_name = html_entity_decode($this->config->get('config_name'), ENT_QUOTES, 'UTF-8'); @@ -80,7 +80,7 @@ public function index(string &$route, array &$args, mixed &$output): void { * * @return void */ - public function alert(string &$route, array &$args, mixed &$output): void { + public function alert(string &$route, array &$args, &$output): void { // Send to main admin email if new account email is enabled if (in_array('account', (array)$this->config->get('config_mail_alert'))) { $this->load->language('mail/register'); diff --git a/upload/catalog/controller/mail/subscription.php b/upload/catalog/controller/mail/subscription.php index 4261c6e92..eae36c4ff 100644 --- a/upload/catalog/controller/mail/subscription.php +++ b/upload/catalog/controller/mail/subscription.php @@ -16,7 +16,7 @@ class ControllerMailSubscription extends Controller { * * catalog/model/checkout/order/addHistory/after */ - public function index(string &$route, array &$args, mixed &$output): void { + public function index(string &$route, array &$args, &$output): void { if (isset($args[0])) { $subscription_id = $args[0]; } else { @@ -75,7 +75,7 @@ public function index(string &$route, array &$args, mixed &$output): void { * * catalog/model/checkout/order/editOrder/after */ - public function cancel(string &$route, array &$args, mixed &$output): void { + public function cancel(string &$route, array &$args, &$output): void { if (isset($args[0])) { $subscription_id = $args[0]; } else { diff --git a/upload/catalog/controller/mail/transaction.php b/upload/catalog/controller/mail/transaction.php index f0c7e09c0..e2a627a92 100644 --- a/upload/catalog/controller/mail/transaction.php +++ b/upload/catalog/controller/mail/transaction.php @@ -16,7 +16,7 @@ class ControllerMailTransaction extends Controller { * * catalog/model/account/customer/addTransaction/after */ - public function index(string &$route, array &$args, mixed &$output): void { + public function index(string &$route, array &$args, &$output): void { $this->load->language('mail/transaction'); // Customers