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

trunk/Modules/NetworkConfig/NetworkConfig.php

@@ -5 +5 @@
   var $ConfigItems;
 
-  function __construct($System)
+  function __construct(System $System)
   {
     parent::__construct($System);
@@ -17 +17 @@
   }
 
-  function DoInstall()
+  function DoInstall(): void
   {
   }
 
-  function DoUnInstall()
+  function DoUnInstall(): void
   {
   }
 
-  function DoStart()
+  function DoStart(): void
   {
     $this->System->FormManager->RegisterClass('NetworkConfiguration', array(
@@ -55 +55 @@
       'States' => array('Neplánováno', 'V plánu', 'Provádí se'),
     ));
-    
-    $this->System->RegisterCommandLine('config', array($this, 'Config'));
+
+    $this->System->RegisterCommandLine('config', 'Configures network services.', array($this, 'Config'));
     $this->System->Models['NetworkDevice']->RegisterOnChange('NetworkConfig', array($this, 'DoNetworkChange'));
     $this->System->Models['NetworkInterface']->RegisterOnChange('NetworkConfig', array($this, 'DoNetworkChange'));
   }
-  
-  function DoNetworkChange()
+
+  function DoNetworkChange(): void
   {
     $this->Database->query('UPDATE `NetworkConfiguration` SET `Changed`=1 WHERE '.
@@ -67 +67 @@
   }
 
-  function RegisterConfigItem($Name, $ClassName)
+  function RegisterConfigItem(string $Name, string $ClassName): void
   {
     $this->ConfigItems[$Name] = $ClassName;
   }
 
-  function UnregisterConfigItem($Name)
+  function UnregisterConfigItem(string $Name): void
   {
     unset($this->ConfigItems[$Name]);
   }
 
-  function Config($Parameters)
+  function Config(array $Parameters): void
   {
     $Output = '';
@@ -90 +90 @@
       } else $Output = 'Config item '.$ConfigItemName.' not found';
     } else $Output = 'Not enough parameters';
-    return $Output;
+    echo($Output);
+  }
+
+  static function Cast(AppModule $AppModule): ModuleNetworkConfig
+  {
+    if ($AppModule instanceof ModuleNetworkConfig)
+    {
+      return $AppModule;
+    }
+    throw new Exception('Expected ModuleNetworkConfig type but got '.gettype($AppModule));
   }
 }
@@ -96 +105 @@
 class NetworkConfigItem extends Model
 {
-  function Run()
+  function Run(): void
   {
-
   }
 }