Changeset 95 for trunk/Application/Core.php

Timestamp:

Dec 6, 2021, 11:33:48 AM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Added: Explicit types for better type checking.
• Fixed: Support for php 8.0.

File:

• trunk/Application/Core.php (modified) (8 diffs)

trunk/Application/Core.php

@@ -6 +6 @@
 include_once(dirname(__FILE__).'/../Global.php');
 include_once(dirname(__FILE__).'/Version.php');
-include_once(dirname(__FILE__).'/View.php');
+include_once(dirname(__FILE__).'/BaseView.php');
 include_once(dirname(__FILE__).'/UpdateTrace.php');
 include_once(dirname(__FILE__).'/DefaultConfig.php');
 
-class Core extends Application
+class Core extends System
 {
-  var $Pages;
-  var $ShowPage;
-  var $BaseURL;
-  var $UseSession;
+  public array $Pages;
+  public bool $ShowPage;
+  public string $BaseURL;
+  public bool $UseSession;
 
   function __construct()
@@ -28 +28 @@
   }
 
-  function RunCommon()
+  function RunCommon(): void
   {
     global $Config, $DatabaseRevision, $WithoutSessionStart;
@@ -38 +38 @@
     //$ErrorHandler->Start();
 
-    try {
+    try
+    {
       $this->Database = new Database();
       $this->Database->Connect($Config['Database']['Host'], $Config['Database']['User'],
@@ -55 +56 @@
     $this->Config = &$Config;
 
-    // Register and start existing modules
-    $this->Setup = new Setup($this);
-    $this->Setup->Start();
-    if ($this->Setup->CheckState())
+    $this->StartModules();
+  }
+
+  function StartModules(): void
+  {
+    $ModuleSetup = $this->ModuleManager->LoadModule(dirname(__FILE__).'/../Packages/Common/Modules/Setup.php');
+    $ModuleSetup->Install();
+    $ModuleSetup->Start();
+    $this->ModuleManager->LoadModules();
+    $this->ModuleManager->LoadModule(dirname(__FILE__).'/../Packages/Common/Modules/ModuleManager.php');
+    if (file_exists($this->ModuleManager->FileName)) $this->ModuleManager->LoadState();
+    if (ModuleSetup::Cast($ModuleSetup)->CheckState())
     {
-      $this->ModuleManager->Start();
+      $this->ModuleManager->StartAll(array(ModuleCondition::Enabled));
     }
   }
 
-  function Run()
+  function Run(): void
   {
     $this->RunCommon();
@@ -74 +83 @@
   }
 
-  function ShowPage()
+  static function Cast(System $System): Core
+  {
+    if ($System instanceof Core)
+    {
+      return $System;
+    }
+    throw new Exception('Expected Core type but '.gettype($System));
+  }
+
+  function ShowPage(): void
   {
     $this->BaseView = new BaseView($this);
@@ -89 +107 @@
   }
 
-  function RegisterPage($Path, $Handler)
-  {
-    if (is_array($Path))
-    {
-      $Page = &$this->Pages;
-      $LastKey = array_pop($Path);
-      foreach ($Path as $PathItem)
-      {
-        $Page = &$Page[$PathItem];
-      }
-      if (!is_array($Page)) $Page = array('' => $Page);
-      $Page[$LastKey] = $Handler;
-    } else $this->Pages[$Path] = $Handler;
-  }
-
-  function UnregisterPage($Path)
-  {
-    unset($this->Pages[$Path]);
-  }
-
-  function SearchPage($PathItems, $Pages)
+  function SearchPage(array $PathItems, array $Pages): string
   {
     if (count($PathItems) > 0) $PathItem = $PathItems[0];
@@ -123 +121 @@
   }
 
-  function Link($Target)
+  function Link(string $Target): string
   {
     return $this->BaseURL.$Target;
@@ -138 +136 @@
   }
 
-  function Show()
+  function Show(): string
   {
     Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');