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

trunk/Packages/Common/Application.php

@@ -3 +3 @@
 class ModelDef
 {
-  var $OnChange;
-  
+  public array $OnChange;
+
   function __construct()
   {
     $this->OnChange = array();
   }
-  
-  function DoOnChange()
+
+  function DoOnChange(): void
   {
     foreach ($this->OnChange as $Callback)
@@ -17 +17 @@
     }
   }
-  
-  function RegisterOnChange($SysName, $Callback)
+
+  function RegisterOnChange(string $SysName, callable $Callback): void
   {
     $this->OnChange[$SysName] = $Callback;
   }
-  
-  function UnregisterOnChange($SysName)
+
+  function UnregisterOnChange(string $SysName): void
   {
     unset($this->OnChange[$SysName]);
@@ -29 +29 @@
 }
 
+class Command
+{
+  public string $Name;
+  public string $Description;
+  public $Callback;
+
+  function __construct(string $Name, string $Description, callable $Callback)
+  {
+    $this->Name = $Name;
+    $this->Description = $Description;
+    $this->Callback = $Callback;
+  }
+}
+
 class Application extends System
 {
-  var $Name;
-  /** @var AppModuleManager */
-  var $ModuleManager;
-  var $Modules;
-  var $Models;
-  
+  public string $Name;
+  public AppModuleManager $ModuleManager;
+  public array $Models;
+  public array $CommandLine;
+  public array $Pages;
+
   function __construct()
   {
@@ -42 +56 @@
     $this->Name = 'Application';
     $this->ModuleManager = new AppModuleManager($this);
-    $this->Modules = array();
     $this->Models = array();
+    $this->CommandLine = array();
+    $this->Pages = array();
+
+    $this->RegisterCommandLine('list', 'Prints available commands', array($this, 'ListCommands'));
   }
-  
-  function RegisterModel($SysName, $Model)
+
+  function GetModule(string $Name): AppModule
+  {
+    return $this->ModuleManager->Modules[$Name];
+  }
+
+  function RegisterModel(string $SysName, array $Model): void
   {
     $NewModelDef = new ModelDef();
@@ -53 +75 @@
   }
 
-  function UnregisterModel($SysName)
+  function UnregisterModel(string $SysName): void
   {
     unset($this->Models[$SysName]);
   }
-  
-  function Run()
+
+  function RegisterCommandLine(string $Name, string $Description, callable $Callback): void
   {
+    $this->CommandLine[$Name] = new Command($Name, $Description, $Callback);
+  }
 
+  function UnrgisterCommandLine(string $Name): void
+  {
+    unset($this->CommandLine[$Name]);
+  }
+
+  function ListCommands(array $Parameters)
+  {
+    $Output = 'Available commands:'."\n";
+    foreach ($this->CommandLine as $Command)
+    {
+      $Output .= ' '.$Command->Name.' - '.$Command->Description."\n";
+    }
+    echo($Output."\n");
+  }
+
+  function RegisterPage(array $Path, string $Handler): void
+  {
+    $Page = &$this->Pages;
+    $LastKey = array_pop($Path);
+    foreach ($Path as $PathItem)
+    {
+      $Page = &$Page[$PathItem];
+    }
+    if (!is_array($Page)) $Page = array('' => $Page);
+    $Page[$LastKey] = $Handler;
+  }
+
+  function UnregisterPage(array $Path): void
+  {
+    $Page = &$this->Pages;
+    $LastKey = array_pop($Path);
+    foreach ($Path as $PathItem)
+    {
+      $Page = &$Page[$PathItem];
+    }
+    unset($Page[$LastKey]);
+  }
+
+  function Run(): void
+  {
+  }
+
+  function Link(string $Target): string
+  {
+    return $Target;
   }
 }