.......... [ZBXNEXT-6999] removed trailing commas at the end of arrays

zhcxrs · Jan 7, 2022 · 02ccda3 · 02ccda3
1 parent 6dbe69d
commit 02ccda3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ui/app/controllers/CControllerServiceListGeneral.php b/ui/app/controllers/CControllerServiceListGeneral.php
@@ -206,7 +206,7 @@ protected function getSlas(): array {
 			],
 			'sortfield' => 'name',
 			'sortorder' => ZBX_SORT_UP,
-			'limit' => $limit + 1,
+			'limit' => $limit + 1
 		]);
 
 		$slas_count = count($slas);

diff --git a/ui/include/classes/api/services/CService.php b/ui/include/classes/api/services/CService.php
@@ -79,7 +79,7 @@ private function doGet(array $options = [], array $permissions = null) {
 				'serviceid' =>				['type' => API_IDS, 'flags' => API_ALLOW_NULL | API_NORMALIZE],
 				'name' =>					['type' => API_STRINGS_UTF8, 'flags' => API_ALLOW_NULL | API_NORMALIZE],
 				'status' =>					['type' => API_INTS32, 'flags' => API_ALLOW_NULL | API_NORMALIZE, 'in' => implode(',', array_merge([ZBX_SEVERITY_OK], range(TRIGGER_SEVERITY_NOT_CLASSIFIED, TRIGGER_SEVERITY_COUNT - 1)))],
-				'algorithm' =>				['type' => API_INTS32, 'flags' => API_ALLOW_NULL | API_NORMALIZE, 'in' => implode(',', [ZBX_SERVICE_STATUS_CALC_SET_OK, ZBX_SERVICE_STATUS_CALC_MOST_CRITICAL_ALL, ZBX_SERVICE_STATUS_CALC_MOST_CRITICAL_ONE])],
+				'algorithm' =>				['type' => API_INTS32, 'flags' => API_ALLOW_NULL | API_NORMALIZE, 'in' => implode(',', [ZBX_SERVICE_STATUS_CALC_SET_OK, ZBX_SERVICE_STATUS_CALC_MOST_CRITICAL_ALL, ZBX_SERVICE_STATUS_CALC_MOST_CRITICAL_ONE])]
 			]],
 			'search' =>					['type' => API_OBJECT, 'flags' => API_ALLOW_NULL, 'default' => null, 'fields' => [
 				'name' =>					['type' => API_STRINGS_UTF8, 'flags' => API_ALLOW_NULL | API_NORMALIZE]

diff --git a/ui/include/classes/helpers/CRoleHelper.php b/ui/include/classes/helpers/CRoleHelper.php
@@ -305,7 +305,7 @@ public static function getUiSectionsLabels(int $user_type): array {
 			self::UI_SECTION_MONITORING => _('Monitoring'),
 			self::UI_SECTION_SERVICES => _('Services'),
 			self::UI_SECTION_INVENTORY => _('Inventory'),
-			self::UI_SECTION_REPORTS => _('Reports'),
+			self::UI_SECTION_REPORTS => _('Reports')
 		];
 
 		if ($user_type === USER_TYPE_ZABBIX_ADMIN || $user_type === USER_TYPE_SUPER_ADMIN) {
@@ -349,7 +349,7 @@ public static function getUiSectionRulesLabels(string $ui_section_name, int $use
 			case self::UI_SECTION_SERVICES:
 				$labels = [
 					self::UI_SERVICES_SERVICES => _('Services'),
-					self::UI_SERVICES_ACTIONS => _('Service actions'),
+					self::UI_SERVICES_ACTIONS => _('Service actions')
 				];
 
 				if ($user_type === USER_TYPE_ZABBIX_ADMIN || $user_type === USER_TYPE_SUPER_ADMIN) {