X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fconfig%2FGlobalVarConfig.php;h=589f7d3548cd508f882f1f667356a7eaf573cd0d;hb=2a1b1880eaadd4c35bc789870a45e45f14ffdb26;hp=0841a00419767dd1fe309b2a0822545411b49b19;hpb=abb5869cba1cca1c7d9bedfda6d3831bf2fc11a0;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/config/GlobalVarConfig.php b/includes/config/GlobalVarConfig.php index 0841a00419..589f7d3548 100644 --- a/includes/config/GlobalVarConfig.php +++ b/includes/config/GlobalVarConfig.php @@ -49,14 +49,17 @@ class GlobalVarConfig implements Config { * @see Config::get */ public function get( $name ) { + if ( !$this->has( $name ) ) { + throw new ConfigException( __METHOD__ . ": undefined option: '$name'" ); + } return $this->getWithPrefix( $this->prefix, $name ); } /** - * @see Config::set + * @see Config::has */ - public function set( $name, $value ) { - $this->setWithPrefix( $this->prefix, $name, $value ); + public function has( $name ) { + return $this->hasWithPrefix( $this->prefix, $name ); } /** @@ -64,25 +67,21 @@ class GlobalVarConfig implements Config { * * @param string $prefix Prefix to use on the variable, if one. * @param string $name Variable name without prefix - * @throws ConfigException * @return mixed */ protected function getWithPrefix( $prefix, $name ) { - $var = $prefix . $name; - if ( !array_key_exists( $var, $GLOBALS ) ) { - throw new ConfigException( __METHOD__ . ": undefined variable: '$var'" ); - } - return $GLOBALS[$var]; + return $GLOBALS[$prefix . $name]; } /** - * Get a variable with a given prefix, if not the defaults. + * Check if a variable with a given prefix is set * * @param string $prefix Prefix to use on the variable * @param string $name Variable name without prefix - * @param mixed $value Value to set + * @return bool */ - protected function setWithPrefix( $prefix, $name, $value ) { - $GLOBALS[$prefix . $name] = $value; + protected function hasWithPrefix( $prefix, $name ) { + $var = $prefix . $name; + return array_key_exists( $var, $GLOBALS ); } }