Merge branch 'develop'

Preparing to tag 2.1.0 -- all new features from develop are now merged to master.
zendframework · Jan 29, 2013 · f30ec7d · f30ec7d
commit f30ec7d
Show file tree

Hide file tree

Showing 51 changed files with 845 additions and 239 deletions.
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -5,15 +5,9 @@
  * @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 Zend\I18n\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Exception
- */
 interface ExceptionInterface
 {}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -5,16 +5,10 @@
  * @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 Zend\I18n\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Exception
- */
 class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
 {}
diff --git a/src/Exception/OutOfBoundsException.php b/src/Exception/OutOfBoundsException.php
@@ -5,16 +5,10 @@
  * @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 Zend\I18n\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Exception
- */
 class OutOfBoundsException extends \OutOfBoundsException implements
     ExceptionInterface
 {}
diff --git a/src/Exception/ParseException.php b/src/Exception/ParseException.php
@@ -5,15 +5,9 @@
  * @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 Zend\I18n\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Exception
- */
 class ParseException extends RuntimeException implements ExceptionInterface
 {}
diff --git a/src/Exception/RangeException.php b/src/Exception/RangeException.php
@@ -5,15 +5,9 @@
  * @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 Zend\I18n\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Exception
- */
 class RangeException extends \RangeException implements ExceptionInterface
 {}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -5,15 +5,9 @@
  * @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 Zend\I18n\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Exception
- */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/src/Filter/AbstractLocale.php b/src/Filter/AbstractLocale.php
@@ -5,19 +5,13 @@
  * @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 Zend\I18n\Filter;
 
 use Locale;
 use Zend\Filter\AbstractFilter;
 
-/**
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Filter
- */
 abstract class AbstractLocale extends AbstractFilter
 {
     /**

diff --git a/src/Filter/Alnum.php b/src/Filter/Alnum.php
@@ -5,19 +5,13 @@
  * @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 Zend\I18n\Filter;
 
 use Locale;
 use Traversable;
 
-/**
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Filter
- */
 class Alnum extends AbstractLocale
 {
     /**

diff --git a/src/Filter/Alpha.php b/src/Filter/Alpha.php
@@ -5,18 +5,12 @@
  * @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 Zend\I18n\Filter;
 
 use Locale;
 
-/**
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Filter
- */
 class Alpha extends Alnum
 {
     /**

diff --git a/src/Filter/NumberFormat.php b/src/Filter/NumberFormat.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 Zend\I18n\Filter;
@@ -15,11 +14,6 @@
 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/src/Translator/Loader/FileLoaderInterface.php b/src/Translator/Loader/FileLoaderInterface.php
@@ -5,17 +5,12 @@
  * @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 Zend\I18n\Translator\Loader;
 
 /**
  * File loader interface.
- *
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Translator
  */
 interface FileLoaderInterface
 {

diff --git a/src/Translator/Loader/Gettext.php b/src/Translator/Loader/Gettext.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 Zend\I18n\Translator\Loader;
@@ -17,10 +16,6 @@
 
 /**
  * Gettext loader.
- *
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Translator
  */
 class Gettext implements FileLoaderInterface
 {

diff --git a/src/Translator/Loader/Ini.php b/src/Translator/Loader/Ini.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\I18n\Translator\Loader;
+
+use Zend\Config\Reader\Ini as IniReader;
+use Zend\I18n\Exception;
+use Zend\I18n\Translator\Plural\Rule as PluralRule;
+use Zend\I18n\Translator\TextDomain;
+
+/**
+ * PHP INI format loader.
+ */
+class Ini implements FileLoaderInterface
+{
+    /**
+     * load(): defined by FileLoaderInterface.
+     *
+     * @see    FileLoaderInterface::load()
+     * @param  string $locale
+     * @param  string $filename
+     * @return TextDomain|null
+     * @throws Exception\InvalidArgumentException
+     */
+    public function load($locale, $filename)
+    {
+        if (!is_file($filename) || !is_readable($filename)) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                'Could not open file %s for reading',
+                $filename
+            ));
+        }
+
+        $messages           = array();
+        $iniReader          = new IniReader();
+        $messagesNamespaced = $iniReader->fromFile($filename);
+
+        $list = $messagesNamespaced;
+        if (isset($messagesNamespaced['translation'])) {
+           $list = $messagesNamespaced['translation'];
+        }
+
+        foreach ($list as $message) {
+            if (!is_array($message) || count($message) < 2) {
+                throw new Exception\InvalidArgumentException(
+                    'Each INI row must be an array with message and translation'
+                );
+            }
+            if (isset($message['message']) && isset($message['translation'])) {
+                $messages[$message['message']] = $message['translation'];
+                continue;
+            }
+            $messages[array_shift($message)] = array_shift($message);
+        }
+
+        if (!is_array($messages)) {
+            throw new Exception\InvalidArgumentException(sprintf(
+                'Expected an array, but received %s',
+                gettype($messages)
+            ));
+        }
+
+        $textDomain = new TextDomain($messages);
+
+        if (array_key_exists('plural', $messagesNamespaced)
+            && isset($messagesNamespaced['plural']['plural_forms'])
+        ) {
+            $textDomain->setPluralRule(
+                PluralRule::fromString($messagesNamespaced['plural']['plural_forms'])
+            );
+        }
+
+        return $textDomain;
+    }
+}
diff --git a/src/Translator/Loader/PhpArray.php b/src/Translator/Loader/PhpArray.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 Zend\I18n\Translator\Loader;
@@ -16,10 +15,6 @@
 
 /**
  * PHP array loader.
- *
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Translator
  */
 class PhpArray implements FileLoaderInterface
 {

diff --git a/src/Translator/Loader/RemoteLoaderInterface.php b/src/Translator/Loader/RemoteLoaderInterface.php
@@ -5,17 +5,12 @@
  * @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 Zend\I18n\Translator\Loader;
 
 /**
  * Remote loader interface.
- *
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Translator
  */
 interface RemoteLoaderInterface
 {

diff --git a/src/Translator/LoaderPluginManager.php b/src/Translator/LoaderPluginManager.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 Zend\I18n\Translator;
@@ -19,10 +18,6 @@
  * Enforces that loaders retrieved are either instances of
  * Loader\FileLoaderInterface or Loader\RemoteLoaderInterface. Additionally,
  * it registers a number of default loaders.
- *
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Translator
  */
 class LoaderPluginManager extends AbstractPluginManager
 {
@@ -32,8 +27,9 @@ class LoaderPluginManager extends AbstractPluginManager
      * @var array
      */
     protected $invokableClasses = array(
-        'phparray' => 'Zend\I18n\Translator\Loader\PhpArray',
         'gettext'  => 'Zend\I18n\Translator\Loader\Gettext',
+        'ini'      => 'Zend\I18n\Translator\Loader\Ini',
+        'phparray' => 'Zend\I18n\Translator\Loader\PhpArray',
     );
 
     /**

diff --git a/src/Translator/Plural/Parser.php b/src/Translator/Plural/Parser.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 Zend\I18n\Translator\Plural;
@@ -17,10 +16,6 @@
  *
  * This plural rule parser is implemented after the article "Top Down Operator
  * Precedence" described in <http://javascript.crockford.com/tdop/tdop.html>.
- *
- * @category   Zend
- * @package    Zend_I18n
- * @subpackage Translator
  */
 class Parser
 {