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

trunk/Modules/Finance/Bill.php

@@ -3 +3 @@
 class Bill extends Model
 {
-  var $SpecificSymbol = 1; // počítačová sít
-  var $Checked;
+  public int $SpecificSymbol = 1; // computer network number
+  public bool $Checked = false;
 
   function GenerateHTML()
@@ -11 +11 @@
   }
 
-  function SaveToFile($FileName)
-  {
-    global $Database;
-
+  function SaveToFile(string $FileName)
+  {
     $PdfData = $this->HtmlToPdf($this->GenerateHTML());
     file_put_contents($FileName, $PdfData);
   }
 
-  function HtmlToPdf($HtmlCode)
+  function HtmlToPdf(string $HtmlCode): string
   {
     $Encoding = new Encoding();
@@ -35 +33 @@
 class BillInvoice extends Bill
 {
-  var $InvoiceId;
-
-  function ShowSubjectInfo($Subject)
+  public string $InvoiceId;
+
+  function ShowSubjectInfo(array $Subject): string
   {
     $BooleanText = array('Ne', 'Ano');
@@ -50 +48 @@
   }
 
-  function GenerateHTML()
-  {
-    $Finance = &$this->System->Modules['Finance'];
+  function GenerateHTML(): string
+  {
+    $Finance = &ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance;
     $Finance->LoadMonthParameters(0);
 
@@ -152 +150 @@
 class BillOperation extends Bill
 {
-  var $OperationId;
-
-  function GenerateHTML()
+  public string $OperationId;
+
+  function GenerateHTML(): string
   {
     $DbResult = $this->Database->query('SELECT `FinanceOperation`.*, `FinanceOperationGroup`.`Direction`, `DocumentLineCode`.`Name` AS `BillName` FROM `FinanceOperation` '.