Changeset 887 for trunk/Packages/Common


Ignore:
Timestamp:
Dec 27, 2022, 2:34:03 PM (2 years ago)
Author:
chronos
Message:
  • Fixed: Run with PHP 8.1.
Location:
trunk/Packages/Common
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Packages/Common/AppModule.php

    r880 r887  
    392392  }
    393393
    394   function LoadModules()
    395   {
    396     if (method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
    397       $this->OnLoadModules();
     394  function LoadModules(): void
     395  {
     396    if (is_array($this->OnLoadModules) and (count($this->OnLoadModules) == 2) and method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
     397      call_user_func($this->OnLoadModules);
    398398    else $this->LoadModulesFromDir($this->ModulesDir);
    399399  }

  • trunk/Packages/Common/Error.php

    r880 r887  
    33class ErrorHandler
    44{
    5   var $Encoding;
    6   var $ShowError;
    7   var $UserErrors;
    8   var $OnError;
     5  public string $Encoding;
     6  public bool $ShowError;
     7  public int $UserErrors;
     8  public $OnError;
    99
    1010  function __construct()
    … …  
    2828  }
    2929
    30   function ErrorHandler($Number, $Message, $FileName, $LineNumber, $Variables)
     30  function ErrorHandler($Number, $Message, $FileName, $LineNumber)
    3131  {
    3232    $ErrorType = array
    … …  
    6363  }
    6464
    65   function ExceptionHandler(Exception $Exception)
     65  function ExceptionHandler(Throwable $Exception)
    6666  {
    6767    $Backtrace = $Exception->getTrace();
    … …  
    7575  }
    7676
    77   function ShowDefaultError($Message)
     77  function ShowDefaultError(string $Message): void
    7878  {
    7979    $Output = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>'."\n".

  • trunk/Packages/Common/UTF8.php

    r880 r887  
    546546    for ($I = 0; $I < strlen($String); $I++)
    547547    {
    548       if (ord($String{$I}) & 0x80) // UTF control character
     548      if (ord($String[$I]) & 0x80) // UTF control character
    549549      {
    550         if (ord($String{$I}) & 0x40) // First
     550        if (ord($String[$I]) & 0x40) // First
    551551        {
    552552          if ($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
    553           $UTFPrefix = $String{$I};
     553          $UTFPrefix = $String[$I];
    554554        }
    555         else $UTFPrefix .= $String{$I}; // Next
     555        else $UTFPrefix .= $String[$I]; // Next
    556556      } else
    557557      {
    558558        if ($UTFPrefix != '') $Result .= chr(array_search($UTFPrefix, $this->CharTable[$Charset]));
    559559        $UTFPrefix = '';
    560         $Result .= $String{$I};
     560        $Result .= $String[$I];
    561561      }
    562562    }
Note: See TracChangeset for help on using the changeset viewer.