Skip to content

Commit 9158d4a

Browse files
author
Alexander Paliarush
committed
MAGETWO-44728: [HHVM] Can't create admin role "Given encoding not supported on this OS!"
- Added 'default_charset' to the list of supported directives
1 parent 1b4572d commit 9158d4a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class HhvmCompatibilityTest extends \PHPUnit_Framework_TestCase
3737
'display_errors',
3838
'default_socket_timeout',
3939
'pcre.recursion_limit',
40+
'default_charset'
4041
];
4142

4243
public function testAllowedIniGetSetDirectives()

lib/internal/Magento/Framework/Validator/StringLength.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public function setEncoding($encoding = null)
3030
$result = ini_get('default_charset');
3131
}
3232
if (!$result) {
33-
#require_once 'Zend/Validate/Exception.php';
34-
throw new Zend_Validate_Exception('Given encoding not supported on this OS!');
33+
throw new \Zend_Validate_Exception('Given encoding not supported on this OS!');
3534
}
3635

3736
if (PHP_VERSION_ID < 50600) {

0 commit comments

Comments
 (0)