Merge remote branch 'Seldaek/exception_msg'

* Seldaek/exception_msg:
  [Config] Improved exception message a bit
This commit is contained in:
Fabien Potencier 2011-03-06 10:32:12 +01:00
commit a972770371

View File

@ -237,7 +237,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
/** /**
* Sets the node prototype. * Sets the node prototype.
* *
* @param PrototypeNodeInterface $node * @param PrototypeNodeInterface $node
* @throws \RuntimeException if the node doesn't have concrete children * @throws \RuntimeException if the node doesn't have concrete children
*/ */
public function setPrototype(PrototypeNodeInterface $node) public function setPrototype(PrototypeNodeInterface $node)
@ -276,7 +276,7 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
/** /**
* Finalises the value of this node. * Finalises the value of this node.
* *
* @param mixed $value * @param mixed $value
* @return mixed The finalised value * @return mixed The finalised value
* @throws UnsetKeyException * @throws UnsetKeyException
* @throws InvalidConfigurationException if the node doesn't have enough children * @throws InvalidConfigurationException if the node doesn't have enough children
@ -470,7 +470,9 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface
if (!$this->allowNewKeys) { if (!$this->allowNewKeys) {
throw new InvalidConfigurationException(sprintf( throw new InvalidConfigurationException(sprintf(
'You are not allowed to define new elements for path "%s". ' 'You are not allowed to define new elements for path "%s". '
.'Please define all elements for this path in one config file.', .'Please define all elements for this path in one config file. '
.'If you are trying to overwrite an element, make sure you redefine it '
.'with the same name.',
$this->getPath() $this->getPath()
)); ));
} }