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

Timestamp:

Nov 20, 2020, 12:08:12 AM (4 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/Search/Search.php (modified) (6 diffs)

trunk/Modules/Search/Search.php

@@ -3 +3 @@
 class PageSearch extends Page
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -11 +11 @@
   }
 
-  function Show()
+  function Show(): string
   {
     $Output = '';
@@ -21 +21 @@
     '</form>';
     if ($Text != '')
-    foreach ($this->System->ModuleManager->Modules['Search']->Items as $Item)
+    foreach (ModuleSearch::Cast($this->System->GetModule('Search'))->Items as $Item)
     {
       $Columns = '';
@@ -33 +33 @@
       $Condition = substr($Condition, 3);
       $DbResult = $this->Database->Select($Item['Table'], $Columns, $Condition.' LIMIT '.
-        $this->System->ModuleManager->Modules['Search']->MaxItemCount);
+        ModuleSearch::Cast($this->System->GetModule('Search'))->MaxItemCount);
       if ($DbResult->num_rows > 0) $Output .= '<strong>'.$Item['Name'].'</strong><br/>';
       while ($Row = $DbResult->fetch_assoc())
@@ -49 +49 @@
 class ModuleSearch extends AppModule
 {
-  var $Items;
-  var $MaxItemCount;
+  public array $Items;
+  public int $MaxItemCount;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -65 +65 @@
   }
 
-  function DoStart()
+  function DoStart(): void
   {
     $this->System->Pages['search'] = 'PageSearch';
   }
 
-  function DoInstall()
+  function DoInstall(): void
   {
   }
 
-  function DoUnInstall()
+  function DoUnInstall(): void
   {
   }
 
-  function RegisterSearch($Title, $TableName, $Columns)
+  function RegisterSearch(string $Title, string $TableName, array $Columns): void
   {
     $this->Items[] = array('Name' => $Title, 'Table' => $TableName, 'Columns' => $Columns);
   }
+
+  static function Cast(AppModule $AppModule): ModuleSearch
+  {
+    if ($AppModule instanceof ModuleSearch)
+    {
+      return $AppModule;
+    }
+    throw new Exception('Expected ModuleSearch type but got '.gettype($AppModule));
+  }
 }