Changeset 887 for trunk/Application/Core.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/Application/Core.php (moved) (moved from trunk/Application/System.php ) (12 diffs)

trunk/Application/Core.php

@@ -14 +14 @@
 class Core extends Application
 {
-  /** @var Type */
-  var $Type;
-  var $Pages;
-  var $Bars;
-  /** @var FormManager */
-  var $FormManager;
-  /** @var Config */
-  var $ConfigManager;
-  var $PathItems;
-  var $RootURLFolder;
-  var $ShowPage;
-  var $Setup;
-  var $CommandLine;
-  var $PageHeaders;
-  var $BaseView;
+  public Type $Type;
+  public array $Bars;
+  public FormManager $FormManager;
+  public array $Config;
+  public Config $ConfigManager;
+  public array $PathItems;
+  public string $RootURLFolder;
+  public bool $ShowPage;
+  public Setup $Setup;
+  public array $PageHeaders;
+  public BaseView $BaseView;
+  public LocaleManager $LocaleManager;
+  public array $LinkLocaleExceptions;
 
   function __construct()
   {
     parent::__construct();
-    $this->Modules = array();
-    $this->Pages = array();
+    $this->Config = array();
     $this->ModuleManager->FileName = dirname(__FILE__).'/../Config/ModulesConfig.php';
     $this->FormManager = new FormManager($this->Database);
@@ -42 +39 @@
     if (substr($this->RootURLFolder, -10, 10) == '/index.php')
       $this->RootURLFolder = substr($this->RootURLFolder, 0, -10);
-    $this->CommandLine = array();
     $this->PageHeaders = array();
-  }
-
-  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)
+    $this->LinkLocaleExceptions = array();
+  }
+
+  function SearchPage(array $PathItems, array $Pages): ?string
   {
     if (count($PathItems) > 0) $PathItem = $PathItems[0];
@@ -80 +57 @@
   }
 
-  function PageNotFound()
-  {
-    return 'Page '.implode('/', $this->PathItems).' not found.';
-  }
-
-  function ShowPage()
+  function ShowPage(): void
   {
     $this->BaseView = new BaseView($this);
@@ -94 +66 @@
     {
       $Page = new $ClassName($this);
-    } else {
+    } else
+    {
       $Page = new PageMissing($this);
     }
@@ -100 +73 @@
   }
 
-  function ModulePresent($Name)
-  {
-    return array_key_exists($Name, $this->Modules);
-  }
-
-  function AddModule($Module)
-  {
-    $this->Modules[get_class($Module)] = $Module;
-  }
-
-  function HumanDate($Time)
+  function ModulePresent(string $Name): bool
+  {
+    return array_key_exists($Name, $this->ModuleManager->Modules);
+  }
+
+  function AddModule($Module): void
+  {
+    $this->ModuleManager->Modules[get_class($Module)] = $Module;
+  }
+
+  function HumanDate(int $Time): string
   {
     return date('j.n.Y', $Time);
   }
 
-  function Link($Target)
+  function Link(string $Target): string
   {
     return $this->RootURLFolder.$Target;
   }
 
-  function ShowAction($Id)
+  function ShowAction(string $Id): string
   {
     $Output = '';
@@ -131 +104 @@
       if ($Action['Icon'] == '') $Action['Icon'] = 'clear.png';
       if (substr($Action['URL'], 0, 4) != 'http') $Action['URL'] = $this->Link($Action['URL']);
-      if (!defined('NEW_PERMISSION') or $this->User->CheckPermission('System', 'Read', 'Item', $Id))
+      if (!defined('NEW_PERMISSION') or ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('System', 'Read', 'Item', $Id))
         $Output .= '<img alt="'.$Action['Title'].'" src="'.$this->Link('/images/favicons/'.$Action['Icon']).
         '" width="16" height="16" /> <a href="'.$Action['URL'].'">'.$Action['Title'].'</a>';
@@ -138 +111 @@
   }
 
-  function RunCommon()
-  {
-    global $Database, $ScriptTimeStart, $ConfigFileName, $Mail, $Type,
-      $DatabaseRevision, $Config, $GlobalLocaleManager;
+  function RunCommon(): void
+  {
+    global $Database, $ScriptTimeStart, $ConfigFileName, $Config, $GlobalLocaleManager;
 
     date_default_timezone_set('Europe/Prague');
@@ -199 +171 @@
   }
 
-  function Run()
+  function Run(): void
   {
     $this->RunCommon();
@@ -213 +185 @@
       {
          $NewLangCode = $this->PathItems[0];
-         if (array_key_exists($NewLangCode, $this->LocaleManager->Available)) 
+         if (array_key_exists($NewLangCode, $this->LocaleManager->Available))
          {
            array_shift($this->PathItems);
@@ -226 +198 @@
   }
 
-  function RunCommandLine()
+  function RunCommandLine(): void
   {
     global $argv;
@@ -236 +208 @@
       {
         $Command = $this->CommandLine[$argv[1]];
-        $Output = call_user_func($Command['Callback'], $argv);
+        $Output = call_user_func($Command->Callback, $argv);
       } else $Output = 'Command "'.$argv[1].'" not supported.'."\n";
-    } else $Output = 'No command was given as parameter'."\n";
+    } else $Output = 'No command was given as parameter. Use "list" to show available commands.'."\n";
     echo($Output);
   }
 
-  function RegisterCommandLine($Name, $Callback)
-  {
-    $this->CommandLine[$Name] = array('Name' => $Name, 'Callback' => $Callback);
-  }
-
-  function RegisterPageBar($Name)
+  function RegisterPageBar(string $Name): void
   {
     $this->Bars[$Name] = array();
   }
 
-  function UnregisterPageBar($Name)
+  function UnregisterPageBar(string $Name): void
   {
     unset($this->Bars[$Name]);
   }
 
-  function RegisterPageBarItem($BarName, $ItemName, $Callback)
+  function RegisterPageBarItem(string $BarName, string $ItemName, callable $Callback): void
   {
     $this->Bars[$BarName][$ItemName] = $Callback;
   }
 
-  function RegisterPageHeader($Name, $Callback)
+  function UnregisterPageBarItem(string $BarName, string $ItemName): void
+  {
+    unset($this->Bars[$BarName][$ItemName]);
+  }
+
+  function RegisterPageHeader(string $Name, callable $Callback): void
   {
     $this->PageHeaders[$Name] = $Callback;
+  }
+
+  function UnregisterPageHeader(string $Name): void
+  {
+    unset($this->PageHeaders[$Name]);
   }
 }
@@ -270 +247 @@
 class PageMissing extends Page
 {
-  var $FullTitle = 'Stránka nenalezena';
-  var $ShortTitle = 'Stránka nenalezena';
-
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
+    $this->FullTitle = 'Stránka nenalezena';
+    $this->ShortTitle = 'Stránka nenalezena';
     $this->ParentClass = 'PagePortal';
   }
 
-  function Show()
+  function Show(): string
   {
     Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');