Changeset 888 for trunk/Modules/NetworkConfigRouterOS

Timestamp:

Nov 24, 2020, 10:58:56 AM (4 years ago)

Author:

chronos

Message:

• Modified: More static types added.

Location:

trunk/Modules/NetworkConfigRouterOS

Files:

• Routerboard.php (modified) (4 diffs)
• Routerboard2.php (modified) (2 diffs)
• RouterboardAPI.php (modified) (1 diff)
• SSH.php (modified) (2 diffs)

trunk/Modules/NetworkConfigRouterOS/Routerboard.php

@@ -3 +3 @@
 class Routerboard
 {
-  var $SSHPath = '/usr/bin/ssh';
-  var $Timeout = 3;
-  var $HostName;
-  var $UserName;
-  var $Password;
-  var $PrivateKey = '~/.ssh/id_rsa';
-  var $MaxBurstLineCount = 100;
-  var $Debug = false;
+  public string $SSHPath = '/usr/bin/ssh';
+  public int $Timeout = 3;
+  public string $HostName;
+  public string $UserName;
+  public string $Password;
+  public string $PrivateKey = '~/.ssh/id_rsa';
+  public int $MaxBurstLineCount = 100;
+  public bool $Debug = false;
 
   function __construct($HostName = 'localhost', $UserName = 'admin', $Password = '')
@@ -19 +19 @@
   }
 
-  function Execute(array $Commands): array
+  function Execute($Commands): array
   {
     $Output = array();
@@ -75 +75 @@
       if (count($ResultLineParts) > 1)
       {
-        if ($ResultLineParts[1]{0} == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
+        if ($ResultLineParts[1][0] == '"') $ResultLineParts[1] = substr($ResultLineParts[1], 1, -1); // Remove quotes
         $List[substr($ResultLineParts[0], 0, -1)] = $ResultLineParts[1];
       } else $List[substr($ResultLineParts[0], 0, -1)] = '';
@@ -116 +116 @@
   }
 
-  function ListGetPrint($Path, $Properties, $Conditions = array()): array
+  function ListGetPrint(array $Path, array $Properties, array $Conditions = array()): array
   {
     $ConditionList = '';

trunk/Modules/NetworkConfigRouterOS/Routerboard2.php

@@ -5 +5 @@
 class Routerboard extends SSH
 {
-  var $Methods = array(
+  public array $Methods = array(
     'kex' => 'diffie-hellman-group1-sha1',
     'client_to_server' => array('crypt' => '3des-cbc', 'comp' => 'none'),
@@ -11 +11 @@
   );
 
-  function Execute($Commands): array
+  function Execute(array $Commands): array
   {
     if (is_array($Commands)) $Commands = implode(';', $Commands);

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -3 +3 @@
 class RouterosAPI
 {
-  var $ErrorNo;           // Variable for storing connection error number, if any
-  var $ErrorStr;          // Variable for storing connection error text, if any
-  var $Attempts;       // Connection attempt count
-  var $Connected;  // Connection state
-  var $Delay;          // Delay between connection attempts in seconds
-  var $Port;        // Port to connect to
-  var $Timeout;        // Connection attempt timeout and data read timeout
-  var $Socket;             // Variable for storing socket resource
-  var $Debug;
-  var $SSL; // If SSL API connection is used. You need also change port to 8729
+  public int $ErrorNo;           // Variable for storing connection error number, if any
+  public string $ErrorStr;          // Variable for storing connection error text, if any
+  public int $Attempts;       // Connection attempt count
+  public bool $Connected;  // Connection state
+  public int $Delay;          // Delay between connection attempts in seconds
+  public int $Port;        // Port to connect to
+  public int $Timeout;        // Connection attempt timeout and data read timeout
+  public int $Socket;             // Variable for storing socket resource
+  public bool $Debug;
+  public bool $SSL; // If SSL API connection is used. You need also change port to 8729
 
   function __construct()

trunk/Modules/NetworkConfigRouterOS/SSH.php

@@ -3 +3 @@
 class SSH
 {
-  var $HostName;
-  var $UserName;
-  var $Password;
-  var $Methods;
+  public string $HostName;
+  public string $UserName;
+  public string $Password;
+  public array $Methods;
 
   function __construct($HostName = 'localhost', $UserName = 'admin', $Password = '')
@@ -13 +13 @@
     $this->UserName = $UserName;
     $this->Password = $Password;
+    $this->Methods = array();
   }
 
-  function Execute($Commands)
+  function Execute(array $Commands): array
   {
     echo($Commands);