Changeset 95 for trunk/Packages/Common/Common.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/Common.php (modified) (2 diffs)

trunk/Packages/Common/Common.php

@@ -11 +11 @@
 include_once(dirname(__FILE__).'/Error.php');
 include_once(dirname(__FILE__).'/Base.php');
-include_once(dirname(__FILE__).'/Application.php');
-include_once(dirname(__FILE__).'/AppModule.php');
+include_once(dirname(__FILE__).'/View.php');
+include_once(dirname(__FILE__).'/Model.php');
+include_once(dirname(__FILE__).'/ModelDesc.php');
+include_once(dirname(__FILE__).'/Controller.php');
+include_once(dirname(__FILE__).'/System.php');
+include_once(dirname(__FILE__).'/Module.php');
+include_once(dirname(__FILE__).'/ModuleManager.php');
 include_once(dirname(__FILE__).'/Config.php');
 include_once(dirname(__FILE__).'/Page.php');
 include_once(dirname(__FILE__).'/Locale.php');
 include_once(dirname(__FILE__).'/Update.php');
-include_once(dirname(__FILE__).'/Setup.php');
 include_once(dirname(__FILE__).'/Table.php');
 include_once(dirname(__FILE__).'/Process.php');
+include_once(dirname(__FILE__).'/Generics.php');
+include_once(dirname(__FILE__).'/BigInt.php');
+include_once(dirname(__FILE__).'/Int128.php');
+include_once(dirname(__FILE__).'/Pdf.php');
+include_once(dirname(__FILE__).'/Modules/Setup.php');
+include_once(dirname(__FILE__).'/Modules/ModuleManager.php');
 
 class PackageCommon
 {
-  var $Name;
-  var $Version;
-  var $ReleaseDate;
-  var $License;
-  var $Creator;
-  var $Homepage;
+  public string $Name;
+  public string $Version;
+  public int $ReleaseDate;
+  public string $License;
+  public string $Creator;
+  public string $Homepage;
 
   function __construct()
   {
     $this->Name = 'Common';
-    $this->Version = '1.3';
-    $this->ReleaseDate = strtotime('2019-10-04');
+    $this->Version = '1.2';
+    $this->ReleaseDate = strtotime('2020-03-29');
     $this->Creator = 'Chronos';
-    $this->License = 'GNU/GPL';
+    $this->License = 'GNU/GPLv3';
     $this->Homepage = 'https://svn.zdechov.net/PHPlib/Common/';
   }
 }
 
-class Paging extends Base
+class Paging
 {
-  var $TotalCount;
-  var $ItemPerPage;
-  var $Around;
-  var $SQLLimit;
-  var $Page;
+  public int $TotalCount;
+  public int $ItemPerPage;
+  public int $Around;
+  public string $SQLLimit;
+  public int $Page;
 
-  function __construct(Application &$System)
+  function __construct()
   {
-    parent::__construct($System);
+    global $System;
 
     $this->ItemPerPage = $System->Config['Web']['ItemsPerPage'];
@@ -57 +67 @@
   }
 
-  function Show()
+  function Show(): string
   {
     $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);