ExtensibleSet: re-order public/protected methods

This commit is contained in:
Thomas Gelf 2016-02-29 12:25:35 +01:00
parent 23dd4721ec
commit e70de0a4af

View File

@ -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) {