Changeset 887 for trunk/Modules/API/API.php

Timestamp:

Nov 20, 2020, 12:08:12 AM (3 years ago)

Author:

chronos

Message:

• Added: Static types added to almost all classes, methods and function. Supported by PHP 7.4.
• Fixed: Various found code issues.

File:

• trunk/Modules/API/API.php (modified) (7 diffs)

trunk/Modules/API/API.php

@@ -17 +17 @@
 class ModuleAPI extends AppModule
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -28 +28 @@
   }
 
-  function DoStart()
+  function DoStart(): void
   {
-    $this->System->RegisterPage(array('api'), 'PageAPI');
+    $this->System->RegisterPage(['api'], 'PageAPI');
   }
 }
@@ -36 +36 @@
 class PageAPI extends Page
 {
-  var $DataFormat;
- 
-  function __construct($System)
+  public string $DataFormat;
+
+  function __construct(System $System)
   {
     parent::__construct($System);
     $this->ClearPage = true;
+    $this->DataFormat = '';
   }
 
-  function Show()
+  function Show(): string
   {
     // p - token
@@ -50 +51 @@
       $Token = $_GET['p'];
       $DbResult = $this->Database->query('SELECT `User` FROM `APIToken` WHERE `Token`="'.$Token.'"');
-      if ($DbResult->num_rows > 0) 
+      if ($DbResult->num_rows > 0)
       {
         $DbRow = $DbResult->fetch_assoc();
@@ -75 +76 @@
   }
 
-  function ShowList($Table, $ItemId)
+  function ShowList(string $Table, $ItemId): string
   {
     if (($Table != '') and (array_key_exists($Table, $this->System->FormManager->Classes)))
@@ -84 +85 @@
       $SourceTable = '('.$FormClass['SQL'].') AS `TX`';
       else $SourceTable = '`'.$FormClass['Table'].'` AS `TX`';
-      
+
     $Filter = '';
     if ($ItemId != 0)
@@ -112 +113 @@
     $dom->appendChild($root);
 
-    $array2xml = function ($node, $array) use ($dom, &$array2xml) 
+    $array2xml = function ($node, $array) use ($dom, &$array2xml)
     {
       foreach ($array as $key => $value)
       {
-        if ( is_array($value) ) 
+        if ( is_array($value) )
         {
           if (is_numeric($key)) $key = 'N'.$key; //die('XML tag name "'.$key.'" can\'t be numeric');