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

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -14 +14 @@
   }
 
-  function Print()
+  function Print(): string
   {
     $Output = '(Min: '.$this->Min.' Max: '.$this->Max;
@@ -46 +46 @@
   }
 
-  function CheckName($Name, &$UsedNames)
+  function CheckName($Name, &$UsedNames): void
   {
     if (in_array($Name, $UsedNames)) die("\n".'Duplicate name: '.$Name);
@@ -52 +52 @@
   }
 
-  function GetCommands(&$UsedNames = null)
+  function GetCommands(&$UsedNames = null): array
   {
     if ($UsedNames == null) $UsedNames = array();
@@ -72 +72 @@
   }
 
-  function GetParentName(string $Suffix)
+  function GetParentName(string $Suffix): string
   {
     if ($this->Parent != null) return $this->Parent->Name.$Suffix;
@@ -78 +78 @@
   }
 
-  function UpdateMinSpeeds()
+  function UpdateMinSpeeds(): void
   {
     if (($this->LimitIn->Min == 0) or ($this->LimitOut->Min == 0))
@@ -100 +100 @@
 class SpeedLimitItems extends GenericList
 {
-  function AddNew(string $Name, SpeedLimitItem $Parent = null)
+  function AddNew(string $Name, SpeedLimitItem $Parent = null): SpeedLimitItem
   {
     $Item = new SpeedLimitItem($Name, $Parent);
-    $Item->LimitIn = new SpeedLimit();
-    $Item->LimitOut = new SpeedLimit();
+    $Item->LimitIn = new SpeedLimit(0, 0);
+    $Item->LimitOut = new SpeedLimit(0, 0);
     $this->Items[] = $Item;
     return $Item;
@@ -119 +119 @@
   }
 
-  function GetCommands(&$UsedNames)
+  function GetCommands(&$UsedNames): array
   {
     $Output = array();
@@ -137 +137 @@
   var $SpeedLimits;
 
-  function Run()
+  function Run(): void
   {
     $PathQueue = array('queue', 'tree');
@@ -149 +149 @@
     $this->UsedNames = array();
 
-    $Finance = &$this->System->Modules['Finance'];
+    $Finance = &ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance;
     $Finance->LoadMonthParameters(0);
 
@@ -280 +280 @@
   }
 
-  function BuildSpeedLimit(&$SpeedLimit, $TopSpeedLimitItem)
+  function BuildSpeedLimit(&$SpeedLimit, $TopSpeedLimitItem): void
   {
     $SpeedLimitName = $SpeedLimit['Name'].'-grp';
@@ -297 +297 @@
   }
 
-  function LoadSpeedLimits($SpeedLimitItem)
+  function LoadSpeedLimits($SpeedLimitItem): void
   {
     echo('Limit groups: ');
@@ -326 +326 @@
   }
 
-  function UpdateMinSpeed($DeviceId)
+  function UpdateMinSpeed($DeviceId): void
   {
     $MinSpeed = 0;
@@ -340 +340 @@
 
   // Calculate maximum real speed available for each network device Start with main router and continue with adjecement nodes.
-  function BuildTree($RootDeviceId, $BaseSpeed)
+  function BuildTree($RootDeviceId, $BaseSpeed): void
   {
     // Load network devices
@@ -438 +438 @@
   }
 
-  function BuildQueueItems($DeviceId, $SpeedLimitParent)
+  function BuildQueueItems($DeviceId, $SpeedLimitParent): void
   {
     $Device = $this->Devices[$DeviceId];
@@ -475 +475 @@
   }
 
-  function RunTopology()
+  function RunTopology(): void
   {
     $PathQueue = array('queue', 'tree');
@@ -487 +487 @@
     $this->UsedNames = array();
 
-    $Finance = &$this->System->Modules['Finance'];
+    $Finance = &ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance;
     $Finance->LoadMonthParameters(0);