Merge branch

src/Translator/Translator.php

@@ -23,7 +23,7 @@
 /**
  * Translator.
  */
-class Translator
+class Translator implements TranslatorInterface
 {
     /**
      * Event fired when the translation for a message is missing.

src/Translator/TranslatorAwareInterface.php

@@ -14,18 +14,18 @@ interface TranslatorAwareInterface
     /**
      * Sets translator to use in helper
      *
-     * @param  Translator $translator  [optional] translator.
-     *                                 Default is null, which sets no translator.
-     * @param  string     $textDomain  [optional] text domain
-     *                                 Default is null, which skips setTranslatorTextDomain
+     * @param  TranslatorInterface $translator [optional] translator.
+     *                                          Default is null, which sets no translator.
+     * @param  string              $textDomain [optional] text domain
+     *                                          Default is null, which skips setTranslatorTextDomain
      * @return TranslatorAwareInterface
      */
-    public function setTranslator(Translator $translator = null, $textDomain = null);
+    public function setTranslator(TranslatorInterface $translator = null, $textDomain = null);
 
     /**
      * Returns translator used in object
      *
-     * @return Translator|null
+     * @return TranslatorInterface|null
      */
     public function getTranslator();
 

src/Translator/TranslatorAwareTrait.php

@@ -9,12 +9,10 @@
 
 namespace Zend\I18n\Translator;
 
-use Zend\I18n\Translator\Translator;
-
 trait TranslatorAwareTrait
 {
     /**
-     * @var Translator
+     * @var TranslatorInterface
      */
     protected $translator = null;
 
@@ -35,7 +33,7 @@ trait TranslatorAwareTrait
      * @param string $textDomain
      * @return mixed
      */
-    public function setTranslator(Translator $translator = null, $textDomain = null)
+    public function setTranslator(TranslatorInterface $translator = null, $textDomain = null)
     {
         $this->translator = $translator;
 

src/Translator/TranslatorInterface.php

@@ -0,0 +1,45 @@
+<?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\Translator;
+
+/**
+ * Translator interface.
+ */
+interface TranslatorInterface
+{
+    /**
+     * Translate a message.
+     *
+     * @param  string $message
+     * @param  string $textDomain
+     * @param  string $locale
+     * @return string
+     */
+    public function translate($message, $textDomain = 'default', $locale = null);
+
+    /**
+     * Translate a plural message.
+     *
+     * @param  string                         $singular
+     * @param  string                         $plural
+     * @param  int                            $number
+     * @param  string                         $textDomain
+     * @param  string|null                    $locale
+     * @return string
+     * @throws Exception\OutOfBoundsException
+     */
+    public function translatePlural(
+        $singular,
+        $plural,
+        $number,
+        $textDomain = 'default',
+        $locale = null
+    );
+}

src/Validator/PhoneNumber.php

@@ -9,6 +9,7 @@
 
 namespace Zend\I18n\Validator;
 
+use Locale;
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Validator\AbstractValidator;
@@ -28,13 +29,13 @@ class PhoneNumber extends AbstractValidator
     protected $messageTemplates = array(
         self::NO_MATCH    => 'The input does not match a phone number format',
         self::UNSUPPORTED => 'The country provided is currently unsupported',
-        self::INVALID     => 'Invalid type given.  String expected',
+        self::INVALID     => 'Invalid type given. String expected',
     );
 
     /**
      * Phone Number Patterns
      *
-     * @link http://libphonenumber.googlecode.com/svn/trunk/resources/PhoneNumberMetaData.xml
+     * @link http://code.google.com/p/libphonenumber/source/browse/trunk/resources/PhoneNumberMetadata.xml
      * @var array
      */
     protected static $phone = array();
@@ -86,6 +87,9 @@ public function __construct($options = array())
 
         if (array_key_exists('country', $options)) {
             $this->setCountry($options['country']);
+        } else {
+            $country = Locale::getRegion(Locale::getDefault());
+            $this->setCountry($country);
         }
 
         if (array_key_exists('allowed_types', $options)) {
@@ -164,7 +168,7 @@ public function setCountry($country)
      */
     protected function loadPattern($code)
     {
-        if (!isset(self::$phone[$code])) {
+        if (!isset(static::$phone[$code])) {
             if (!preg_match('/^[A-Z]{2}$/D', $code)) {
                 return false;
             }
@@ -174,10 +178,10 @@ protected function loadPattern($code)
                 return false;
             }
 
-            self::$phone[$code] = include $file;
+            static::$phone[$code] = include $file;
         }
 
-        return self::$phone[$code];
+        return static::$phone[$code];
     }
 
     /**
@@ -210,8 +214,20 @@ public function isValid($value = null, $context = null)
             }
         }
 
-        if ($countryPattern['code'] == substr($value, 0, strlen($countryPattern['code']))) {
-            $valueNoCountry = substr($value, strlen($countryPattern['code']));
+        $codeLength = strlen($countryPattern['code']);
+
+        /*
+         * Check for existence of either:
+         *   1) E.123/E.164 international prefix
+         *   2) International double-O prefix
+         *   3) Bare country prefix
+         */
+        if (('+' . $countryPattern['code']) == substr($value, 0, $codeLength + 1)) {
+            $valueNoCountry = substr($value, $codeLength + 1);
+        } elseif (('00' . $countryPattern['code']) == substr($value, 0, $codeLength + 2)) {
+            $valueNoCountry = substr($value, $codeLength + 2);
+        } elseif ($countryPattern['code'] == substr($value, 0, $codeLength)) {
+            $valueNoCountry = substr($value, $codeLength);
         }
 
         // check against allowed types strict match:

src/View/Helper/AbstractTranslatorHelper.php

@@ -9,7 +9,7 @@
 
 namespace Zend\I18n\View\Helper;
 
-use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorInterface;
 use Zend\I18n\Translator\TranslatorAwareInterface;
 use Zend\View\Helper\AbstractHelper;
 
@@ -19,7 +19,7 @@ abstract class AbstractTranslatorHelper extends AbstractHelper implements
     /**
      * Translator (optional)
      *
-     * @var Translator
+     * @var TranslatorInterface
      */
     protected $translator;
 
@@ -40,13 +40,13 @@ abstract class AbstractTranslatorHelper extends AbstractHelper implements
     /**
      * Sets translator to use in helper
      *
-     * @param  Translator $translator  [optional] translator.
-     *                                 Default is null, which sets no translator.
-     * @param  string     $textDomain  [optional] text domain
-     *                                 Default is null, which skips setTranslatorTextDomain
+     * @param  TranslatorInterface $translator [optional] translator.
+     *                                          Default is null, which sets no translator.
+     * @param  string              $textDomain [optional] text domain
+     *                                          Default is null, which skips setTranslatorTextDomain
      * @return AbstractTranslatorHelper
      */
-    public function setTranslator(Translator $translator = null, $textDomain = null)
+    public function setTranslator(TranslatorInterface $translator = null, $textDomain = null)
     {
         $this->translator = $translator;
         if (null !== $textDomain) {
@@ -59,7 +59,7 @@ public function setTranslator(Translator $translator = null, $textDomain = null)
     /**
      * Returns translator used in helper
      *
-     * @return Translator|null
+     * @return TranslatorInterface|null
      */
     public function getTranslator()
     {

src/View/Helper/DateFormat.php

@@ -90,7 +90,7 @@ public function __invoke(
         }
 
         // DateTime support for IntlDateFormatter::format() was only added in 5.3.4
-        if ($date instanceof DateTime && version_compare(PHP_VERSION, '5.3.4', '<')) {
+        if ($date instanceof DateTime && (PHP_VERSION_ID < 50304)) {
             $date = $date->getTimestamp();
         }
 
@@ -133,8 +133,11 @@ public function setTimezone($timezone)
     {
         $this->timezone = (string) $timezone;
 
+        // The method setTimeZoneId is deprecated as of PHP 5.5.0
+        $setTimeZoneMethodName = (PHP_VERSION_ID < 50500) ? 'setTimeZoneId' : 'setTimeZone';
+
         foreach ($this->formatters as $formatter) {
-            $formatter->setTimeZoneId($this->timezone);
+            $formatter->$setTimeZoneMethodName($this->timezone);
         }
 
         return $this;

test/Filter/AlnumTest.php

@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_I18n
  */
 
 namespace ZendTest\Filter;
@@ -14,9 +13,6 @@
 use Locale;
 
 /**
- * @category   Zend
- * @package    Zend_Filter
- * @subpackage UnitTests
  * @group      Zend_Filter
  */
 class AlnumTest extends \PHPUnit_Framework_TestCase
@@ -56,12 +52,16 @@ class AlnumTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->filter = new AlnumFilter();
 
         $this->locale               = Locale::getDefault();
         $language                   = Locale::getPrimaryLanguage($this->locale);
-        self::$meansEnglishAlphabet = in_array($language, array('ja'));
-        self::$unicodeEnabled       = (@preg_match('/\pL/u', 'a')) ? true : false;
+        static::$meansEnglishAlphabet = in_array($language, array('ja'));
+        static::$unicodeEnabled       = (@preg_match('/\pL/u', 'a')) ? true : false;
     }
 
     /**
@@ -71,7 +71,7 @@ public function setUp()
      */
     public function testBasic()
     {
-        if (!self::$unicodeEnabled) {
+        if (!static::$unicodeEnabled) {
             // POSIX named classes are not supported, use alternative a-zA-Z match
             $valuesExpected = array(
                 'abc123'  => 'abc123',
@@ -80,7 +80,7 @@ public function testBasic()
                 'AZ@#4.3' => 'AZ43',
                 ''        => ''
             );
-        } elseif (self::$meansEnglishAlphabet) {
+        } elseif (static::$meansEnglishAlphabet) {
             // The Alphabet means english alphabet.
 
             /**
@@ -123,7 +123,7 @@ public function testAllowWhiteSpace()
     {
         $this->filter->setAllowWhiteSpace(true);
 
-        if (!self::$unicodeEnabled) {
+        if (!static::$unicodeEnabled) {
             // POSIX named classes are not supported, use alternative a-zA-Z match
             $valuesExpected = array(
                 'abc123'  => 'abc123',
@@ -134,7 +134,7 @@ public function testAllowWhiteSpace()
                 "\n"      => "\n",
                 " \t "    => " \t "
             );
-        } elseif (self::$meansEnglishAlphabet) {
+        } elseif (static::$meansEnglishAlphabet) {
             //The Alphabet means english alphabet.
             $valuesExpected = array(
                 'a B ４5' => 'a B 5',

test/Filter/AlphaTest.php

@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_I18n
  */
 
 namespace ZendTest\Filter;
@@ -14,9 +13,6 @@
 use Locale;
 
 /**
- * @category   Zend
- * @package    Zend_Filter
- * @subpackage UnitTests
  * @group      Zend_Filter
  */
 class AlphaTest extends \PHPUnit_Framework_TestCase
@@ -56,6 +52,10 @@ class AlphaTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->filter = new AlphaFilter();
 
         $this->locale               = Locale::getDefault();