From 36394c646a889057f6e68b60122e451ce2582ebb Mon Sep 17 00:00:00 2001 From: Ollama Date: Fri, 13 Mar 2026 18:27:54 +0000 Subject: [PATCH] Apply PSR-12 camelCase naming to new variables Response to PR review comments: - Rename to - Rename to - Rename to --- app/Controllers/Reports.php | 16 ++++++++-------- app/Helpers/tabular_helper.php | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/Controllers/Reports.php b/app/Controllers/Reports.php index ba9479adb..1c98d8d9d 100644 --- a/app/Controllers/Reports.php +++ b/app/Controllers/Reports.php @@ -1790,11 +1790,11 @@ class Reports extends Secure_Controller $columns = $this->detailed_sales->getDataColumns(); // Extract just names for column headers - $definition_headers = []; - foreach ($definition_names as $definition_id => $definition_info) { - $definition_headers[$definition_id] = $definition_info['name']; + $definitionHeaders = []; + foreach ($definition_names as $definition_id => $definitionInfo) { + $definitionHeaders[$definition_id] = $definitionInfo['name']; } - $columns['details'] = array_merge($columns['details'], $definition_headers); + $columns['details'] = array_merge($columns['details'], $definitionHeaders); $headers = $columns; @@ -1943,11 +1943,11 @@ class Reports extends Secure_Controller $columns = $this->detailed_receivings->getDataColumns(); // Extract just names for column headers - $definition_headers = []; - foreach ($definition_names as $definition_id => $definition_info) { - $definition_headers[$definition_id] = $definition_info['name']; + $definitionHeaders = []; + foreach ($definition_names as $definition_id => $definitionInfo) { + $definitionHeaders[$definition_id] = $definitionInfo['name']; } - $columns['details'] = array_merge($columns['details'], $definition_headers); + $columns['details'] = array_merge($columns['details'], $definitionHeaders); $headers = $columns; $report_data = $this->detailed_receivings->getData($inputs); diff --git a/app/Helpers/tabular_helper.php b/app/Helpers/tabular_helper.php index 4d1f90c3f..70effeba7 100644 --- a/app/Helpers/tabular_helper.php +++ b/app/Helpers/tabular_helper.php @@ -408,7 +408,7 @@ function get_items_manage_table_headers(): string { $attribute = model(Attribute::class); $config = config(OSPOS::class)->settings; - $definitions_with_types = $attribute->get_definitions_by_flags($attribute::SHOW_IN_ITEMS, true); + $definitionsWithTypes = $attribute->get_definitions_by_flags($attribute::SHOW_IN_ITEMS, true); $headers = item_headers(); @@ -420,8 +420,8 @@ function get_items_manage_table_headers(): string $headers[] = ['item_pic' => lang('Items.image'), 'sortable' => false]; - foreach ($definitions_with_types as $definition_id => $definition_info) { - $headers[] = [$definition_id => $definition_info['name'], 'sortable' => false]; + foreach ($definitionsWithTypes as $definition_id => $definitionInfo) { + $headers[] = [$definition_id => $definitionInfo['name'], 'sortable' => false]; } $headers[] = ['inventory' => '', 'escape' => false]; @@ -651,12 +651,12 @@ function expand_attribute_values(array $definition_names, array $row): array } $attribute_values = []; - foreach ($definition_names as $definition_id => $definition_info) { + foreach ($definition_names as $definition_id => $definitionInfo) { if (isset($indexed_values[$definition_id])) { $raw_value = $indexed_values[$definition_id]; // Format DECIMAL attributes according to locale - if (is_array($definition_info) && isset($definition_info['type']) && $definition_info['type'] === DECIMAL) { + if (is_array($definitionInfo) && isset($definitionInfo['type']) && $definitionInfo['type'] === DECIMAL) { $attribute_values["$definition_id"] = to_decimals($raw_value); } else { $attribute_values["$definition_id"] = $raw_value;