Merge branch 'hotfix/4284' into develop

Forward port zendframework/zendframework#4293

Conflicts:
	library/Zend/I18n/View/Helper/CurrencyFormat.php
	library/Zend/I18n/View/Helper/DateFormat.php
	library/Zend/I18n/View/Helper/NumberFormat.php
	library/Zend/I18n/View/Helper/Plural.php
	library/Zend/I18n/composer.json

composer.json

@@ -29,7 +29,7 @@
         "phpunit/PHPUnit": "~4.0"
     },
     "suggest": {
-        "ext-intl": "ext/intl for i18n features",
+        "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
         "zendframework/zend-cache": "Zend\\Cache component",
         "zendframework/zend-config": "Zend\\Config component",
         "zendframework/zend-eventmanager": "You should install this package to use the events in the translator",

src/Exception/ExtensionNotLoadedException.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\I18n\Exception;
+
+use DomainException;
+
+class ExtensionNotLoadedException extends DomainException implements
+    ExceptionInterface
+{}

src/Filter/AbstractLocale.php

@@ -11,9 +11,23 @@
 
 use Locale;
 use Zend\Filter\AbstractFilter;
+use Zend\I18n\Exception;
 
 abstract class AbstractLocale extends AbstractFilter
 {
+    /**
+     * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
+     */
+    public function __construct()
+    {
+        if (!extension_loaded('intl')) {
+            throw new Exception\ExtensionNotLoadedException(sprintf(
+                '%s component requires the intl PHP extension',
+                __NAMESPACE__
+            ));
+        }
+    }
+
     /**
      * Sets the locale option
      *

src/Filter/Alnum.php

@@ -30,6 +30,7 @@ class Alnum extends AbstractLocale
      */
     public function __construct($allowWhiteSpaceOrOptions = null, $locale = null)
     {
+        parent::__construct();
         if ($allowWhiteSpaceOrOptions !== null) {
             if (static::isOptions($allowWhiteSpaceOrOptions)) {
                 $this->setOptions($allowWhiteSpaceOrOptions);

src/Filter/NumberFormat.php

@@ -37,6 +37,7 @@ public function __construct(
         $style = NumberFormatter::DEFAULT_STYLE,
         $type = NumberFormatter::TYPE_DOUBLE)
     {
+        parent::__construct();
         if ($localeOrOptions !== null) {
             if ($localeOrOptions instanceof Traversable) {
                 $localeOrOptions = iterator_to_array($localeOrOptions);

src/Translator/Translator.php

@@ -217,10 +217,17 @@ public function setLocale($locale)
      * Get the default locale.
      *
      * @return string
+     * @throws Exception\ExtensionNotLoadedException if ext/intl is not present and no locale set
      */
     public function getLocale()
     {
         if ($this->locale === null) {
+            if (!extension_loaded('intl')) {
+                throw new Exception\ExtensionNotLoadedException(sprintf(
+                    '%s component requires the intl PHP extension',
+                    __NAMESPACE__
+                ));
+            }
             $this->locale = Locale::getDefault();
         }
 

src/Validator/Float.php

@@ -12,6 +12,7 @@
 use Locale;
 use NumberFormatter;
 use Traversable;
+use Zend\I18n\Exception as I18nException;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Validator\AbstractValidator;
 use Zend\Validator\Exception;
@@ -40,9 +41,17 @@ class Float extends AbstractValidator
      * Constructor for the integer validator
      *
      * @param array|Traversable $options
+     * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
      */
     public function __construct($options = array())
     {
+        if (!extension_loaded('intl')) {
+            throw new I18nException\ExtensionNotLoadedException(sprintf(
+                '%s component requires the intl PHP extension',
+                __NAMESPACE__
+            ));
+        }
+
         if ($options instanceof Traversable) {
             $options = ArrayUtils::iteratorToArray($options);
         }

src/Validator/Int.php

@@ -12,6 +12,7 @@
 use Locale;
 use NumberFormatter;
 use Traversable;
+use Zend\I18n\Exception as I18nException;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Validator\AbstractValidator;
 use Zend\Validator\Exception;
@@ -40,9 +41,17 @@ class Int extends AbstractValidator
      * Constructor for the integer validator
      *
      * @param  array|Traversable $options
+     * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
      */
     public function __construct($options = array())
     {
+        if (!extension_loaded('intl')) {
+            throw new I18nException\ExtensionNotLoadedException(sprintf(
+                '%s component requires the intl PHP extension',
+                __NAMESPACE__
+            ));
+        }
+
         if ($options instanceof Traversable) {
             $options = ArrayUtils::iteratorToArray($options);
         }

src/Validator/PostCode.php

@@ -11,6 +11,7 @@
 
 use Locale;
 use Traversable;
+use Zend\I18n\Exception as I18nException;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Validator\AbstractValidator;
 use Zend\Validator\Callback;
@@ -226,9 +227,17 @@ class PostCode extends AbstractValidator
      * Accepts a string locale and/or "format".
      *
      * @param  array|Traversable $options
+     * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
      */
     public function __construct($options = array())
     {
+        if (!extension_loaded('intl')) {
+            throw new I18nException\ExtensionNotLoadedException(sprintf(
+                '%s component requires the intl PHP extension',
+                __NAMESPACE__
+            ));
+        }
+
         if ($options instanceof Traversable) {
             $options = ArrayUtils::iteratorToArray($options);
         }

src/View/Helper/AbstractTranslatorHelper.php

@@ -9,6 +9,7 @@
 
 namespace Zend\I18n\View\Helper;
 
+use Zend\I18n\Exception;
 use Zend\I18n\Translator\Translator;
 use Zend\I18n\Translator\TranslatorAwareInterface;
 use Zend\View\Helper\AbstractHelper;
@@ -30,6 +31,19 @@ abstract class AbstractTranslatorHelper extends AbstractHelper implements
      */
     protected $translatorTextDomain = 'default';
 
+    /**
+     * @throws Exception\ExtensionsNotLoadedException if ext/intl is not present
+     */
+    public function __construct()
+    {
+        if (!extension_loaded('intl')) {
+            throw new Exception\ExtensionNotLoadedException(sprintf(
+                '%s component requires the intl PHP extension',
+                __NAMESPACE__
+            ));
+        }
+    }
+
     /**
      * Whether translator should be used
      *

src/View/Helper/CurrencyFormat.php

@@ -11,6 +11,7 @@
 
 use Locale;
 use NumberFormatter;
+use Zend\I18n\Exception;
 use Zend\View\Helper\AbstractHelper;
 
 /**
@@ -46,6 +47,19 @@ class CurrencyFormat extends AbstractHelper
      */
     protected $showDecimals = true;
 
+    /**
+     * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
+     */
+    public function __construct()
+    {
+        if (!extension_loaded('intl')) {
+            throw new Exception\ExtensionNotLoadedException(sprintf(
+                '%s component requires the intl PHP extension',
+                __NAMESPACE__
+            ));
+        }
+    }
+
     /**
      * Format a number
      *

src/View/Helper/DateFormat.php

@@ -41,6 +41,19 @@ class DateFormat extends AbstractHelper
      */
     protected $formatters = array();
 
+    /**
+     * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
+     */
+    public function __construct()
+    {
+        if (!extension_loaded('intl')) {
+            throw new Exception\ExtensionNotLoadedException(sprintf(
+                '%s component requires the intl PHP extension',
+                __NAMESPACE__
+            ));
+        }
+    }
+
     /**
      * Format a date
      *

src/View/Helper/NumberFormat.php

@@ -11,6 +11,7 @@
 
 use Locale;
 use NumberFormatter;
+use Zend\I18n\Exception;
 use Zend\View\Helper\AbstractHelper;
 
 /**
@@ -53,6 +54,19 @@ class NumberFormat extends AbstractHelper
      */
     protected $locale;
 
+    /**
+     * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
+     */
+    public function __construct()
+    {
+        if (!extension_loaded('intl')) {
+            throw new Exception\ExtensionNotLoadedException(sprintf(
+                '%s component requires the intl PHP extension',
+                __NAMESPACE__
+            ));
+        }
+    }
+
     /**
      * Format a number
      *

src/View/Helper/Plural.php

@@ -34,6 +34,19 @@ class Plural extends AbstractHelper
      */
     protected $rule;
 
+    /**
+     * @throws Exception\ExtensionNotLoadedException if ext/intl is not present
+     */
+    public function __construct()
+    {
+        if (!extension_loaded('intl')) {
+            throw new Exception\ExtensionNotLoadedException(sprintf(
+                '%s component requires the intl PHP extension',
+                __NAMESPACE__
+            ));
+        }
+    }
+
     /**
      * Given an array of strings, a number and, if wanted, an optional locale (the default one is used
      * otherwise), this picks the right string according to plural rules of the locale