diff options
author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2021-05-09 09:54:57 +0300 |
---|---|---|
committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2021-05-09 09:54:57 +0300 |
commit | 2e3e5ead00d55905d3fe6f01689858333e69681e (patch) | |
tree | dec82aedb810e21d578828dee9e409f56f62ae66 /ui | |
parent | 692ce9e77be2d0b9c4466bc3b37d2009cf9cc9f4 (diff) |
.......... [ZBXNEXT-114] removed trailing commas at the end of arrays
Diffstat (limited to 'ui')
-rw-r--r-- | ui/include/classes/api/services/CValueMap.php | 2 | ||||
-rw-r--r-- | ui/tests/api_json/testValuemap.php | 4 | ||||
-rw-r--r-- | ui/tests/integration/testValuemaps.php | 2 | ||||
-rw-r--r-- | ui/tests/unit/include/classes/helpers/CValueMapHelperTest.php | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ui/include/classes/api/services/CValueMap.php b/ui/include/classes/api/services/CValueMap.php index 2a189a4cb69..4009418cee1 100644 --- a/ui/include/classes/api/services/CValueMap.php +++ b/ui/include/classes/api/services/CValueMap.php @@ -204,7 +204,7 @@ class CValueMap extends CApiService { if ($valuemaps_mappings) { $db_mappings = DB::select('valuemap_mapping', [ 'output' => ['valuemap_mappingid', 'valuemapid', 'type', 'value', 'newvalue', 'sortorder'], - 'filter' => ['valuemapid' => array_keys($valuemaps_mappings)], + 'filter' => ['valuemapid' => array_keys($valuemaps_mappings)] ]); CArrayHelper::sort($db_mappings, [['field' => 'sortorder', 'order' => ZBX_SORT_UP]]); diff --git a/ui/tests/api_json/testValuemap.php b/ui/tests/api_json/testValuemap.php index cd831101a75..d8cf74bcd8a 100644 --- a/ui/tests/api_json/testValuemap.php +++ b/ui/tests/api_json/testValuemap.php @@ -358,7 +358,7 @@ class testValuemap extends CAPITest { 'type' => VALUEMAP_MAPPING_TYPE_EQUAL, 'value' => '10', 'newvalue' => '2 fail' - ], + ] ] ] ], @@ -923,7 +923,7 @@ class testValuemap extends CAPITest { ] ], 'expected_error' => null - ], + ] ]; } diff --git a/ui/tests/integration/testValuemaps.php b/ui/tests/integration/testValuemaps.php index dc38f9ff418..30003911070 100644 --- a/ui/tests/integration/testValuemaps.php +++ b/ui/tests/integration/testValuemaps.php @@ -96,7 +96,7 @@ class testValuemaps extends CIntegrationTest { [ 'value' => '1', 'newvalue' => 'Value 1' - ], + ] ] ], 'rangeWithoutDefault' => [ diff --git a/ui/tests/unit/include/classes/helpers/CValueMapHelperTest.php b/ui/tests/unit/include/classes/helpers/CValueMapHelperTest.php index a205446f477..ac0d782e56a 100644 --- a/ui/tests/unit/include/classes/helpers/CValueMapHelperTest.php +++ b/ui/tests/unit/include/classes/helpers/CValueMapHelperTest.php @@ -241,10 +241,10 @@ class CValueMapHelperTest extends TestCase { [ ['type' => VALUEMAP_MAPPING_TYPE_DEFAULT, 'newvalue' => 'newvalue-1'], ['type' => VALUEMAP_MAPPING_TYPE_GREATER_EQUAL, 'value' => '10', 'newvalue' => 'newvalue-2'], - ['type' => VALUEMAP_MAPPING_TYPE_EQUAL, 'value' => '10', 'newvalue' => 'newvalue-3'], + ['type' => VALUEMAP_MAPPING_TYPE_EQUAL, 'value' => '10', 'newvalue' => 'newvalue-3'] ], 'newvalue-2' - ], + ] ]; } |