From 280781b582a32dc698fe8d5cbc2f04ffacfd8eda Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Sat, 23 Dec 2017 12:45:17 +0100 Subject: [PATCH] firewall/rule parser, better to switch fetchActualRules() to a generator. --- src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php index a944d5b3e..39058f5b6 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php @@ -158,7 +158,6 @@ class FilterRule extends Rule */ private function fetchActualRules() { - $result = array(); $interfaces = empty($this->rule['interface']) ? array(null) : explode(',', $this->rule['interface']); foreach ($interfaces as $interface) { if (isset($this->rule['ipprotocol']) && $this->rule['ipprotocol'] == 'inet46') { @@ -255,10 +254,9 @@ class FilterRule extends Rule && isset($tmp['set-prio-low']) && $tmp['set-prio-low'] !== "" ) { $tmp['set-prio'] = "({$tmp['set-prio']}, {$tmp['set-prio-low']})"; } - $result[] = $tmp; + yield $tmp; } } - return $result; } /**