Merge branch 'hotfix/2734' into develop

Forward port #2734
zendframework · Oct 16, 2012 · a48ba5f · a48ba5f
2 parents 2379745 + c40c3e8
commit a48ba5f
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 16 deletions.
diff --git a/library/Zend/I18n/Exception/ExceptionInterface.php b/library/Zend/I18n/Exception/ExceptionInterface.php
@@ -13,7 +13,7 @@
 /**
  * @category   Zend
  * @package    Zend_I18n
- * @subpackage Translator
+ * @subpackage Exception
  */
 interface ExceptionInterface
 {}
diff --git a/library/Zend/I18n/Exception/InvalidArgumentException.php b/library/Zend/I18n/Exception/InvalidArgumentException.php
@@ -13,7 +13,7 @@
 /**
  * @category   Zend
  * @package    Zend_I18n
- * @subpackage Translator
+ * @subpackage Exception
  */
 class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface

diff --git a/library/Zend/I18n/Exception/OutOfBoundsException.php b/library/Zend/I18n/Exception/OutOfBoundsException.php
@@ -13,7 +13,7 @@
 /**
  * @category   Zend
  * @package    Zend_I18n
- * @subpackage Translator
+ * @subpackage Exception
  */
 class OutOfBoundsException extends \OutOfBoundsException implements
     ExceptionInterface

diff --git a/library/Zend/I18n/Exception/ParseException.php b/library/Zend/I18n/Exception/ParseException.php
@@ -13,7 +13,7 @@
 /**
  * @category   Zend
  * @package    Zend_I18n
- * @subpackage Translator
+ * @subpackage Exception
  */
 class ParseException extends RuntimeException implements ExceptionInterface
 {}
diff --git a/library/Zend/I18n/Exception/RangeException.php b/library/Zend/I18n/Exception/RangeException.php
@@ -13,7 +13,7 @@
 /**
  * @category   Zend
  * @package    Zend_I18n
- * @subpackage Translator
+ * @subpackage Exception
  */
 class RangeException extends \RangeException implements ExceptionInterface
 {}
diff --git a/library/Zend/I18n/Exception/RuntimeException.php b/library/Zend/I18n/Exception/RuntimeException.php
@@ -13,7 +13,7 @@
 /**
  * @category   Zend
  * @package    Zend_I18n
- * @subpackage Translator
+ * @subpackage Exception
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/library/Zend/I18n/Filter/AbstractLocale.php b/library/Zend/I18n/Filter/AbstractLocale.php
@@ -15,7 +15,8 @@
 
 /**
  * @category   Zend
- * @package    Zend_Filter
+ * @package    Zend_I18n
+ * @subpackage Filter
  */
 abstract class AbstractLocale extends AbstractFilter
 {

diff --git a/library/Zend/I18n/Filter/Alnum.php b/library/Zend/I18n/Filter/Alnum.php
@@ -15,7 +15,8 @@
 
 /**
  * @category   Zend
- * @package    Zend_Filter
+ * @package    Zend_I18n
+ * @subpackage Filter
  */
 class Alnum extends AbstractLocale
 {

diff --git a/library/Zend/I18n/Filter/Alpha.php b/library/Zend/I18n/Filter/Alpha.php
@@ -14,7 +14,8 @@
 
 /**
  * @category   Zend
- * @package    Zend_Filter
+ * @package    Zend_I18n
+ * @subpackage Filter
  */
 class Alpha extends Alnum
 {

diff --git a/library/Zend/I18n/Filter/NumberFormat.php b/library/Zend/I18n/Filter/NumberFormat.php
@@ -15,6 +15,11 @@
 use Zend\I18n\Exception;
 use Zend\Stdlib\ErrorHandler;
 
+/**
+ * @category   Zend
+ * @package    Zend_I18n
+ * @subpackage Filter
+ */
 class NumberFormat extends AbstractLocale
 {
     protected $options = array(

diff --git a/library/Zend/I18n/Validator/Alnum.php b/library/Zend/I18n/Validator/Alnum.php
@@ -15,7 +15,8 @@
 
 /**
  * @category   Zend
- * @package    Zend_Validate
+ * @package    Zend_I18n
+ * @subpackage Validator
  */
 class Alnum extends AbstractValidator
 {

diff --git a/library/Zend/I18n/Validator/Alpha.php b/library/Zend/I18n/Validator/Alpha.php
@@ -14,7 +14,8 @@
 
 /**
  * @category   Zend
- * @package    Zend_Validate
+ * @package    Zend_I18n
+ * @subpackage Validator
  */
 class Alpha extends Alnum
 {

diff --git a/library/Zend/I18n/Validator/Float.php b/library/Zend/I18n/Validator/Float.php
@@ -19,7 +19,8 @@
 
 /**
  * @category   Zend
- * @package    Zend_Validate
+ * @package    Zend_I18n
+ * @subpackage Validator
  */
 class Float extends AbstractValidator
 {

diff --git a/library/Zend/I18n/Validator/Int.php b/library/Zend/I18n/Validator/Int.php
@@ -19,7 +19,8 @@
 
 /**
  * @category   Zend
- * @package    Zend_Validate
+ * @package    Zend_I18n
+ * @subpackage Validator
  */
 class Int extends AbstractValidator
 {

diff --git a/library/Zend/I18n/Validator/PostCode.php b/library/Zend/I18n/Validator/PostCode.php
@@ -19,7 +19,8 @@
 
 /**
  * @category   Zend
- * @package    Zend_Validate
+ * @package    Zend_I18n
+ * @subpackage Validator
  */
 class PostCode extends AbstractValidator
 {

diff --git a/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php b/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
@@ -16,8 +16,8 @@
 
 /**
  * @category   Zend
- * @package    Zend_View
- * @subpackage Helper
+ * @package    Zend_I18n
+ * @subpackage View
  */
 abstract class AbstractTranslatorHelper extends AbstractHelper implements
     TranslatorAwareInterface