Fixes Zend_Validate_StringLength::setEncoding() with ini_set

Closes zendframework#634
volendavidov · Apr 12, 2016 · d3b8a27 · d3b8a27
1 parent 202c1b3
commit d3b8a27
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/library/Zend/Validate/StringLength.php b/library/Zend/Validate/StringLength.php
@@ -205,7 +205,8 @@ public function setEncoding($encoding = null)
             if (PHP_VERSION_ID < 50600) {
                 $result = iconv_set_encoding('internal_encoding', $encoding);
             } else {
-                $result = ini_set('default_charset', $encoding);
+                ini_set('default_charset', $encoding);
+                $result = ini_get('default_charset');
             }
             if (!$result) {
                 require_once 'Zend/Validate/Exception.php';

diff --git a/tests/Zend/Validate/StringLengthTest.php b/tests/Zend/Validate/StringLengthTest.php
@@ -178,6 +178,15 @@ public function testDifferentEncodingWithValidator()
         $this->assertEquals('ISO-8859-1', $validator->getEncoding());
     }
 
+    /**
+     * @expectedException Zend_Validate_Exception
+     * @group GH-634
+     */
+    public function testWrongEncoding()
+    {
+        $this->_validator->setEncoding('');
+    }
+
     /**
      * @ZF-4352
      */