From 1a791fb9986a31ed19bd2c8f3becc16615240c6d Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 18 May 2020 16:38:36 +0200 Subject: [PATCH] net/firewall: style update --- .../controllers/OPNsense/Firewall/Api/FilterController.php | 1 - .../OPNsense/Firewall/Api/SourceNatController.php | 1 - .../OPNsense/Firewall/FieldTypes/SourceNatRuleField.php | 1 - .../app/models/OPNsense/Firewall/Migrations/MFP1_0_0.php | 6 ++++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php b/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php index 28e4151a7..225a07b72 100644 --- a/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php +++ b/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php @@ -27,7 +27,6 @@ */ namespace OPNsense\Firewall\Api; - class FilterController extends FilterBaseController { public function searchRuleAction() diff --git a/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/SourceNatController.php b/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/SourceNatController.php index f55640e98..151bf14db 100644 --- a/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/SourceNatController.php +++ b/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/SourceNatController.php @@ -27,7 +27,6 @@ */ namespace OPNsense\Firewall\Api; - class SourceNatController extends FilterBaseController { public function searchRuleAction() diff --git a/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/SourceNatRuleField.php b/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/SourceNatRuleField.php index 7d7b6df4b..f00fb1c98 100644 --- a/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/SourceNatRuleField.php +++ b/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/SourceNatRuleField.php @@ -28,7 +28,6 @@ * */ - namespace OPNsense\Firewall\FieldTypes; use OPNsense\Base\FieldTypes\ArrayField; diff --git a/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/MFP1_0_0.php b/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/MFP1_0_0.php index d3db9e86f..2e33d2f7c 100644 --- a/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/MFP1_0_0.php +++ b/net/firewall/src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/MFP1_0_0.php @@ -39,8 +39,10 @@ class MFP1_0_0 extends BaseModelMigration { // Move OPNsense->Firewall->FilterRule ---> OPNsense->Firewall->Filter $cfgObj = Config::getInstance()->object(); - if (!empty($cfgObj->OPNsense) && !empty($cfgObj->OPNsense->Firewall) - && !empty($cfgObj->OPNsense->Firewall->FilterRule)) { + if ( + !empty($cfgObj->OPNsense) && !empty($cfgObj->OPNsense->Firewall) + && !empty($cfgObj->OPNsense->Firewall->FilterRule) + ) { // model migration created a new, empty rules section if (empty($cfgObj->OPNsense->Firewall->Filter->rules)) { unset($cfgObj->OPNsense->Firewall->Filter->rules);