]> granicus.if.org Git - php/commitdiff
Remove checks for unicode.semantics ini option
authorNikita Popov <nikita.ppv@gmail.com>
Sat, 3 Feb 2018 18:50:20 +0000 (19:50 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Sat, 3 Feb 2018 18:50:20 +0000 (19:50 +0100)
ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
ext/pdo_mysql/tests/pdo_mysql_attr_connection_status.phpt
ext/session/tests/025.phpt
ext/simplexml/tests/000.phpt

index b177c1fd5b6fdb4a74f8f92386af670d73823949..67c4442d2840a19ac52a17eeec66f9d0aba01176 100644 (file)
@@ -2,8 +2,6 @@
 mysqli_real_escape_string() - big5
 --SKIPIF--
 <?php
-if (ini_get('unicode.semantics'))
-       die("skip Test cannot be run in unicode mode");
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
index cf4afb6f6bc7bc4b14423317b82a1c73d8690dbb..208056fc4716d44b27352b4fa4e78ceec56092d8 100644 (file)
@@ -2,8 +2,6 @@
 mysqli_real_escape_string() - eucjpms
 --SKIPIF--
 <?php
-if (ini_get('unicode.semantics'))
-       die("skip Test cannot be run in unicode mode");
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
index 7ac7497b80d6b969e55816a40d0c7913dab60735..7fa5523661e1a435a0a49c24367f038248fef8a2 100644 (file)
@@ -2,8 +2,6 @@
 mysqli_real_escape_string() - euckr
 --SKIPIF--
 <?php
-if (ini_get('unicode.semantics'))
-       die("skip Test cannot be run in unicode mode");
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
index b93d8154fa5b7828144f8817e42be18c9ece3bb0..0f7a5083b888e8dbcecbdfc5545e13a7a9957637 100644 (file)
@@ -2,8 +2,6 @@
 mysqli_real_escape_string() - gb2312
 --SKIPIF--
 <?php
-if (ini_get('unicode.semantics'))
-       die("skip Test cannot be run in unicode mode");
 
 require_once('skipif.inc');
 require_once('skipifemb.inc');
index 187f9ec2321b6394e6d9d8843d7ab19c4d2812a7..7db5ec35ec669080e1c7c6ff88f3a73029cf6a6d 100644 (file)
@@ -13,13 +13,8 @@ $db = MySQLPDOTest::factory();
        $db = MySQLPDOTest::factory();
 
        $status = $db->getAttribute(PDO::ATTR_CONNECTION_STATUS);
-       if (ini_get('unicode.semantics')) {
-               if (!is_unicode($status))
-                       printf("[001] Expecting unicode, got '%s'\n", var_export($status, true));
-       } else {
-               if (!is_string($status))
-                       printf("[002] Expecting string, got '%s'\n", var_export($status, true));
-       }
+    if (!is_string($status))
+        printf("[002] Expecting string, got '%s'\n", var_export($status, true));
 
        if ('' == $status)
                printf("[003] Connection status string must not be empty\n");
@@ -34,4 +29,4 @@ $db = MySQLPDOTest::factory();
        print "done!";
 ?>
 --EXPECTF--
-done!
\ No newline at end of file
+done!
index 83ab6ca3702b9a6b336444a84cfc7da5559f3d88..aa1f995c494dab81a735eda7a5fdc83b40179b3a 100644 (file)
@@ -46,13 +46,6 @@ class handler {
     }
 
     function gc() { return true; }
-
-    function __construct()
-    {
-        if (ini_get("unicode.semantics")) {
-            $this->data = str_replace('s:', 'U:', $this->data);
-        }
-    }
 }
 
 $hnd = new handler;
index ae23dcfdd01e2334c8d5e1c83f12596753c268bf..62615d17a248011cbc025f2014f60dbbc6755c4f 100644 (file)
@@ -22,7 +22,7 @@ test('sxe->elem1');
 test('sxe->elem1[0]');
 test('sxe->elem1[0]->elem2');
 test('sxe->elem1[0]->elem2->bla');
-if (!ini_get("unicode_semantics")) test('sxe->elem1[0]["attr1"]');
+test('sxe->elem1[0]["attr1"]');
 test('sxe->elem1[0]->attr1');
 test('sxe->elem1[1]');
 test('sxe->elem1[2]');