Merge branch 'feature/exceptions'

src/Exception/InvalidArgumentException.php

@@ -26,8 +26,6 @@
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
-{
-}
+class InvalidArgumentException extends \InvalidArgumentException implements 
+    ExceptionInterface
+{}

src/Exception/RuntimeException.php

@@ -26,8 +26,5 @@
  * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
-{
-}
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{}

src/Processor/Constant.php

@@ -22,8 +22,8 @@
 
 use Zend\Config\Config,
     Zend\Config\Exception\InvalidArgumentException,
-    \Traversable,
-    \ArrayObject;
+    Traversable,
+    ArrayObject;
 
 /**
  * @category   Zend

src/Processor/Filter.php

@@ -23,8 +23,8 @@
 use Zend\Config\Config,
     Zend\Config\Exception,
     Zend\Filter\FilterInterface as ZendFilter,
-    \Traversable,
-    \ArrayObject;
+    Traversable,
+    ArrayObject;
 
 /**
  * @category   Zend
@@ -35,31 +35,30 @@
 class Filter implements ProcessorInterface
 {
     /**
-     * @var \Zend\Filter\FilterInterface
+     * @var ZendFilter
      */
     protected $filter;
 
     /**
      * Filter all config values using the supplied Zend\Filter
      *
-     * @param \Zend\Filter\FilterInterface $filter
-     * @return \Zend\Config\Processor\Filter
+     * @param ZendFilter $filter
      */
     public function __construct(ZendFilter $filter)
     {
         $this->setFilter($filter);
     }
 
     /**
-     * @return \Zend\Filter\FilterInterface
+     * @return ZendFilter
      */
     public function getFilter()
     {
         return $this->filter;
     }
 
     /**
-     * @param \Zend\Filter\FilterInterface $filter
+     * @param ZendFilter $filter
      */
     public function setFilter(ZendFilter $filter)
     {

src/Processor/ProcessorInterface.php

@@ -34,7 +34,7 @@ interface ProcessorInterface
      * Process the whole Config structure and recursively parse all its values.
      *
      * @param Config $value
-     * @return \Zend\Config\Config
+     * @return Config
      */
     public function process(Config $value);
 

src/Processor/Token.php

@@ -22,8 +22,8 @@
 
 use Zend\Config\Config,
     Zend\Config\Exception,
-    \Traversable,
-    \ArrayObject;
+    Traversable,
+    ArrayObject;
 
 /**
  * @category   Zend

src/Processor/Translator.php

@@ -24,8 +24,8 @@
     Zend\Config\Exception\InvalidArgumentException,
     Zend\Translator\Translator as ZendTranslator,
     Zend\Locale\Locale,
-    \Traversable,
-    \ArrayObject;
+    Traversable,
+    ArrayObject;
 
 /**
  * @category   Zend
@@ -36,12 +36,12 @@
 class Translator implements ProcessorInterface
 {
     /**
-     * @var \Zend\Translator\Translator
+     * @var ZendTranslator
      */
     protected $translator;
 
     /**
-     * @var \Zend\Locale\Locale|string|null
+     * @var Locale|string|null
      */
     protected $locale = null;
 
@@ -60,37 +60,44 @@ public function __construct(ZendTranslator $translator, $locale = null)
     }
 
     /**
-     * @return \Zend\Translator\Translator
+     * @return ZendTranslator
      */
     public function getTranslator()
     {
         return $this->translator;
     }
 
     /**
-     * @param \Zend\Translator\Translator $translator
+     * @param ZendTranslator $translator
      */
     public function setTranslator(ZendTranslator $translator)
     {
         $this->translator = $translator;
     }
 
     /**
-     * @return \Zend\Locale\Locale|string|null
+     * @return Locale|string|null
      */
     public function getLocale()
     {
         return $this->locale;
     }
 
     /**
-     * @param \Zend\Locale\Locale|string|null $locale
+     * @param Locale|string|null $locale
      */
     public function setLocale($locale)
     {
         $this->locale = $locale;
     }
 
+    /**
+     * Process
+     *
+     * @param Config $config
+     * @return Config
+     * @throws InvalidArgumentException
+     */
     public function process(Config $config)
     {
         if ($config->isReadOnly()) {