diff --git a/library/Director/IcingaConfig/ExtensibleSet.php b/library/Director/IcingaConfig/ExtensibleSet.php index 98bd6b89..3c8f7fc4 100644 --- a/library/Director/IcingaConfig/ExtensibleSet.php +++ b/library/Director/IcingaConfig/ExtensibleSet.php @@ -63,11 +63,6 @@ class ExtensibleSet return $this->resolvedValues; } - protected function hasBeenResolved() - { - return $this->resolvedValues !== null; - } - public function inheritFrom(ExtensibleSet $parent) { if ($this->ownValues !== null) { @@ -88,6 +83,17 @@ class ExtensibleSet return $this->recalculate(); } + public function forgetInheritedValues() + { + $this->inheritedValues = array(); + return $this; + } + + protected function hasBeenResolved() + { + return $this->resolvedValues !== null; + } + protected function stripBlacklistedValues($array) { $this->removeValuesFrom($array, $this->minusValues); @@ -95,12 +101,6 @@ class ExtensibleSet return $array; } - public function forgetInheritedValues() - { - $this->inheritedValues = array(); - return $this; - } - protected function assertValidValue($value) { if (null === $this->allowedValues) {