Skip to content

Commit

Permalink
Removed mixed type parameters on event outputs
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheCartpenter
TheCartpenter committed May 8, 2024
1 parent cbbda4d commit 51639ff
Show file tree
Hide file tree
Showing 28 changed files with 58 additions and 58 deletions.
2 changes: 1 addition & 1 deletion upload/admin/controller/event/currency.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/event/language.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
8 changes: 4 additions & 4 deletions upload/admin/controller/event/statistics.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand All @@ -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');

Expand All @@ -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');

Expand All @@ -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');

Expand Down
6 changes: 3 additions & 3 deletions upload/admin/controller/extension/advertise/google.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand All @@ -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');

Expand All @@ -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');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/extension/extension/promotion.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
4 changes: 2 additions & 2 deletions upload/admin/controller/mail/affiliate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down Expand Up @@ -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');

Expand Down
4 changes: 2 additions & 2 deletions upload/admin/controller/mail/customer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down Expand Up @@ -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');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/mail/forgotten.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/mail/gdpr.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/mail/returns.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/mail/reward.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/mail/subscription.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/mail/transaction.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
24 changes: 12 additions & 12 deletions upload/catalog/controller/event/activity.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand Down Expand Up @@ -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]);

Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand All @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/event/debug.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/event/language.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
6 changes: 3 additions & 3 deletions upload/catalog/controller/event/statistics.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand All @@ -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');

Expand All @@ -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');

Expand Down
14 changes: 7 additions & 7 deletions upload/catalog/controller/extension/advertise/google.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 '';
Expand Down Expand Up @@ -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 '';
Expand Down Expand Up @@ -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 '';
Expand Down Expand Up @@ -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 '';
Expand Down Expand Up @@ -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 '';
Expand Down Expand Up @@ -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 '';
Expand Down Expand Up @@ -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 '';
Expand Down
Loading

0 comments on commit 51639ff

Please sign in to comment.