diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableModelControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableModelControllerBase.php index 460ddb260..7b4a608b9 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableModelControllerBase.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ApiMutableModelControllerBase.php @@ -563,7 +563,7 @@ abstract class ApiMutableModelControllerBase extends ApiControllerBase fwrite($stream, $payload); fseek($stream, 0); $heading = []; - while (($line = fgetcsv($stream)) !== FALSE) { + while (($line = fgetcsv($stream)) !== false) { if (empty($heading)) { $heading = $line; } else { @@ -575,7 +575,6 @@ abstract class ApiMutableModelControllerBase extends ApiControllerBase } $data[] = $record; } - } fclose($stream); @@ -584,17 +583,18 @@ abstract class ApiMutableModelControllerBase extends ApiControllerBase * Always return validation items collected in the first run. **/ $response = []; - for ($i=0; $i < 2; $i++) { + for ($i = 0; $i < 2; $i++) { $mdl = $this->getModel(); $node = $mdl->getNodeByReference($path); - if (is_a($node, "OPNsense\\Base\\FieldTypes\\ArrayField") || + if ( + is_a($node, "OPNsense\\Base\\FieldTypes\\ArrayField") || is_subclass_of($node, "OPNsense\\Base\\FieldTypes\\ArrayField") ) { $result = $node->importRecordSet($data, $keyfields, $data_callback); $valmsgfields = []; foreach ($this->getModel()->performValidation() as $msg) { if (str_starts_with($msg->getField(), $path) && !in_array($msg->getField(), $valmsgfields)) { - $tmp = explode('.', substr($msg->getField(), strlen($path)+1)); + $tmp = explode('.', substr($msg->getField(), strlen($path) + 1)); $uuid = $tmp[0]; $fieldname = end($tmp); $result['validations'][] = [ diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Kea/Api/Dhcpv4Controller.php b/src/opnsense/mvc/app/controllers/OPNsense/Kea/Api/Dhcpv4Controller.php index 6e6def3a5..ee9a15420 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Kea/Api/Dhcpv4Controller.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Kea/Api/Dhcpv4Controller.php @@ -32,7 +32,6 @@ use OPNsense\Base\ApiMutableModelControllerBase; use OPNsense\Core\Config; use OPNsense\Firewall\Util; - class Dhcpv4Controller extends ApiMutableModelControllerBase { protected static $internalModelName = 'dhcpv4'; diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php index 1fb33c8da..b4018ea6f 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ArrayField.php @@ -292,14 +292,13 @@ class ArrayField extends BaseField * @param function $data_callback inline data modification * @return array exceptions */ - public function importRecordSet($records, $keyfields = [], $data_callback=null) + public function importRecordSet($records, $keyfields = [], $data_callback = null) { $results = ['validations' => [], 'inserted' => 0, 'updated' => 0, 'uuids' => []]; $records = is_array($records) ? $records : []; $current = []; if (!empty($keyfields)) { - foreach (parent::iterateItems() as $node) - { + foreach (parent::iterateItems() as $node) { $keydata = []; foreach ($keyfields as $keyfield) { $keydata[] = (string)$node->$keyfield;