diff options
| author | Andrey Andreev <narf@devilix.net> | 2022-01-05 16:32:10 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2022-01-05 16:32:10 +0100 |
| commit | 2fa66ba7c6840ac851ae7da2889e7fb654dcda07 (patch) | |
| tree | 70573048d629ecc51804507c7868356fad323860 /tests/codeigniter/core/compat | |
| parent | efc96b71e4b1d13d713d8b2be01796b7d30e6f9b (diff) | |
| parent | 1d0315b6b3d7003bfb348ccaf7ee30d2533635de (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'tests/codeigniter/core/compat')
| -rw-r--r-- | tests/codeigniter/core/compat/mbstring_test.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/codeigniter/core/compat/mbstring_test.php b/tests/codeigniter/core/compat/mbstring_test.php index 8b8629efc..39f48ac10 100644 --- a/tests/codeigniter/core/compat/mbstring_test.php +++ b/tests/codeigniter/core/compat/mbstring_test.php @@ -31,9 +31,9 @@ class mbstring_test extends CI_TestCase { */ public function test_mb_strpos() { - $this->assertEquals(ICONV_ENABLED ? 3 : 6, mb_strpos('тест', 'с')); + $this->assertEquals(ICONV_ENABLED ? 2 : 4, mb_strpos('тест', 'с')); $this->assertFalse(mb_strpos('тест', 'с', 3)); - $this->assertEquals(ICONV_ENABLED ? 3 : 6, mb_strpos('тест', 'с', 1, 'UTF-8')); + $this->assertEquals(ICONV_ENABLED ? 2 : 4, mb_strpos('тест', 'с', 1, 'UTF-8')); } // ------------------------------------------------------------------------ @@ -46,9 +46,9 @@ class mbstring_test extends CI_TestCase { $this->assertEquals(ICONV_ENABLED ? 'стинг' : 'естинг', mb_substr('тестинг', 2)); $this->assertEquals(ICONV_ENABLED ? 'нг' : 'г', mb_substr('тестинг', -2)); $this->assertEquals(ICONV_ENABLED ? 'ст' : 'е', mb_substr('тестинг', 2, 2)); - $this->assertEquals(ICONV_ENABLED ? 'стинг' : 'естинг', mb_substr('тестинг', 2, 'UTF-8')); - $this->assertEquals(ICONV_ENABLED ? 'нг' : 'г', mb_substr('тестинг', -2, 'UTF-8')); + $this->assertEquals(ICONV_ENABLED ? 'стинг' : 'естинг', mb_substr('тестинг', 2, NULL, 'UTF-8')); + $this->assertEquals(ICONV_ENABLED ? 'нг' : 'г', mb_substr('тестинг', -2, NULL, 'UTF-8')); $this->assertEquals(ICONV_ENABLED ? 'ст' : 'е', mb_substr('тестинг', 2, 2, 'UTF-8')); } -}
\ No newline at end of file +} |