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

trunk/Modules/File/File.php

@@ -5 +5 @@
 class File extends Model
 {
-  var $FilesDir;
-
-  function __construct($System)
+  public string $FilesDir;
+
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -13 +13 @@
   }
 
-  function Delete($Id)
+  function Delete($Id): void
   {
     $DbResult = $this->Database->select('File', 'Name', 'Id='.$Id);
@@ -24 +24 @@
   }
 
-  function CreateFromUpload($Name)
+  function CreateFromUpload(string $Name): string
   {
     // Submited form with file input have to be enctype="multipart/form-data"
@@ -41 +41 @@
   }
 
-  function DetectMimeType($FileName)
+  function DetectMimeType(string $FileName): string
   {
     $MimeTypes = GetMimeTypes();
@@ -49 +49 @@
   }
 
-  function Download($Id)
+  function Download(string $Id): void
   {
     $DbResult = $this->Database->select('File', '*', 'Id='.addslashes($Id));
@@ -67 +67 @@
   }
 
-  function GetDir($Id)
+  function GetDir(string $Id): string
   {
     $DbResult = $this->Database->select('FileDirectory', '*', 'Id='.$Id);
@@ -77 +77 @@
   }
 
-  function GetFullPath($Id)
+  function GetFullPath(string $Id): string
   {
     $DbResult = $this->Database->select('File', '*', 'Id='.addslashes($Id));
@@ -93 +93 @@
 class PageFile extends Page
 {
-  function Show()
+  function Show(): string
   {
     if (array_key_exists('id', $_GET)) $Id = $_GET['id'];
@@ -99 +99 @@
     else return $this->SystemMessage('Chyba', 'Nezadáno id souboru');
     $this->ClearPage = true;
-    $Output = $this->System->Modules['File']->Download($Id);
+    $Output = ModuleFile::Cast($this->System->GetModule('File'))->File->Download($Id);
     return $Output;
   }
@@ -106 +106 @@
 class PageFileCheck extends Page
 {
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -114 +114 @@
   }
 
-  function GetAbsolutePath($Path)
+  function GetAbsolutePath(string $Path): string
   {
     $Path = trim($Path);
@@ -137 +137 @@
   }
 
-  function Show()
+  function Show(): string
   {
     $Output = '<strong>Missing files:</strong><br>';
-    if (!$this->System->User->CheckPermission('File', 'Check'))
+    if (!ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('File', 'Check'))
       return 'Nemáte oprávnění';
     $DbResult = $this->Database->select('File', 'Id');
@@ -146 +146 @@
     {
       $Id = $DbRow['Id'];
-      $FileName = $this->GetAbsolutePath($this->System->Modules['File']->GetFullPath($Id));
+      $FileName = $this->GetAbsolutePath(ModuleFile::Cast($this->System->GetModule('File'))->File->GetFullPath($Id));
       if (!file_exists($FileName))
         $Output .= '<a href="'.$this->System->Link('/is/?a=view&amp;t=File&amp;i='.$Id).'">'.$FileName.'</a><br>';
@@ -156 +156 @@
 class ModuleFile extends AppModule
 {
-  function __construct($System)
+  public File $File;
+
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -164 +166 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Base module for file management';
-    $this->Dependencies = array();
-  }
-
-  function DoInstall()
-  {
-  }
-
-  function DoUninstall()
-  {
-  }
-
-  function DoStart()
+    $this->Dependencies = array('User');
+
+    $this->File = new File($this->System);
+  }
+
+  function DoInstall(): void
+  {
+  }
+
+  function DoUninstall(): void
+  {
+  }
+
+  function DoStart(): void
   {
     global $Config;
 
-    $this->System->RegisterPage('file', 'PageFile');
-    $this->System->RegisterPage('file-check', 'PageFileCheck');
-    $this->System->AddModule(new File($this->System));
-    $this->System->Modules['File']->FilesDir = dirname(__FILE__).'/../../'.$Config['Web']['UploadFileFolder'];
+    $this->System->RegisterPage(['file'], 'PageFile');
+    $this->System->RegisterPage(['file-check'], 'PageFileCheck');
+    $this->File->FilesDir = dirname(__FILE__).'/../../'.$Config['Web']['UploadFileFolder'];
     $this->System->FormManager->RegisterClass('File', array(
       'Title' => 'Soubor',
@@ -271 +274 @@
   }
 
-  function DoStop()
-  {
-  }
-}
+  static function Cast(AppModule $AppModule): ModuleFile
+  {
+    if ($AppModule instanceof ModuleFile)
+    {
+      return $AppModule;
+    }
+    throw new Exception('Expected ModuleFile type but got '.gettype($AppModule));
+  }
+}