Merge branch 'release'

zendframework · Sep 10, 2012 · 6a43cc1 · 6a43cc1
commit 6a43cc1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Processor/Token.php b/src/Processor/Token.php
@@ -200,7 +200,7 @@ protected function buildMap()
      *
      * @param  Config $config
      * @return Config
-     * @throws InvalidArgumentException
+     * @throws Exception\InvalidArgumentException
      */
     public function process(Config $config)
     {

diff --git a/src/Reader/Ini.php b/src/Reader/Ini.php
@@ -63,7 +63,7 @@ public function getNestSeparator()
      * @see    ReaderInterface::fromFile()
      * @param  string $filename
      * @return array
-     * @throws Exception\InvalidArgumentException
+     * @throws Exception\RuntimeException
      */
     public function fromFile($filename)
     {

diff --git a/src/Reader/Yaml.php b/src/Reader/Yaml.php
@@ -56,7 +56,7 @@ public function __construct($yamlDecoder = null)
      *
      * @param  string|callable $yamlDecoder the decoder to set
      * @return Yaml
-     * @throws Exception\InvalidArgumentException
+     * @throws Exception\RuntimeException
      */
     public function setYamlDecoder($yamlDecoder)
     {