From ef3c4b7ed2332b14cf2c5941e958cd42e3d4edfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Mon, 20 May 2013 19:05:40 +0200
Subject: [PATCH 01/21] Rename Number filter to NumberParse

As suggested by @denixport.
---
 src/Filter/{Number.php => NumberParse.php}          | 2 +-
 test/Filter/{NumberTest.php => NumberParseTest.php} | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename src/Filter/{Number.php => NumberParse.php} (96%)
 rename test/Filter/{NumberTest.php => NumberParseTest.php} (89%)

diff --git a/src/Filter/Number.php b/src/Filter/NumberParse.php
similarity index 96%
rename from src/Filter/Number.php
rename to src/Filter/NumberParse.php
index e4bdc6e9..54e16e38 100644
--- a/src/Filter/Number.php
+++ b/src/Filter/NumberParse.php
@@ -12,7 +12,7 @@
 use Zend\I18n\Exception;
 use Zend\Stdlib\ErrorHandler;
 
-class Number extends NumberFormat
+class NumberParse extends NumberFormat
 {
 
     /**
diff --git a/test/Filter/NumberTest.php b/test/Filter/NumberParseTest.php
similarity index 89%
rename from test/Filter/NumberTest.php
rename to test/Filter/NumberParseTest.php
index 232ed951..068df896 100644
--- a/test/Filter/NumberTest.php
+++ b/test/Filter/NumberParseTest.php
@@ -11,14 +11,14 @@
 namespace ZendTest\I18n\Filter;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\I18n\Filter\Number as NumberFilter;
+use Zend\I18n\Filter\NumberParse as NumberParseFilter;
 use NumberFormatter;
 
 class NumberTest extends TestCase
 {
     public function testConstructWithOptions()
     {
-        $filter = new NumberFilter(array(
+        $filter = new NumberParseFilter(array(
             'locale' => 'en_US',
             'style'  => NumberFormatter::DECIMAL
         ));
@@ -29,7 +29,7 @@ public function testConstructWithOptions()
 
     public function testConstructWithParameters()
     {
-        $filter = new NumberFilter('en_US', NumberFormatter::DECIMAL);
+        $filter = new NumberParseFilter('en_US', NumberFormatter::DECIMAL);
 
         $this->assertEquals('en_US', $filter->getLocale());
         $this->assertEquals(NumberFormatter::DECIMAL, $filter->getStyle());
@@ -45,7 +45,7 @@ public function testConstructWithParameters()
      */
     public function testFormattedToNumber($locale, $style, $type, $value, $expected)
     {
-        $filter = new NumberFilter($locale, $style, $type);
+        $filter = new NumberParseFilter($locale, $style, $type);
         $this->assertSame($expected, $filter->filter($value));
     }
 

From bff68299e32ef38e88c0a41cb5cd2b33f835491c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Tue, 21 May 2013 00:20:08 +0200
Subject: [PATCH 02/21] Remove package annotation

As suggested by @samsonasik.
---
 test/Filter/NumberFormatTest.php | 1 -
 test/Filter/NumberParseTest.php  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/test/Filter/NumberFormatTest.php b/test/Filter/NumberFormatTest.php
index cec23e7b..8df09fad 100644
--- a/test/Filter/NumberFormatTest.php
+++ b/test/Filter/NumberFormatTest.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\I18n\Filter;
diff --git a/test/Filter/NumberParseTest.php b/test/Filter/NumberParseTest.php
index 068df896..1cecbc7e 100644
--- a/test/Filter/NumberParseTest.php
+++ b/test/Filter/NumberParseTest.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\I18n\Filter;

From 0a3141020df7fb76a1fbbac00869d9a6586f0616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <andreas@carzapp.net>
Date: Tue, 21 May 2013 14:04:45 +0200
Subject: [PATCH 03/21] Fix condition

---
 src/Filter/NumberParse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Filter/NumberParse.php b/src/Filter/NumberParse.php
index 54e16e38..cabce4f8 100644
--- a/src/Filter/NumberParse.php
+++ b/src/Filter/NumberParse.php
@@ -25,7 +25,7 @@ class NumberParse extends NumberFormat
     public function filter($value)
     {
         if (!is_int($value)
-            || !is_float($value)) {
+            && !is_float($value)) {
 
             ErrorHandler::start();
 

From 7edf50ccb381a0516ed1546e0b9d182fcb150865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <andreas@carzapp.net>
Date: Tue, 21 May 2013 16:33:04 +0200
Subject: [PATCH 04/21] Change order of inheritance

---
 src/Filter/NumberFormat.php | 138 ++++--------------------------------
 src/Filter/NumberParse.php  | 119 ++++++++++++++++++++++++++++++-
 2 files changed, 131 insertions(+), 126 deletions(-)

diff --git a/src/Filter/NumberFormat.php b/src/Filter/NumberFormat.php
index 7c626790..b1091854 100644
--- a/src/Filter/NumberFormat.php
+++ b/src/Filter/NumberFormat.php
@@ -9,127 +9,11 @@
 
 namespace Zend\I18n\Filter;
 
-use NumberFormatter;
-use Traversable;
 use Zend\I18n\Exception;
 use Zend\Stdlib\ErrorHandler;
 
-class NumberFormat extends AbstractLocale
+class NumberFormat extends NumberParse
 {
-    protected $options = array(
-        'locale' => null,
-        'style'  => NumberFormatter::DEFAULT_STYLE,
-        'type'   => NumberFormatter::TYPE_DOUBLE
-    );
-
-    /**
-     * @var NumberFormatter
-     */
-    protected $formatter = null;
-
-    /**
-     * @param array|Traversable|string|null $localeOrOptions
-     * @param int  $style
-     * @param int  $type
-     */
-    public function __construct(
-        $localeOrOptions = null,
-        $style = NumberFormatter::DEFAULT_STYLE,
-        $type = NumberFormatter::TYPE_DOUBLE)
-    {
-        parent::__construct();
-        if ($localeOrOptions !== null) {
-            if ($localeOrOptions instanceof Traversable) {
-                $localeOrOptions = iterator_to_array($localeOrOptions);
-            }
-
-            if (!is_array($localeOrOptions)) {
-                $this->setLocale($localeOrOptions);
-                $this->setStyle($style);
-                $this->setType($type);
-            } else {
-                $this->setOptions($localeOrOptions);
-            }
-        }
-    }
-
-    /**
-     * @param  string|null $locale
-     * @return NumberFormat
-     */
-    public function setLocale($locale = null)
-    {
-        $this->options['locale'] = $locale;
-        $this->formatter = null;
-        return $this;
-    }
-
-    /**
-     * @param  int $style
-     * @return NumberFormat
-     */
-    public function setStyle($style)
-    {
-        $this->options['style'] = (int) $style;
-        $this->formatter = null;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStyle()
-    {
-        return $this->options['style'];
-    }
-
-    /**
-     * @param  int $type
-     * @return NumberFormat
-     */
-    public function setType($type)
-    {
-        $this->options['type'] = (int) $type;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->options['type'];
-    }
-
-    /**
-     * @param  NumberFormatter $formatter
-     * @return NumberFormat
-     */
-    public function setFormatter(NumberFormatter $formatter)
-    {
-        $this->formatter = $formatter;
-        return $this;
-    }
-
-    /**
-     * @return NumberFormatter
-     * @throws Exception\RuntimeException
-     */
-    public function getFormatter()
-    {
-        if ($this->formatter === null) {
-            $formatter = NumberFormatter::create($this->getLocale(), $this->getStyle());
-            if (!$formatter) {
-                throw new Exception\RuntimeException(
-                    'Can not create NumberFormatter instance; ' . intl_get_error_message()
-                );
-            }
-
-            $this->formatter = $formatter;
-        }
-
-        return $this->formatter;
-    }
 
     /**
      * Defined by Zend\Filter\FilterInterface
@@ -140,18 +24,22 @@ public function getFormatter()
      */
     public function filter($value)
     {
-        $formatter = $this->getFormatter();
-        $type      = $this->getType();
+        if (is_int($value)
+            || is_float($value)) {
 
-        if (is_int($value) || is_float($value)) {
             ErrorHandler::start();
-            $result = $formatter->format($value, $type);
+
+            $result = $this->getFormatter()->format(
+                $value,
+                $this->getType()
+            );
+
             ErrorHandler::stop();
+
         } else {
-            $value = str_replace(array("\xC2\xA0", ' '), '', $value);
-            ErrorHandler::start();
-            $result = $formatter->parse($value, $type);
-            ErrorHandler::stop();
+
+            $result = parent::filter($value);
+
         }
 
         if ($result === false) {
diff --git a/src/Filter/NumberParse.php b/src/Filter/NumberParse.php
index cabce4f8..7b58867e 100644
--- a/src/Filter/NumberParse.php
+++ b/src/Filter/NumberParse.php
@@ -9,11 +9,128 @@
 
 namespace Zend\I18n\Filter;
 
+use NumberFormatter;
+use Traversable;
 use Zend\I18n\Exception;
 use Zend\Stdlib\ErrorHandler;
 
-class NumberParse extends NumberFormat
+class NumberParse extends AbstractLocale
 {
+    protected $options = array(
+        'locale' => null,
+        'style'  => NumberFormatter::DEFAULT_STYLE,
+        'type'   => NumberFormatter::TYPE_DOUBLE
+    );
+
+    /**
+     * @var NumberFormatter
+     */
+    protected $formatter = null;
+
+    /**
+     * @param array|Traversable|string|null $localeOrOptions
+     * @param int  $style
+     * @param int  $type
+     */
+    public function __construct(
+        $localeOrOptions = null,
+        $style = NumberFormatter::DEFAULT_STYLE,
+        $type = NumberFormatter::TYPE_DOUBLE)
+    {
+        parent::__construct();
+        if ($localeOrOptions !== null) {
+            if ($localeOrOptions instanceof Traversable) {
+                $localeOrOptions = iterator_to_array($localeOrOptions);
+            }
+
+            if (!is_array($localeOrOptions)) {
+                $this->setLocale($localeOrOptions);
+                $this->setStyle($style);
+                $this->setType($type);
+            } else {
+                $this->setOptions($localeOrOptions);
+            }
+        }
+    }
+
+    /**
+     * @param  string|null $locale
+     * @return NumberFormat
+     */
+    public function setLocale($locale = null)
+    {
+        $this->options['locale'] = $locale;
+        $this->formatter = null;
+        return $this;
+    }
+
+    /**
+     * @param  int $style
+     * @return NumberFormat
+     */
+    public function setStyle($style)
+    {
+        $this->options['style'] = (int) $style;
+        $this->formatter = null;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStyle()
+    {
+        return $this->options['style'];
+    }
+
+    /**
+     * @param  int $type
+     * @return NumberFormat
+     */
+    public function setType($type)
+    {
+        $this->options['type'] = (int) $type;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType()
+    {
+        return $this->options['type'];
+    }
+
+    /**
+     * @param  NumberFormatter $formatter
+     * @return NumberFormat
+     */
+    public function setFormatter(NumberFormatter $formatter)
+    {
+        $this->formatter = $formatter;
+        return $this;
+    }
+
+    /**
+     * @return NumberFormatter
+     * @throws Exception\RuntimeException
+     */
+    public function getFormatter()
+    {
+        if ($this->formatter === null) {
+            $formatter = NumberFormatter::create($this->getLocale(), $this->getStyle());
+            if (!$formatter) {
+                throw new Exception\RuntimeException(
+                    'Can not create NumberFormatter instance; ' . intl_get_error_message()
+                );
+            }
+
+            $this->formatter = $formatter;
+        }
+
+        return $this->formatter;
+    }
+
 
     /**
      * Defined by Zend\Filter\FilterInterface

From 68a68aa07d7028981234942cc2da5dbaa1f4fe8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Mo=CC=88ller?= <andreas@carzapp.net>
Date: Tue, 21 May 2013 16:37:46 +0200
Subject: [PATCH 05/21] Fix CS

---
 src/Filter/NumberFormat.php | 18 +++++++++---------
 src/Filter/NumberParse.php  |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Filter/NumberFormat.php b/src/Filter/NumberFormat.php
index b1091854..59217fd9 100644
--- a/src/Filter/NumberFormat.php
+++ b/src/Filter/NumberFormat.php
@@ -24,8 +24,12 @@ class NumberFormat extends NumberParse
      */
     public function filter($value)
     {
-        if (is_int($value)
-            || is_float($value)) {
+        if (!is_int($value)
+            && !is_float($value)) {
+
+            $result = parent::filter($value);
+
+        } else {
 
             ErrorHandler::start();
 
@@ -36,16 +40,12 @@ public function filter($value)
 
             ErrorHandler::stop();
 
-        } else {
-
-            $result = parent::filter($value);
-
         }
 
-        if ($result === false) {
-            return $value;
+        if (false !== $result) {
+            return str_replace("\xC2\xA0", ' ', $result);
         }
 
-        return str_replace("\xC2\xA0", ' ', $result);
+        return $value;
     }
 }
diff --git a/src/Filter/NumberParse.php b/src/Filter/NumberParse.php
index 7b58867e..7e7db22a 100644
--- a/src/Filter/NumberParse.php
+++ b/src/Filter/NumberParse.php
@@ -159,6 +159,5 @@ public function filter($value)
         }
 
         return $value;
-
     }
 }

From a4c69b71108dac5c1f81646ebdbf07e9b95b888e Mon Sep 17 00:00:00 2001
From: Robert Boloc <robertboloc@gmail.com>
Date: Tue, 21 May 2013 19:17:13 +0200
Subject: [PATCH 06/21] moved include path restore to tearDown, reused
 stream_resolved_include_path result

---
 src/Translator/Loader/PhpArray.php      | 6 +++---
 test/Translator/Loader/PhpArrayTest.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Translator/Loader/PhpArray.php b/src/Translator/Loader/PhpArray.php
index 9ac1f720..0ff8b41d 100644
--- a/src/Translator/Loader/PhpArray.php
+++ b/src/Translator/Loader/PhpArray.php
@@ -29,15 +29,15 @@ class PhpArray implements FileLoaderInterface
      */
     public function load($locale, $filename)
     {
-        if (!stream_resolve_include_path($filename) &&
-            (!is_file($filename) || !is_readable($filename))) {
+        $fromIncludePath = stream_resolve_include_path($filename);
+        if (!$fromIncludePath && (!is_file($filename) || !is_readable($filename))) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Could not open file %s for reading',
                 $filename
             ));
         }
 
-        $messages = include $filename;
+        $messages = include ($fromIncludePath !== false) ? $fromIncludePath : $filename;
 
         if (!is_array($messages)) {
             throw new Exception\InvalidArgumentException(sprintf(
diff --git a/test/Translator/Loader/PhpArrayTest.php b/test/Translator/Loader/PhpArrayTest.php
index 7c639ddc..114d35ac 100644
--- a/test/Translator/Loader/PhpArrayTest.php
+++ b/test/Translator/Loader/PhpArrayTest.php
@@ -30,6 +30,9 @@ public function setUp()
     public function tearDown()
     {
         Locale::setDefault($this->originalLocale);
+
+        // Restore original include path
+        restore_include_path();
     }
 
     public function testLoaderFailsToLoadMissingFile()
@@ -84,8 +87,5 @@ public function testLoaderLoadsFromIncludePath()
 
         $this->assertEquals('Message 1 (en)', $textDomain['Message 1']);
         $this->assertEquals('Message 4 (en)', $textDomain['Message 4']);
-
-        // Restore original include path
-        restore_include_path();
     }
 }

From 9182e7db43c31df7a53ee4812a9de0a128d893f3 Mon Sep 17 00:00:00 2001
From: Robert Boloc <robertboloc@gmail.com>
Date: Tue, 21 May 2013 22:11:22 +0200
Subject: [PATCH 07/21] backup original include path on setUp and restore on
 tearDown, unified loading

---
 src/Translator/Loader/PhpArray.php      |  7 +++----
 test/Translator/Loader/PhpArrayTest.php | 12 ++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Translator/Loader/PhpArray.php b/src/Translator/Loader/PhpArray.php
index 0ff8b41d..52b3f3ff 100644
--- a/src/Translator/Loader/PhpArray.php
+++ b/src/Translator/Loader/PhpArray.php
@@ -30,14 +30,13 @@ class PhpArray implements FileLoaderInterface
     public function load($locale, $filename)
     {
         $fromIncludePath = stream_resolve_include_path($filename);
-        if (!$fromIncludePath && (!is_file($filename) || !is_readable($filename))) {
+        if (!$fromIncludePath || !is_file($fromIncludePath) || !is_readable($fromIncludePath)) {
             throw new Exception\InvalidArgumentException(sprintf(
-                'Could not open file %s for reading',
-                $filename
+                    'Could not find or open file %s for reading', $filename
             ));
         }
 
-        $messages = include ($fromIncludePath !== false) ? $fromIncludePath : $filename;
+        $messages = include $fromIncludePath;
 
         if (!is_array($messages)) {
             throw new Exception\InvalidArgumentException(sprintf(
diff --git a/test/Translator/Loader/PhpArrayTest.php b/test/Translator/Loader/PhpArrayTest.php
index 114d35ac..b0033e69 100644
--- a/test/Translator/Loader/PhpArrayTest.php
+++ b/test/Translator/Loader/PhpArrayTest.php
@@ -18,6 +18,7 @@ class PhpArrayTest extends TestCase
 {
     protected $testFilesDir;
     protected $originalLocale;
+    protected $originalIncludePath;
 
     public function setUp()
     {
@@ -25,20 +26,22 @@ public function setUp()
         Locale::setDefault('en_EN');
 
         $this->testFilesDir = realpath(__DIR__ . '/../_files');
+
+        $this->originalIncludePath = get_include_path();
+        set_include_path($this->testFilesDir);
     }
 
     public function tearDown()
     {
         Locale::setDefault($this->originalLocale);
 
-        // Restore original include path
-        restore_include_path();
+        set_include_path($this->originalIncludePath);
     }
 
     public function testLoaderFailsToLoadMissingFile()
     {
         $loader = new PhpArrayLoader();
-        $this->setExpectedException('Zend\I18n\Exception\InvalidArgumentException', 'Could not open file');
+        $this->setExpectedException('Zend\I18n\Exception\InvalidArgumentException', 'Could not find or open file');
         $loader->load('en_EN', 'missing');
     }
 
@@ -79,9 +82,6 @@ public function testLoaderLoadsPluralRules()
 
     public function testLoaderLoadsFromIncludePath()
     {
-        // Set test include path
-        set_include_path($this->testFilesDir);
-
         $loader = new PhpArrayLoader();
         $textDomain = $loader->load('en_EN', 'translation_en.php');
 

From d2897181f3b27895b90704320cb0ff448497bb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Wed, 22 May 2013 19:39:36 +0200
Subject: [PATCH 08/21] Fix name of test

---
 test/Filter/NumberParseTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Filter/NumberParseTest.php b/test/Filter/NumberParseTest.php
index 1cecbc7e..de643fae 100644
--- a/test/Filter/NumberParseTest.php
+++ b/test/Filter/NumberParseTest.php
@@ -13,7 +13,7 @@
 use Zend\I18n\Filter\NumberParse as NumberParseFilter;
 use NumberFormatter;
 
-class NumberTest extends TestCase
+class NumberParseTest extends TestCase
 {
     public function testConstructWithOptions()
     {

From 690cca872abe141f3f28fc1aacd5e206ed70b005 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Thu, 23 May 2013 11:36:25 -0500
Subject: [PATCH 09/21] [zendframework/zf2#4510] CS fixes

- Move closing paren/opening brace to next line
  - constructor (multi-line definition)
  - if statement (multi-line conditional)
---
 src/Filter/NumberParse.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Filter/NumberParse.php b/src/Filter/NumberParse.php
index 7e7db22a..d919158a 100644
--- a/src/Filter/NumberParse.php
+++ b/src/Filter/NumberParse.php
@@ -35,8 +35,8 @@ class NumberParse extends AbstractLocale
     public function __construct(
         $localeOrOptions = null,
         $style = NumberFormatter::DEFAULT_STYLE,
-        $type = NumberFormatter::TYPE_DOUBLE)
-    {
+        $type = NumberFormatter::TYPE_DOUBLE
+    ) {
         parent::__construct();
         if ($localeOrOptions !== null) {
             if ($localeOrOptions instanceof Traversable) {
@@ -142,8 +142,8 @@ public function getFormatter()
     public function filter($value)
     {
         if (!is_int($value)
-            && !is_float($value)) {
-
+            && !is_float($value)
+        ) {
             ErrorHandler::start();
 
             $result = $this->getFormatter()->parse(

From 16fe38f79b32552b0fb278b80e76ade442c94166 Mon Sep 17 00:00:00 2001
From: Robert Boloc <robertboloc@gmail.com>
Date: Fri, 24 May 2013 09:05:49 +0200
Subject: [PATCH 10/21] added loading from include path feature to all
 translator loaders

---
 src/Translator/Loader/Gettext.php      |  7 ++++---
 src/Translator/Loader/Ini.php          |  7 ++++---
 src/Translator/Loader/PhpArray.php     |  3 ++-
 test/Translator/Loader/GettextTest.php | 17 ++++++++++++++++-
 test/Translator/Loader/IniTest.php     | 20 +++++++++++++++++++-
 5 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/Translator/Loader/Gettext.php b/src/Translator/Loader/Gettext.php
index ca156526..91950b1b 100644
--- a/src/Translator/Loader/Gettext.php
+++ b/src/Translator/Loader/Gettext.php
@@ -44,9 +44,10 @@ class Gettext implements FileLoaderInterface
      */
     public function load($locale, $filename)
     {
-        if (!is_file($filename) || !is_readable($filename)) {
+        $fromIncludePath = stream_resolve_include_path($filename);
+        if (!$fromIncludePath || !is_file($fromIncludePath) || !is_readable($fromIncludePath)) {
             throw new Exception\InvalidArgumentException(sprintf(
-                'Could not open file %s for reading',
+                'Could not find or open file %s for reading',
                 $filename
             ));
         }
@@ -54,7 +55,7 @@ public function load($locale, $filename)
         $textDomain = new TextDomain();
 
         ErrorHandler::start();
-        $this->file = fopen($filename, 'rb');
+        $this->file = fopen($fromIncludePath, 'rb');
         $error = ErrorHandler::stop();
         if (false === $this->file) {
             throw new Exception\InvalidArgumentException(sprintf(
diff --git a/src/Translator/Loader/Ini.php b/src/Translator/Loader/Ini.php
index 02a9ecac..037abb34 100644
--- a/src/Translator/Loader/Ini.php
+++ b/src/Translator/Loader/Ini.php
@@ -30,16 +30,17 @@ class Ini implements FileLoaderInterface
      */
     public function load($locale, $filename)
     {
-        if (!is_file($filename) || !is_readable($filename)) {
+        $fromIncludePath = stream_resolve_include_path($filename);
+        if (!$fromIncludePath || !is_file($fromIncludePath) || !is_readable($fromIncludePath)) {
             throw new Exception\InvalidArgumentException(sprintf(
-                'Could not open file %s for reading',
+                'Could not find or open file %s for reading',
                 $filename
             ));
         }
 
         $messages           = array();
         $iniReader          = new IniReader();
-        $messagesNamespaced = $iniReader->fromFile($filename);
+        $messagesNamespaced = $iniReader->fromFile($fromIncludePath);
 
         $list = $messagesNamespaced;
         if (isset($messagesNamespaced['translation'])) {
diff --git a/src/Translator/Loader/PhpArray.php b/src/Translator/Loader/PhpArray.php
index 52b3f3ff..137f035a 100644
--- a/src/Translator/Loader/PhpArray.php
+++ b/src/Translator/Loader/PhpArray.php
@@ -32,7 +32,8 @@ public function load($locale, $filename)
         $fromIncludePath = stream_resolve_include_path($filename);
         if (!$fromIncludePath || !is_file($fromIncludePath) || !is_readable($fromIncludePath)) {
             throw new Exception\InvalidArgumentException(sprintf(
-                    'Could not find or open file %s for reading', $filename
+                'Could not find or open file %s for reading',
+                $filename
             ));
         }
 
diff --git a/test/Translator/Loader/GettextTest.php b/test/Translator/Loader/GettextTest.php
index d1c4c57c..5069d3b2 100644
--- a/test/Translator/Loader/GettextTest.php
+++ b/test/Translator/Loader/GettextTest.php
@@ -18,6 +18,7 @@ class GettextTest extends TestCase
 {
     protected $testFilesDir;
     protected $originalLocale;
+    protected $originalIncludePath;
 
     public function setUp()
     {
@@ -25,17 +26,22 @@ public function setUp()
         Locale::setDefault('en_EN');
 
         $this->testFilesDir = realpath(__DIR__ . '/../_files');
+
+        $this->originalIncludePath = get_include_path();
+        set_include_path($this->testFilesDir);
     }
 
     public function tearDown()
     {
         Locale::setDefault($this->originalLocale);
+
+        set_include_path($this->originalIncludePath);
     }
 
     public function testLoaderFailsToLoadMissingFile()
     {
         $loader = new GettextLoader();
-        $this->setExpectedException('Zend\I18n\Exception\InvalidArgumentException', 'Could not open file');
+        $this->setExpectedException('Zend\I18n\Exception\InvalidArgumentException', 'Could not find or open file');
         $loader->load('en_EN', 'missing');
     }
 
@@ -80,4 +86,13 @@ public function testLoaderLoadsPluralRules()
         $this->assertEquals(1, $textDomain->getPluralRule()->evaluate(2));
         $this->assertEquals(2, $textDomain->getPluralRule()->evaluate(10));
     }
+
+    public function testLoaderLoadsFromIncludePath()
+    {
+        $loader = new GettextLoader();
+        $textDomain = $loader->load('en_EN', 'translation_en.mo');
+
+        $this->assertEquals('Message 1 (en)', $textDomain['Message 1']);
+        $this->assertEquals('Message 4 (en)', $textDomain['Message 4']);
+    }
 }
diff --git a/test/Translator/Loader/IniTest.php b/test/Translator/Loader/IniTest.php
index 3d7eee63..a88b76c4 100644
--- a/test/Translator/Loader/IniTest.php
+++ b/test/Translator/Loader/IniTest.php
@@ -18,16 +18,25 @@ class IniTest extends TestCase
 {
     protected $testFilesDir;
     protected $originalLocale;
+    protected $originalIncludePath;
 
     public function setUp()
     {
         $this->testFilesDir = realpath(__DIR__ . '/../_files');
+
+        $this->originalIncludePath = get_include_path();
+        set_include_path($this->testFilesDir);
+    }
+
+    public function tearDown()
+    {
+        set_include_path($this->originalIncludePath);
     }
 
     public function testLoaderFailsToLoadMissingFile()
     {
         $loader = new IniLoader();
-        $this->setExpectedException('Zend\I18n\Exception\InvalidArgumentException', 'Could not open file');
+        $this->setExpectedException('Zend\I18n\Exception\InvalidArgumentException', 'Could not find or open file');
         $loader->load('en_EN', 'missing');
     }
 
@@ -91,4 +100,13 @@ public function testLoaderLoadsPluralRules()
         $this->assertEquals(1, $textDomain->getPluralRule()->evaluate(2));
         $this->assertEquals(2, $textDomain->getPluralRule()->evaluate(10));
     }
+
+    public function testLoaderLoadsFromIncludePath()
+    {
+        $loader = new IniLoader();
+        $textDomain = $loader->load('en_EN', 'translation_en.ini');
+
+        $this->assertEquals('Message 1 (en)', $textDomain['Message 1']);
+        $this->assertEquals('Message 4 (en)', $textDomain['Message 4']);
+    }
 }

From 513999a0f0c795903dab63111a87ee5414fe129b Mon Sep 17 00:00:00 2001
From: Robert Boloc <robertboloc@gmail.com>
Date: Mon, 3 Jun 2013 15:32:21 +0200
Subject: [PATCH 11/21] fixed loading from phar

---
 src/Translator/Loader/Gettext.php        |   3 ++-
 src/Translator/Loader/Ini.php            |   3 ++-
 src/Translator/Loader/PhpArray.php       |   3 ++-
 test/Translator/Loader/GettextTest.php   |  11 ++++++++++-
 test/Translator/Loader/IniTest.php       |  11 ++++++++++-
 test/Translator/Loader/PhpArrayTest.php  |  11 ++++++++++-
 test/Translator/_files/phparray.phar     | Bin 0 -> 7795 bytes
 test/Translator/_files/translations.phar | Bin 0 -> 9664 bytes
 8 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100755 test/Translator/_files/phparray.phar
 create mode 100644 test/Translator/_files/translations.phar

diff --git a/src/Translator/Loader/Gettext.php b/src/Translator/Loader/Gettext.php
index 91950b1b..87dd2593 100644
--- a/src/Translator/Loader/Gettext.php
+++ b/src/Translator/Loader/Gettext.php
@@ -44,7 +44,8 @@ class Gettext implements FileLoaderInterface
      */
     public function load($locale, $filename)
     {
-        $fromIncludePath = stream_resolve_include_path($filename);
+        $resolvedIncludePath = stream_resolve_include_path($filename);
+        $fromIncludePath = ($resolvedIncludePath !== false) ? $resolvedIncludePath : $filename;
         if (!$fromIncludePath || !is_file($fromIncludePath) || !is_readable($fromIncludePath)) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Could not find or open file %s for reading',
diff --git a/src/Translator/Loader/Ini.php b/src/Translator/Loader/Ini.php
index 037abb34..b81ebbf3 100644
--- a/src/Translator/Loader/Ini.php
+++ b/src/Translator/Loader/Ini.php
@@ -30,7 +30,8 @@ class Ini implements FileLoaderInterface
      */
     public function load($locale, $filename)
     {
-        $fromIncludePath = stream_resolve_include_path($filename);
+        $resolvedIncludePath = stream_resolve_include_path($filename);
+        $fromIncludePath = ($resolvedIncludePath !== false) ? $resolvedIncludePath : $filename;
         if (!$fromIncludePath || !is_file($fromIncludePath) || !is_readable($fromIncludePath)) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Could not find or open file %s for reading',
diff --git a/src/Translator/Loader/PhpArray.php b/src/Translator/Loader/PhpArray.php
index 137f035a..accdcb0e 100644
--- a/src/Translator/Loader/PhpArray.php
+++ b/src/Translator/Loader/PhpArray.php
@@ -29,7 +29,8 @@ class PhpArray implements FileLoaderInterface
      */
     public function load($locale, $filename)
     {
-        $fromIncludePath = stream_resolve_include_path($filename);
+        $resolvedIncludePath = stream_resolve_include_path($filename);
+        $fromIncludePath = ($resolvedIncludePath !== false) ? $resolvedIncludePath : $filename;
         if (!$fromIncludePath || !is_file($fromIncludePath) || !is_readable($fromIncludePath)) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Could not find or open file %s for reading',
diff --git a/test/Translator/Loader/GettextTest.php b/test/Translator/Loader/GettextTest.php
index 5069d3b2..d3c7f60f 100644
--- a/test/Translator/Loader/GettextTest.php
+++ b/test/Translator/Loader/GettextTest.php
@@ -28,7 +28,7 @@ public function setUp()
         $this->testFilesDir = realpath(__DIR__ . '/../_files');
 
         $this->originalIncludePath = get_include_path();
-        set_include_path($this->testFilesDir);
+        set_include_path($this->testFilesDir.PATH_SEPARATOR.$this->testFilesDir.'/translations.phar');
     }
 
     public function tearDown()
@@ -95,4 +95,13 @@ public function testLoaderLoadsFromIncludePath()
         $this->assertEquals('Message 1 (en)', $textDomain['Message 1']);
         $this->assertEquals('Message 4 (en)', $textDomain['Message 4']);
     }
+
+    public function testLoaderLoadsFromPhar()
+    {
+        $loader = new GettextLoader();
+        $textDomain = $loader->load('en_EN', 'phar://'.$this->testFilesDir.'/translations.phar/translation_en.mo');
+
+        $this->assertEquals('Message 1 (en)', $textDomain['Message 1']);
+        $this->assertEquals('Message 4 (en)', $textDomain['Message 4']);
+    }
 }
diff --git a/test/Translator/Loader/IniTest.php b/test/Translator/Loader/IniTest.php
index a88b76c4..f7dad78d 100644
--- a/test/Translator/Loader/IniTest.php
+++ b/test/Translator/Loader/IniTest.php
@@ -25,7 +25,7 @@ public function setUp()
         $this->testFilesDir = realpath(__DIR__ . '/../_files');
 
         $this->originalIncludePath = get_include_path();
-        set_include_path($this->testFilesDir);
+        set_include_path($this->testFilesDir.PATH_SEPARATOR.$this->testFilesDir.'/translations.phar');
     }
 
     public function tearDown()
@@ -109,4 +109,13 @@ public function testLoaderLoadsFromIncludePath()
         $this->assertEquals('Message 1 (en)', $textDomain['Message 1']);
         $this->assertEquals('Message 4 (en)', $textDomain['Message 4']);
     }
+
+    public function testLoaderLoadsFromPhar()
+    {
+        $loader = new IniLoader();
+        $textDomain = $loader->load('en_EN', 'phar://'.$this->testFilesDir.'/translations.phar/translation_en.ini');
+
+        $this->assertEquals('Message 1 (en)', $textDomain['Message 1']);
+        $this->assertEquals('Message 4 (en)', $textDomain['Message 4']);
+    }
 }
diff --git a/test/Translator/Loader/PhpArrayTest.php b/test/Translator/Loader/PhpArrayTest.php
index b0033e69..d248d145 100644
--- a/test/Translator/Loader/PhpArrayTest.php
+++ b/test/Translator/Loader/PhpArrayTest.php
@@ -28,7 +28,7 @@ public function setUp()
         $this->testFilesDir = realpath(__DIR__ . '/../_files');
 
         $this->originalIncludePath = get_include_path();
-        set_include_path($this->testFilesDir);
+        set_include_path($this->testFilesDir.PATH_SEPARATOR.$this->testFilesDir.'/translations.phar');
     }
 
     public function tearDown()
@@ -88,4 +88,13 @@ public function testLoaderLoadsFromIncludePath()
         $this->assertEquals('Message 1 (en)', $textDomain['Message 1']);
         $this->assertEquals('Message 4 (en)', $textDomain['Message 4']);
     }
+
+    public function testLoaderLoadsFromPhar()
+    {
+        $loader = new PhpArrayLoader();
+        $textDomain = $loader->load('en_EN', 'phar://'.$this->testFilesDir.'/translations.phar/translation_en.php');
+
+        $this->assertEquals('Message 1 (en)', $textDomain['Message 1']);
+        $this->assertEquals('Message 4 (en)', $textDomain['Message 4']);
+    }
 }
diff --git a/test/Translator/_files/phparray.phar b/test/Translator/_files/phparray.phar
new file mode 100755
index 0000000000000000000000000000000000000000..e4036a0342b0acbb269cf597b636ffdd7937398a
GIT binary patch
literal 7795
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

literal 0
HcmV?d00001

diff --git a/test/Translator/_files/translations.phar b/test/Translator/_files/translations.phar
new file mode 100644
index 0000000000000000000000000000000000000000..420d924d49a05031be8829243c9faa68dd9ff8f5
GIT binary patch
literal 9664
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

literal 0
HcmV?d00001


From 472dff5dab5c805901fa4d109c3ecc79552675df Mon Sep 17 00:00:00 2001
From: Robert Boloc <robertboloc@gmail.com>
Date: Mon, 3 Jun 2013 15:34:31 +0200
Subject: [PATCH 12/21] removed unnecessary test file

---
 test/Translator/_files/phparray.phar | Bin 7795 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 test/Translator/_files/phparray.phar

diff --git a/test/Translator/_files/phparray.phar b/test/Translator/_files/phparray.phar
deleted file mode 100755
index e4036a0342b0acbb269cf597b636ffdd7937398a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7795
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


From 975f308623200bb015f26b8e7b2f3fa566870cbb Mon Sep 17 00:00:00 2001
From: Robert Boloc <robertboloc@gmail.com>
Date: Mon, 3 Jun 2013 15:47:28 +0200
Subject: [PATCH 13/21] CS fixes

---
 test/Translator/Loader/GettextTest.php  | 4 ++--
 test/Translator/Loader/IniTest.php      | 4 ++--
 test/Translator/Loader/PhpArrayTest.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/Translator/Loader/GettextTest.php b/test/Translator/Loader/GettextTest.php
index d3c7f60f..703f5c84 100644
--- a/test/Translator/Loader/GettextTest.php
+++ b/test/Translator/Loader/GettextTest.php
@@ -28,7 +28,7 @@ public function setUp()
         $this->testFilesDir = realpath(__DIR__ . '/../_files');
 
         $this->originalIncludePath = get_include_path();
-        set_include_path($this->testFilesDir.PATH_SEPARATOR.$this->testFilesDir.'/translations.phar');
+        set_include_path($this->testFilesDir . PATH_SEPARATOR . $this->testFilesDir . '/translations.phar');
     }
 
     public function tearDown()
@@ -99,7 +99,7 @@ public function testLoaderLoadsFromIncludePath()
     public function testLoaderLoadsFromPhar()
     {
         $loader = new GettextLoader();
-        $textDomain = $loader->load('en_EN', 'phar://'.$this->testFilesDir.'/translations.phar/translation_en.mo');
+        $textDomain = $loader->load('en_EN', 'phar://' . $this->testFilesDir . '/translations.phar/translation_en.mo');
 
         $this->assertEquals('Message 1 (en)', $textDomain['Message 1']);
         $this->assertEquals('Message 4 (en)', $textDomain['Message 4']);
diff --git a/test/Translator/Loader/IniTest.php b/test/Translator/Loader/IniTest.php
index f7dad78d..650c9555 100644
--- a/test/Translator/Loader/IniTest.php
+++ b/test/Translator/Loader/IniTest.php
@@ -25,7 +25,7 @@ public function setUp()
         $this->testFilesDir = realpath(__DIR__ . '/../_files');
 
         $this->originalIncludePath = get_include_path();
-        set_include_path($this->testFilesDir.PATH_SEPARATOR.$this->testFilesDir.'/translations.phar');
+        set_include_path($this->testFilesDir . PATH_SEPARATOR . $this->testFilesDir . '/translations.phar');
     }
 
     public function tearDown()
@@ -113,7 +113,7 @@ public function testLoaderLoadsFromIncludePath()
     public function testLoaderLoadsFromPhar()
     {
         $loader = new IniLoader();
-        $textDomain = $loader->load('en_EN', 'phar://'.$this->testFilesDir.'/translations.phar/translation_en.ini');
+        $textDomain = $loader->load('en_EN', 'phar://' . $this->testFilesDir . '/translations.phar/translation_en.ini');
 
         $this->assertEquals('Message 1 (en)', $textDomain['Message 1']);
         $this->assertEquals('Message 4 (en)', $textDomain['Message 4']);
diff --git a/test/Translator/Loader/PhpArrayTest.php b/test/Translator/Loader/PhpArrayTest.php
index d248d145..be764153 100644
--- a/test/Translator/Loader/PhpArrayTest.php
+++ b/test/Translator/Loader/PhpArrayTest.php
@@ -28,7 +28,7 @@ public function setUp()
         $this->testFilesDir = realpath(__DIR__ . '/../_files');
 
         $this->originalIncludePath = get_include_path();
-        set_include_path($this->testFilesDir.PATH_SEPARATOR.$this->testFilesDir.'/translations.phar');
+        set_include_path($this->testFilesDir . PATH_SEPARATOR . $this->testFilesDir . '/translations.phar');
     }
 
     public function tearDown()
@@ -92,7 +92,7 @@ public function testLoaderLoadsFromIncludePath()
     public function testLoaderLoadsFromPhar()
     {
         $loader = new PhpArrayLoader();
-        $textDomain = $loader->load('en_EN', 'phar://'.$this->testFilesDir.'/translations.phar/translation_en.php');
+        $textDomain = $loader->load('en_EN', 'phar://' . $this->testFilesDir . '/translations.phar/translation_en.php');
 
         $this->assertEquals('Message 1 (en)', $textDomain['Message 1']);
         $this->assertEquals('Message 4 (en)', $textDomain['Message 4']);

From 6d0c6aea2a7117003abd0796728312c80fa69f9f Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Mon, 1 Jul 2013 15:40:23 -0500
Subject: [PATCH 14/21] [zendframework/zf2#4766] Make include_path abilities
 opt-in in Translators

- Created AbstractFileLoader, which provides implementation details for
  when/how to use the include_path to load translation file assets.
- Updated INI, gettext, and PHP loaders to extend AbstractFileLoader.
---
 src/Translator/Loader/AbstractFileLoader.php | 82 ++++++++++++++++++++
 src/Translator/Loader/Gettext.php            |  9 +--
 src/Translator/Loader/Ini.php                |  2 +-
 src/Translator/Loader/PhpArray.php           |  2 +-
 4 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 src/Translator/Loader/AbstractFileLoader.php

diff --git a/src/Translator/Loader/AbstractFileLoader.php b/src/Translator/Loader/AbstractFileLoader.php
new file mode 100644
index 00000000..d2ec92f3
--- /dev/null
+++ b/src/Translator/Loader/AbstractFileLoader.php
@@ -0,0 +1,82 @@
+<?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\Loader;
+
+/**
+ * Abstract file loader implementation; provides facilities around resolving 
+ * files via the include_path.
+ */
+abstract class AbstractFileLoader implements FileLoaderInterface
+{
+    /**
+     * Whether or not to consult the include_path when locating files
+     * 
+     * @var bool
+     */
+    protected $useIncludePath = false;
+
+    /**
+     * Indicate whether or not to use the include_path to resolve translation files
+     * 
+     * @param bool $flag 
+     * @return self
+     */
+    public function setUseIncludePath($flag = true)
+    {
+        $this->useIncludePath = (bool) $flag;
+        return $this;
+    }
+
+    /**
+     * Are we using the include_path to resolve translation files? 
+     * 
+     * @return bool
+     */
+    public function useIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Resolve a translation file
+     *
+     * Checks if the file exists and is readable, returning a boolean false if not; if the "useIncludePath" 
+     * flag is enabled, it will attempt to resolve the file from the 
+     * include_path if the file does not exist on the current working path.
+     * 
+     * @param string $filename 
+     * @return string|false
+     */
+    protected function resolveFile($filename)
+    {
+        if (!is_file($filename) || !is_readable($filename)) {
+            if (!$this->useIncludePath()) {
+                return false;
+            }
+            return $this->resolveViaIncludePath($filename);
+        }
+        return $filename;
+    }
+
+    /**
+     * Resolve a translation file via the include_path
+     * 
+     * @param string $filename 
+     * @return string|false
+     */
+    protected function resolveViaIncludePath($filename)
+    {
+        $resolvedIncludePath = stream_resolve_include_path($filename);
+        if (!$resolvedIncludePath || !is_file($resolvedIncludePath) || !is_readable($resolvedIncludePath)) {
+            return false;
+        }
+        return $resolvedIncludePath;
+    }
+}
diff --git a/src/Translator/Loader/Gettext.php b/src/Translator/Loader/Gettext.php
index 87dd2593..45d296db 100644
--- a/src/Translator/Loader/Gettext.php
+++ b/src/Translator/Loader/Gettext.php
@@ -17,7 +17,7 @@
 /**
  * Gettext loader.
  */
-class Gettext implements FileLoaderInterface
+class Gettext extends AbstractFileLoader
 {
     /**
      * Current file pointer.
@@ -44,9 +44,8 @@ class Gettext implements FileLoaderInterface
      */
     public function load($locale, $filename)
     {
-        $resolvedIncludePath = stream_resolve_include_path($filename);
-        $fromIncludePath = ($resolvedIncludePath !== false) ? $resolvedIncludePath : $filename;
-        if (!$fromIncludePath || !is_file($fromIncludePath) || !is_readable($fromIncludePath)) {
+        $resolvedFile = $this->resolveFile($filename);
+        if (!$resolvedFile) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Could not find or open file %s for reading',
                 $filename
@@ -56,7 +55,7 @@ public function load($locale, $filename)
         $textDomain = new TextDomain();
 
         ErrorHandler::start();
-        $this->file = fopen($fromIncludePath, 'rb');
+        $this->file = fopen($resolvedFile, 'rb');
         $error = ErrorHandler::stop();
         if (false === $this->file) {
             throw new Exception\InvalidArgumentException(sprintf(
diff --git a/src/Translator/Loader/Ini.php b/src/Translator/Loader/Ini.php
index b81ebbf3..93c33745 100644
--- a/src/Translator/Loader/Ini.php
+++ b/src/Translator/Loader/Ini.php
@@ -17,7 +17,7 @@
 /**
  * PHP INI format loader.
  */
-class Ini implements FileLoaderInterface
+class Ini extends AbstractFileLoader
 {
     /**
      * load(): defined by FileLoaderInterface.
diff --git a/src/Translator/Loader/PhpArray.php b/src/Translator/Loader/PhpArray.php
index accdcb0e..e00aa573 100644
--- a/src/Translator/Loader/PhpArray.php
+++ b/src/Translator/Loader/PhpArray.php
@@ -16,7 +16,7 @@
 /**
  * PHP array loader.
  */
-class PhpArray implements FileLoaderInterface
+class PhpArray extends AbstractFileLoader
 {
     /**
      * load(): defined by FileLoaderInterface.

From 39b7edd7af9961cf2263ca04febf9f155b51f50c Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Mon, 1 Jul 2013 15:52:40 -0500
Subject: [PATCH 15/21] [zendframework/zf2#4766] Add docblock detailing how to
 set include_path flag

- Added to translator loader plugin manager
---
 src/Translator/Loader/AbstractFileLoader.php | 24 +++++++-------
 src/Translator/LoaderPluginManager.php       | 33 ++++++++++++++++++++
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/Translator/Loader/AbstractFileLoader.php b/src/Translator/Loader/AbstractFileLoader.php
index d2ec92f3..19044e29 100644
--- a/src/Translator/Loader/AbstractFileLoader.php
+++ b/src/Translator/Loader/AbstractFileLoader.php
@@ -10,22 +10,22 @@
 namespace Zend\I18n\Translator\Loader;
 
 /**
- * Abstract file loader implementation; provides facilities around resolving 
+ * Abstract file loader implementation; provides facilities around resolving
  * files via the include_path.
  */
 abstract class AbstractFileLoader implements FileLoaderInterface
 {
     /**
      * Whether or not to consult the include_path when locating files
-     * 
+     *
      * @var bool
      */
     protected $useIncludePath = false;
 
     /**
      * Indicate whether or not to use the include_path to resolve translation files
-     * 
-     * @param bool $flag 
+     *
+     * @param bool $flag
      * @return self
      */
     public function setUseIncludePath($flag = true)
@@ -35,8 +35,8 @@ public function setUseIncludePath($flag = true)
     }
 
     /**
-     * Are we using the include_path to resolve translation files? 
-     * 
+     * Are we using the include_path to resolve translation files?
+     *
      * @return bool
      */
     public function useIncludePath()
@@ -47,11 +47,11 @@ public function useIncludePath()
     /**
      * Resolve a translation file
      *
-     * Checks if the file exists and is readable, returning a boolean false if not; if the "useIncludePath" 
-     * flag is enabled, it will attempt to resolve the file from the 
+     * Checks if the file exists and is readable, returning a boolean false if not; if the "useIncludePath"
+     * flag is enabled, it will attempt to resolve the file from the
      * include_path if the file does not exist on the current working path.
-     * 
-     * @param string $filename 
+     *
+     * @param string $filename
      * @return string|false
      */
     protected function resolveFile($filename)
@@ -67,8 +67,8 @@ protected function resolveFile($filename)
 
     /**
      * Resolve a translation file via the include_path
-     * 
-     * @param string $filename 
+     *
+     * @param string $filename
      * @return string|false
      */
     protected function resolveViaIncludePath($filename)
diff --git a/src/Translator/LoaderPluginManager.php b/src/Translator/LoaderPluginManager.php
index a2df197b..5b911bfb 100644
--- a/src/Translator/LoaderPluginManager.php
+++ b/src/Translator/LoaderPluginManager.php
@@ -18,6 +18,39 @@
  * Enforces that loaders retrieved are either instances of
  * Loader\FileLoaderInterface or Loader\RemoteLoaderInterface. Additionally,
  * it registers a number of default loaders.
+ *
+ * If you are wanting to use the ability to load translation files from the
+ * include_path, you will need to create a factory to override the defaults
+ * defined in this class. A simple factory might look like:
+ *
+ * <code>
+ * function ($translators) {
+ *     $adapter = new Gettext();
+ *     $adapter->setUseIncludePath(true);
+ *     return $adapter;
+ * }
+ * </code>
+ *
+ * You may need to override the Translator service factory to make this happen
+ * more easily. That can be done by extending it:
+ *
+ * <code>
+ * use Zend\I18n\Translator\TranslatorServiceFactory;
+ * // or Zend\Mvc\I18n\TranslatorServiceFactory
+ * use Zend\ServiceManager\ServiceLocatorInterface;
+ *
+ * class MyTranslatorServiceFactory extends TranslatorServiceFactory
+ * {
+ *     public function createService(ServiceLocatorInterface $services)
+ *     {
+ *         $translator = parent::createService($services);
+ *         $translator->getLoaderPluginManager()->setFactory(...);
+ *         return $translator;
+ *     }
+ * }
+ * </code>
+ *
+ * You would then specify your custom factory in your service configuration.
  */
 class LoaderPluginManager extends AbstractPluginManager
 {

From 3099ba9005380562375bd512e75b209716a4faa4 Mon Sep 17 00:00:00 2001
From: Artur Bodera <abodera@gmail.com>
Date: Mon, 23 Sep 2013 12:05:51 +0200
Subject: [PATCH 16/21] Fix CS.

---
 test/Validator/PhoneNumberTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Validator/PhoneNumberTest.php b/test/Validator/PhoneNumberTest.php
index 4df50dab..ec7adc64 100644
--- a/test/Validator/PhoneNumberTest.php
+++ b/test/Validator/PhoneNumberTest.php
@@ -3045,10 +3045,10 @@ public function testExampleNumbers()
                 $this->assertTrue($this->validator->isValid($countryCodePrefixed));
 
                 // check fully qualified E.123/E.164 international variants
-                $fullyQualifiedDoubleO = '00'. $parameters['code'] . $value;
+                $fullyQualifiedDoubleO = '00' . $parameters['code'] . $value;
                 $this->assertTrue($this->validator->isValid($fullyQualifiedDoubleO));
 
-                $fullyQualifiedPlus = '+'. $parameters['code'] . $value;
+                $fullyQualifiedPlus = '+' . $parameters['code'] . $value;
                 $this->assertTrue($this->validator->isValid($fullyQualifiedPlus));
             }
         }

From 416cf51d396e21c0b34f9b3634b3599d591b6e56 Mon Sep 17 00:00:00 2001
From: Artur Bodera <abodera@gmail.com>
Date: Mon, 23 Sep 2013 12:12:04 +0200
Subject: [PATCH 17/21] Fix CS.

---
 src/Validator/PhoneNumber.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Validator/PhoneNumber.php b/src/Validator/PhoneNumber.php
index 7b13deb2..980721ba 100644
--- a/src/Validator/PhoneNumber.php
+++ b/src/Validator/PhoneNumber.php
@@ -212,18 +212,17 @@ public function isValid($value = null, $context = null)
 
         $codeLength = strlen($countryPattern['code']);
 
-        // Check for existence of E.123/E.164 prefix
+        /*
+         * 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);
-        }
-
-        // Check for existence of international double-O prefix
-        elseif (('00' . $countryPattern['code']) == substr($value, 0, $codeLength + 2)) {
+        } elseif (('00' . $countryPattern['code']) == substr($value, 0, $codeLength + 2)) {
             $valueNoCountry = substr($value, $codeLength + 2);
-        }
-
-        // Check for existence of bare country prefix
-        elseif ($countryPattern['code'] == substr($value, 0, $codeLength)) {
+        } elseif ($countryPattern['code'] == substr($value, 0, $codeLength)) {
             $valueNoCountry = substr($value, $codeLength);
         }
 

From 092e9935816ee3f4a65c14049c4157272562349c Mon Sep 17 00:00:00 2001
From: Artur Bodera <abodera@gmail.com>
Date: Mon, 23 Sep 2013 12:05:51 +0200
Subject: [PATCH 18/21] Fix CS.

---
 test/Validator/PhoneNumberTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Validator/PhoneNumberTest.php b/test/Validator/PhoneNumberTest.php
index 3a9af33a..804035b9 100644
--- a/test/Validator/PhoneNumberTest.php
+++ b/test/Validator/PhoneNumberTest.php
@@ -3044,10 +3044,10 @@ public function testExampleNumbers()
                 $this->assertTrue($this->validator->isValid($countryCodePrefixed));
 
                 // check fully qualified E.123/E.164 international variants
-                $fullyQualifiedDoubleO = '00'. $parameters['code'] . $value;
+                $fullyQualifiedDoubleO = '00' . $parameters['code'] . $value;
                 $this->assertTrue($this->validator->isValid($fullyQualifiedDoubleO));
 
-                $fullyQualifiedPlus = '+'. $parameters['code'] . $value;
+                $fullyQualifiedPlus = '+' . $parameters['code'] . $value;
                 $this->assertTrue($this->validator->isValid($fullyQualifiedPlus));
             }
         }

From 08d26c4b85a212129fd107d628634f5950354ba2 Mon Sep 17 00:00:00 2001
From: Artur Bodera <abodera@gmail.com>
Date: Mon, 23 Sep 2013 12:12:04 +0200
Subject: [PATCH 19/21] Fix CS.

---
 src/Validator/PhoneNumber.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Validator/PhoneNumber.php b/src/Validator/PhoneNumber.php
index a358c4eb..12260edd 100644
--- a/src/Validator/PhoneNumber.php
+++ b/src/Validator/PhoneNumber.php
@@ -212,18 +212,17 @@ public function isValid($value = null, $context = null)
 
         $codeLength = strlen($countryPattern['code']);
 
-        // Check for existence of E.123/E.164 prefix
+        /*
+         * 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);
-        }
-
-        // Check for existence of international double-O prefix
-        elseif (('00' . $countryPattern['code']) == substr($value, 0, $codeLength + 2)) {
+        } elseif (('00' . $countryPattern['code']) == substr($value, 0, $codeLength + 2)) {
             $valueNoCountry = substr($value, $codeLength + 2);
-        }
-
-        // Check for existence of bare country prefix
-        elseif ($countryPattern['code'] == substr($value, 0, $codeLength)) {
+        } elseif ($countryPattern['code'] == substr($value, 0, $codeLength)) {
             $valueNoCountry = substr($value, $codeLength);
         }
 

From c9ac507f0499cea161e9a874015e88f3fa5910c4 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Wed, 23 Oct 2013 14:18:16 -0500
Subject: [PATCH 20/21] [zendframework/zf2#5295] incorporate feedback

- Use more reliable version comparison
---
 src/View/Helper/DateFormat.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/View/Helper/DateFormat.php b/src/View/Helper/DateFormat.php
index 2a268127..ec4af321 100644
--- a/src/View/Helper/DateFormat.php
+++ b/src/View/Helper/DateFormat.php
@@ -134,7 +134,7 @@ public function setTimezone($timezone)
         $this->timezone = (string) $timezone;
 
         // The method setTimeZoneId is deprecated as of PHP 5.5.0
-        $setTimeZoneMethodName = version_compare(PHP_VERSION, '5.5.0', '<') ? 'setTimeZoneId' : 'setTimeZone';
+        $setTimeZoneMethodName = (PHP_VERSION_ID < '50500') ? 'setTimeZoneId' : 'setTimeZone';
 
         foreach ($this->formatters as $formatter) {
             $formatter->$setTimeZoneMethodName($this->timezone);

From 088bad2b8929c41d264007917774d9b411979f7b Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Wed, 23 Oct 2013 14:21:01 -0500
Subject: [PATCH 21/21] [zendframework/zf2#5295] consistent version checking

- use PHP_VERSION_ID always
- comparison should be against integers
---
 src/View/Helper/DateFormat.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/View/Helper/DateFormat.php b/src/View/Helper/DateFormat.php
index ec4af321..c7dffb69 100644
--- a/src/View/Helper/DateFormat.php
+++ b/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();
         }
 
@@ -134,7 +134,7 @@ 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';
+        $setTimeZoneMethodName = (PHP_VERSION_ID < 50500) ? 'setTimeZoneId' : 'setTimeZone';
 
         foreach ($this->formatters as $formatter) {
             $formatter->$setTimeZoneMethodName($this->timezone);