change self to static so the parent class can have access to the child constant

This commit is contained in:
Thomas Rabaix 2011-05-24 18:25:28 +02:00
parent 38ea3f4f3a
commit be2c427053

View File

@ -92,7 +92,7 @@ class MaskBuilder
*/ */
public function add($mask) public function add($mask)
{ {
if (is_string($mask) && defined($name = 'self::MASK_'.strtoupper($mask))) { if (is_string($mask) && defined($name = 'static::MASK_'.strtoupper($mask))) {
$mask = constant($name); $mask = constant($name);
} else if (!is_int($mask)) { } else if (!is_int($mask)) {
throw new \InvalidArgumentException('$mask must be an integer.'); throw new \InvalidArgumentException('$mask must be an integer.');
@ -145,7 +145,7 @@ class MaskBuilder
*/ */
public function remove($mask) public function remove($mask)
{ {
if (is_string($mask) && defined($name = 'self::MASK_'.strtoupper($mask))) { if (is_string($mask) && defined($name = 'static::MASK_'.strtoupper($mask))) {
$mask = constant($name); $mask = constant($name);
} else if (!is_int($mask)) { } else if (!is_int($mask)) {
throw new \InvalidArgumentException('$mask must be an integer.'); throw new \InvalidArgumentException('$mask must be an integer.');
@ -189,7 +189,7 @@ class MaskBuilder
} }
if ($mask === $cMask) { if ($mask === $cMask) {
if (!defined($cName = 'self::CODE_'.substr($name, 5))) { if (!defined($cName = 'static::CODE_'.substr($name, 5))) {
throw new \RuntimeException('There was no code defined for this mask.'); throw new \RuntimeException('There was no code defined for this mask.');
} }