Changeset 887 for trunk/Modules/User/User.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/User/User.php (modified) (9 diffs)

trunk/Modules/User/User.php

@@ -7 +7 @@
 class ModuleUser extends AppModule
 {
-  var $UserPanel;
-
-  function __construct($System)
+  public array $UserPanel;
+  public User $User;
+
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -19 +20 @@
     $this->Dependencies = array();
     $this->UserPanel = array();
-  }
-
-  function DoInstall()
+    $this->User = new User($System);
+  }
+
+  function DoInstall(): void
   {
     $this->Database->query("CREATE TABLE IF NOT EXISTS `User` (
@@ -108 +110 @@
   }
 
-  function DoUninstall()
+  function DoUninstall(): void
   {
     $this->Database->query('DROP TABLE `PermissionUserAssignment`');
@@ -118 +120 @@
   }
 
-  function DoUpgrade()
+  function DoUpgrade(): void
   {
     /*
@@ -129 +131 @@
   }
 
-  function DoStart()
-  {
-    $this->System->User = new User($this->System);
-    if (isset($_SERVER['REMOTE_ADDR'])) $this->System->User->Check();
-    $this->System->RegisterPage('userlist', 'PageUserList');
-    $this->System->RegisterPage('user', 'PageUser');
+  function DoStart(): void
+  {
+    if (isset($_SERVER['REMOTE_ADDR'])) $this->User->Check();
+    $this->System->RegisterPage(['userlist'], 'PageUserList');
+    $this->System->RegisterPage(['user'], 'PageUser');
     $this->System->RegisterPageBarItem('Top', 'User', array($this, 'TopBarCallback'));
     $this->System->FormManager->RegisterClass('UserLogin', array(
@@ -272 +273 @@
       'Filter' => '1',
     ));
-    $this->System->ModuleManager->Modules['IS']->RegisterDashboardItem('User',
-        array('ModuleUser', 'ShowDashboardItem'));
-  }
-
-  function ShowDashboardItem()
+    ModuleIS::Cast($this->System->GetModule('IS'))->RegisterDashboardItem('User',
+      array($this, 'ShowDashboardItem'));
+  }
+
+  function ShowDashboardItem(): string
   {
     $DbResult = $this->Database->select('User', 'COUNT(*)', '1');
@@ -284 +285 @@
   }
 
-  function DoStop()
-  {
-  }
-
-  function TopBarCallback()
-  {
-    if ($this->System->User->User['Id'] == null)
+  function DoStop(): void
+  {
+  }
+
+  function TopBarCallback(): string
+  {
+    if ($this->User->User['Id'] == null)
     {
       $Output = '<a href="'.$this->System->Link('/user/?Action=LoginForm').'">Přihlášení</a> '.
@@ -296 +297 @@
     } else
     {
-      $Output = $this->System->User->User['Name'].
+      $Output = $this->User->User['Name'].
         ' <a href="'.$this->System->Link('/user/?Action=UserMenu').'">Nabídka</a>'.
         ' <a href="'.$this->System->Link('/user/?Action=Logout').'">Odhlásit</a>';
@@ -303 +304 @@
     return $Output;
   }
+
+  static function Cast(AppModule $AppModule): ModuleUser
+  {
+    if ($AppModule instanceof ModuleUser)
+    {
+      return $AppModule;
+    }
+    throw new Exception('Expected ModuleUser type but got '.gettype($AppModule));
+  }
 }