Changeset 95 for trunk/Packages/Common/UTF8.php

Timestamp:

Dec 6, 2021, 11:33:48 AM (2 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Added: Explicit types for better type checking.
• Fixed: Support for php 8.0.

File:

• trunk/Packages/Common/UTF8.php (modified) (3 diffs)

trunk/Packages/Common/UTF8.php

@@ -526 +526 @@
   }
 
-  function ToUTF8($String, $Charset = 'iso2')
+  function ToUTF8string(string $String, string $Charset = 'iso2'): string
   {
     $Result = '';
@@ -540 +540 @@
   }
 
-  function FromUTF8($String, $Charset = 'iso2')
+  function FromUTF8(string $String, string $Charset = 'iso2'): string
   {
     $Result = '';
@@ -546 +546 @@
     for ($I = 0; $I < strlen($String); $I++)
     {
-      if (ord($String{$I}) & 0x80) // UTF control character
+      if (ord($String[$I]) & 0x80) // UTF control character
       {
-        if (ord($String{$I}) & 0x40) // First
+        if (ord($String[$I]) & 0x40) // First
         {
           if ($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
-          $UTFPrefix = $String{$I};
+          $UTFPrefix = $String[$I];
         }
-        else $UTFPrefix .= $String{$I}; // Next
+        else $UTFPrefix .= $String[$I]; // Next
       } else
       {
         if ($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
         $UTFPrefix = '';
-        $Result .= $String{$I};
+        $Result .= $String[$I];
       }
     }