Merge branch 'hotfix/5111'

Close zendframework/zendframework#5111
zendframework · Oct 22, 2013 · c05aee7 · c05aee7
commit c05aee7
Show file tree

Hide file tree

Showing 16 changed files with 140 additions and 8 deletions.
diff --git a/test/Filter/AlnumTest.php b/test/Filter/AlnumTest.php
@@ -52,6 +52,10 @@ 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();

diff --git a/test/Filter/AlphaTest.php b/test/Filter/AlphaTest.php
@@ -52,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();

diff --git a/test/Filter/NumberFormatTest.php b/test/Filter/NumberFormatTest.php
@@ -15,6 +15,13 @@
 
 class NumberFormatTest extends TestCase
 {
+    public function setUp()
+    {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+    }
+
     public function testConstructWithOptions()
     {
         $filter = new NumberFormatFilter(array(
@@ -63,8 +70,16 @@ public function testFormattedToNumber($locale, $style, $type, $value, $expected)
         $this->assertEquals($expected, $filter->filter($value));
     }
 
-    public static function numberToFormattedProvider()
+    public function numberToFormattedProvider()
     {
+        if (!extension_loaded('intl')) {
+            if (version_compare(\PHPUnit_Runner_Version::VERSION, '3.8.0-dev') === 1) {
+                $this->markTestSkipped('ext/intl not enabled');
+            } else {
+                return array(array());
+            }
+        }
+
         return array(
             array(
                 'en_US',
@@ -90,8 +105,16 @@ public static function numberToFormattedProvider()
         );
     }
 
-    public static function formattedToNumberProvider()
+    public function formattedToNumberProvider()
     {
+        if (!extension_loaded('intl')) {
+            if (version_compare(\PHPUnit_Runner_Version::VERSION, '3.8.0-dev') === 1) {
+                $this->markTestSkipped('ext/intl not enabled');
+            } else {
+                return array(array());
+            }
+        }
+
         return array(
             array(
                 'en_US',

diff --git a/test/Translator/Loader/GettextTest.php b/test/Translator/Loader/GettextTest.php
@@ -20,6 +20,10 @@ class GettextTest extends TestCase
 
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->originalLocale = Locale::getDefault();
         Locale::setDefault('en_EN');
 
@@ -28,7 +32,9 @@ public function setUp()
 
     public function tearDown()
     {
-        Locale::setDefault($this->originalLocale);
+        if (extension_loaded('intl')) {
+            Locale::setDefault($this->originalLocale);
+        }
     }
 
     public function testLoaderFailsToLoadMissingFile()

diff --git a/test/Translator/Loader/PhpArrayTest.php b/test/Translator/Loader/PhpArrayTest.php
@@ -20,6 +20,10 @@ class PhpArrayTest extends TestCase
 
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->originalLocale = Locale::getDefault();
         Locale::setDefault('en_EN');
 
@@ -28,7 +32,9 @@ public function setUp()
 
     public function tearDown()
     {
-        Locale::setDefault($this->originalLocale);
+        if (extension_loaded('intl')) {
+            Locale::setDefault($this->originalLocale);
+        }
     }
 
     public function testLoaderFailsToLoadMissingFile()

diff --git a/test/Translator/TranslatorTest.php b/test/Translator/TranslatorTest.php
@@ -35,6 +35,10 @@ class TranslatorTest extends TestCase
 
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->originalLocale = Locale::getDefault();
         $this->translator     = new Translator();
 
@@ -45,7 +49,9 @@ public function setUp()
 
     public function tearDown()
     {
-        Locale::setDefault($this->originalLocale);
+        if (extension_loaded('intl')) {
+            Locale::setDefault($this->originalLocale);
+        }
     }
 
     public function testFactoryCreatesTranslator()

diff --git a/test/Validator/AlnumTest.php b/test/Validator/AlnumTest.php
@@ -28,6 +28,10 @@ class AlnumTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->validator = new AlnumValidator();
     }
 

diff --git a/test/Validator/AlphaTest.php b/test/Validator/AlphaTest.php
@@ -23,6 +23,10 @@ class AlphaTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->validator = new AlphaValidator();
     }
 

diff --git a/test/Validator/DateTimeTest.php b/test/Validator/DateTimeTest.php
@@ -28,6 +28,10 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->locale = Locale::getDefault();
         $this->timezone = date_default_timezone_get();
 
@@ -36,7 +40,9 @@ public function setUp()
 
     public function tearDown()
     {
-        Locale::setDefault($this->locale);
+        if (extension_loaded('intl')) {
+            Locale::setDefault($this->locale);
+        }
         date_default_timezone_set($this->timezone);
     }
 
@@ -61,6 +67,14 @@ public function testBasic($value, $expected, $options = array())
 
     public function basicProvider()
     {
+        if (!extension_loaded('intl')) {
+            if (version_compare(\PHPUnit_Runner_Version::VERSION, '3.8.0-dev') === 1) {
+                $this->markTestSkipped('ext/intl not enabled');
+            } else {
+                return array(array());
+            }
+        }
+
         return array(
             array('May 30, 2013',   true, array('locale'=>'en', 'dateType' => \IntlDateFormatter::MEDIUM, 'timeType' => \IntlDateFormatter::NONE)),
             array('30.Mai.2013',   true, array('locale'=>'de', 'dateType' => \IntlDateFormatter::MEDIUM, 'timeType' => \IntlDateFormatter::NONE)),

diff --git a/test/Validator/FloatTest.php b/test/Validator/FloatTest.php
@@ -27,13 +27,19 @@ class FloatTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->locale    = Locale::getDefault();
         $this->validator = new FloatValidator(array('locale' => 'en'));
     }
 
     public function tearDown()
     {
-        Locale::setDefault($this->locale);
+        if (extension_loaded('intl')) {
+            Locale::setDefault($this->locale);
+        }
     }
 
     /**

diff --git a/test/Validator/IntTest.php b/test/Validator/IntTest.php
@@ -22,15 +22,26 @@ class IntTest extends \PHPUnit_Framework_TestCase
      */
     protected $validator;
 
+    /**
+     * @var string
+     */
+    protected $locale;
+
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->locale    = Locale::getDefault();
         $this->validator = new IntValidator();
     }
 
     public function tearDown()
     {
-        Locale::setDefault($this->locale);
+        if (extension_loaded('intl')) {
+            Locale::setDefault($this->locale);
+        }
     }
 
     public function intDataProvider()

diff --git a/test/Validator/PostCodeTest.php b/test/Validator/PostCodeTest.php
@@ -28,6 +28,10 @@ class PostCodeTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->validator = new PostCodeValidator(array('locale' => 'de_AT'));
     }
 

diff --git a/test/View/Helper/CurrencyFormatTest.php b/test/View/Helper/CurrencyFormatTest.php
@@ -31,6 +31,10 @@ class CurrencyFormatTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->helper = new CurrencyFormatHelper();
     }
 

diff --git a/test/View/Helper/DateFormatTest.php b/test/View/Helper/DateFormatTest.php
@@ -35,6 +35,10 @@ class DateFormatTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->helper = new DateFormatHelper();
     }
 
@@ -51,6 +55,14 @@ public function tearDown()
 
     public function dateTestsDataProvider()
     {
+        if (!extension_loaded('intl')) {
+            if (version_compare(\PHPUnit_Runner_Version::VERSION, '3.8.0-dev') === 1) {
+                $this->markTestSkipped('ext/intl not enabled');
+            } else {
+                return array(array());
+            }
+        }
+
         $date = new DateTime('2012-07-02T22:44:03Z');
 
         return array(
@@ -143,6 +155,14 @@ public function dateTestsDataProvider()
 
     public function dateTestsDataProviderWithPattern()
     {
+        if (!extension_loaded('intl')) {
+            if (version_compare(\PHPUnit_Runner_Version::VERSION, '3.8.0-dev') === 1) {
+                $this->markTestSkipped('ext/intl not enabled');
+            } else {
+                return array(array());
+            }
+        }
+
         $date = new DateTime('2012-07-02T22:44:03Z');
 
         return array(

diff --git a/test/View/Helper/NumberFormatTest.php b/test/View/Helper/NumberFormatTest.php
@@ -34,6 +34,10 @@ class NumberFormatTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->helper = new NumberFormatHelper();
     }
 
@@ -50,6 +54,14 @@ public function tearDown()
 
     public function currencyTestsDataProvider()
     {
+        if (!extension_loaded('intl')) {
+            if (version_compare(\PHPUnit_Runner_Version::VERSION, '3.8.0-dev') === 1) {
+                $this->markTestSkipped('ext/intl not enabled');
+            } else {
+                return array(array());
+            }
+        }
+
         return array(
             array(
                 'de_DE',

diff --git a/test/View/Helper/PluralTest.php b/test/View/Helper/PluralTest.php
@@ -30,6 +30,10 @@ class PluralTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
+        if (!extension_loaded('intl')) {
+            $this->markTestSkipped('ext/intl not enabled');
+        }
+
         $this->helper = new PluralHelper();
     }