Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added missing casts for config get in model calls #13895

Merged
merged 1 commit into from
Apr 26, 2024
Merged

Added missing casts for config get in model calls #13895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions upload/admin/controller/report/statistics.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function orderSale(): void {
$this->load->model('report/statistics');
$this->load->model('sale/order');

$this->model_report_statistics->editValue('order_sale', $this->model_sale_order->getTotalSales(['filter_order_status' => implode(',', array_merge($this->config->get('config_complete_status'), $this->config->get('config_processing_status')))]));
$this->model_report_statistics->editValue('order_sale', $this->model_sale_order->getTotalSales(['filter_order_status' => implode(',', array_merge((array)$this->config->get('config_complete_status'), (array)$this->config->get('config_processing_status')))]));

$json['success'] = $this->language->get('text_success');
}
Expand Down Expand Up @@ -145,7 +145,7 @@ public function orderComplete(): void {
$this->load->model('report/statistics');
$this->load->model('sale/order');

$this->model_report_statistics->editValue('order_complete', $this->model_sale_order->getTotalOrders(['filter_order_status' => implode(',', $this->config->get('config_complete_status'))]));
$this->model_report_statistics->editValue('order_complete', $this->model_sale_order->getTotalOrders(['filter_order_status' => implode(',', (array)$this->config->get('config_complete_status'))]));

$json['success'] = $this->language->get('text_success');
}
Expand Down Expand Up @@ -177,7 +177,7 @@ public function orderOther(): void {
$results = $this->model_localisation_order_status->getOrderStatuses();

foreach ($results as $result) {
if (!in_array($result['order_status_id'], array_merge($this->config->get('config_complete_status'), $this->config->get('config_processing_status')))) {
if (!in_array($result['order_status_id'], array_merge((array)$this->config->get('config_complete_status'), (array)$this->config->get('config_processing_status')))) {
$order_status_data[] = $result['order_status_id'];
}
}
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/model/marketing/marketing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function getMarketingByCode(string $code): array {
public function getMarketings(array $data = []): array {
$implode = [];

$order_statuses = $this->config->get('config_complete_status');
$order_statuses = (array)$this->config->get('config_complete_status');

foreach ($order_statuses as $order_status_id) {
$implode[] = "`o`.`order_status_id` = '" . (int)$order_status_id . "'";
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/model/sale/order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ public function getTotalOrdersByProcessingStatus(): int {
public function getTotalOrdersByCompleteStatus(): int {
$implode = [];

$order_statuses = $this->config->get('config_complete_status');
$order_statuses = (array)$this->config->get('config_complete_status');

foreach ($order_statuses as $order_status_id) {
$implode[] = "`order_status_id` = '" . (int)$order_status_id . "'";
Expand Down
4 changes: 2 additions & 2 deletions upload/catalog/controller/account/affiliate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public function index(): void {
if (!$affiliate_info && $this->config->get('config_affiliate_id')) {
$this->load->model('catalog/information');

$information_info = $this->model_catalog_information->getInformation($this->config->get('config_affiliate_id'));
$information_info = $this->model_catalog_information->getInformation((int)$this->config->get('config_affiliate_id'));

if ($information_info) {
$data['text_agree'] = sprintf($this->language->get('text_agree'), $this->url->link('information/information.info', 'language=' . $this->config->get('config_language') . '&information_id=' . $this->config->get('config_affiliate_id')), $information_info['title']);
Expand Down Expand Up @@ -244,7 +244,7 @@ public function save(): void {
if (!$affiliate_info) {
$this->load->model('catalog/information');

$information_info = $this->model_catalog_information->getInformation($this->config->get('config_affiliate_id'));
$information_info = $this->model_catalog_information->getInformation((int)$this->config->get('config_affiliate_id'));

if ($information_info && !$this->request->post['agree']) {
$json['error']['warning'] = sprintf($this->language->get('error_agree'), $information_info['title']);
Expand Down
4 changes: 2 additions & 2 deletions upload/catalog/controller/account/register.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function index(): void {

$this->load->model('catalog/information');

$information_info = $this->model_catalog_information->getInformation($this->config->get('config_account_id'));
$information_info = $this->model_catalog_information->getInformation((int)$this->config->get('config_account_id'));

if ($information_info) {
$data['text_agree'] = sprintf($this->language->get('text_agree'), $this->url->link('information/information.info', 'language=' . $this->config->get('config_language') . '&information_id=' . $this->config->get('config_account_id')), $information_info['title']);
Expand Down Expand Up @@ -218,7 +218,7 @@ public function register(): void {
// Agree to terms
$this->load->model('catalog/information');

$information_info = $this->model_catalog_information->getInformation($this->config->get('config_account_id'));
$information_info = $this->model_catalog_information->getInformation((int)$this->config->get('config_account_id'));

if ($information_info && !$this->request->post['agree']) {
$json['error']['warning'] = sprintf($this->language->get('error_agree'), $information_info['title']);
Expand Down
4 changes: 2 additions & 2 deletions upload/catalog/controller/account/returns.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public function add(): void {

$this->load->model('catalog/information');

$information_info = $this->model_catalog_information->getInformation($this->config->get('config_return_id'));
$information_info = $this->model_catalog_information->getInformation((int)$this->config->get('config_return_id'));

if ($information_info) {
$data['text_agree'] = sprintf($this->language->get('text_agree'), $this->url->link('information/information.info', 'language=' . $this->config->get('config_language') . '&information_id=' . $this->config->get('config_return_id')), $information_info['title']);
Expand Down Expand Up @@ -405,7 +405,7 @@ public function save(): void {
if ($this->config->get('config_return_id')) {
$this->load->model('catalog/information');

$information_info = $this->model_catalog_information->getInformation($this->config->get('config_return_id'));
$information_info = $this->model_catalog_information->getInformation((int)$this->config->get('config_return_id'));

if ($information_info && !isset($this->request->post['agree'])) {
$json['error']['warning'] = sprintf($this->language->get('error_agree'), $information_info['title']);
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/checkout/payment_method.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function index(): string {

$this->load->model('catalog/information');

$information_info = $this->model_catalog_information->getInformation($this->config->get('config_checkout_id'));
$information_info = $this->model_catalog_information->getInformation((int)$this->config->get('config_checkout_id'));

if ($information_info) {
$data['text_agree'] = sprintf($this->language->get('text_agree'), $this->url->link('information/information.info', 'language=' . $this->config->get('config_language') . '&information_id=' . $this->config->get('config_checkout_id')), $information_info['title']);
Expand Down
4 changes: 2 additions & 2 deletions upload/catalog/controller/checkout/register.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public function index(): string {

$this->load->model('catalog/information');

$information_info = $this->model_catalog_information->getInformation($this->config->get('config_account_id'));
$information_info = $this->model_catalog_information->getInformation((int)$this->config->get('config_account_id'));

if ($information_info) {
$data['text_agree'] = sprintf($this->language->get('text_agree'), $this->url->link('information/information.info', 'language=' . $this->config->get('config_language') . '&information_id=' . $this->config->get('config_account_id')), $information_info['title']);
Expand Down Expand Up @@ -382,7 +382,7 @@ public function save(): void {
if ($this->request->post['account']) {
$this->load->model('catalog/information');

$information_info = $this->model_catalog_information->getInformation($this->config->get('config_account_id'));
$information_info = $this->model_catalog_information->getInformation((int)$this->config->get('config_account_id'));

if ($information_info && !$this->request->post['agree']) {
$json['error']['warning'] = sprintf($this->language->get('error_agree'), $information_info['title']);
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/common/cookie.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public function index(): string {
if ($this->config->get('config_cookie_id') && !isset($this->request->cookie['policy'])) {
$this->load->model('catalog/information');

$information_info = $this->model_catalog_information->getInformation($this->config->get('config_cookie_id'));
$information_info = $this->model_catalog_information->getInformation((int)$this->config->get('config_cookie_id'));

if ($information_info) {
$this->load->language('common/cookie');
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/information/gdpr.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Gdpr extends \Opencart\System\Engine\Controller {
public function index(): ?\Opencart\System\Engine\Action {
$this->load->model('catalog/information');

$information_info = $this->model_catalog_information->getInformation($this->config->get('config_gdpr_id'));
$information_info = $this->model_catalog_information->getInformation((int)$this->config->get('config_gdpr_id'));

if ($information_info) {
$this->load->language('information/gdpr');
Expand Down
2 changes: 1 addition & 1 deletion upload/catalog/controller/startup/setting.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function index(): void {
// Settings
$this->load->model('setting/setting');

$results = $this->model_setting_setting->getSettings($this->config->get('config_store_id'));
$results = $this->model_setting_setting->getSettings((int)$this->config->get('config_store_id'));

foreach ($results as $result) {
if (!$result['serialized']) {
Expand Down