EvilFreelancer / routeros-api-php

src/Helpers/BinaryStringHelper.php

Spacing +2 added lines, -2 removed lines

@@ -43,14 +43,14 @@
             if (($value & $mask) || $buffer !== '') {
                 // Get the current byte by shifting it to least significant position and add it to the string
                 // 0xFF12345678 => 0xFF
-                $byte   = $value >> (8 * $i);
+                $byte = $value >> (8 * $i);
                 $buffer .= chr($byte);
 
                 // Set the most significant byte to 0 so we can restart the process being shure
                 // that the value is left padded with 0
                 // 0xFF12345678 => 0x12345678
                 // -1 = 0xFFFFF.... (number of F depend of PHP_INT_SIZE )
-                $mask  = -1 >> ((PHP_INT_SIZE - $i) * 8);
+                $mask = -1 >> ((PHP_INT_SIZE - $i) * 8);
                 $value &= $mask;
             }
         }

src/Query.php

Spacing +3 added lines, -3 removed lines

@@ -46,9 +46,9 @@
      * List of available operators for "->where()" method
      */
     public const AVAILABLE_OPERATORS = [
-        '-',  // Does not have
-        '=',  // Equal
-        '>',  // More than
+        '-', // Does not have
+        '=', // Equal
+        '>', // More than
         '<'   // Less than
     ];
 

src/Streams/ResourceStream.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         $result = fread($this->stream, $length);
 
         // Stream in blocking mode timed out
-        if(socket_get_status($this->stream)['timed_out']){
+        if (socket_get_status($this->stream)['timed_out']) {
             throw new StreamException('Stream timed out');
         }
 

src/SocketTrait.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         }
 
         // Set blocking mode on a stream
-        if ($this->config('socket_blocking') === true){
+        if ($this->config('socket_blocking') === true) {
             stream_set_blocking($socketClient, true);
         }
 

src/Config.php

Spacing +6 added lines, -6 removed lines

@@ -126,22 +126,22 @@
      * List of allowed parameters of config
      */
     public const ALLOWED = [
-        'host'            => 'string',  // Address of Mikrotik RouterOS
-        'user'            => 'string',  // Username
-        'pass'            => 'string',  // Password
+        'host'            => 'string', // Address of Mikrotik RouterOS
+        'user'            => 'string', // Username
+        'pass'            => 'string', // Password
         'port'            => 'integer', // RouterOS API port number for access (if not set use default or default with SSL if SSL enabled)
         'ssl'             => 'boolean', // Enable ssl support (if port is not set this parameter must change default port to ssl port)
-        'ssl_options'     => 'array',   // List of SSL options, eg.
+        'ssl_options'     => 'array', // List of SSL options, eg.
         'legacy'          => 'boolean', // Support of legacy login scheme (true - pre 6.43, false - post 6.43)
         'timeout'         => 'integer', // Max timeout for instantiating connection with RouterOS
         'socket_timeout'  => 'integer', // Max timeout for read from RouterOS
         'socket_blocking' => 'boolean', // Set blocking mode on a socket stream
-        'socket_options'  => 'array',   // List of socket context options
+        'socket_options'  => 'array', // List of socket context options
         'attempts'        => 'integer', // Count of attempts to establish TCP session
         'delay'           => 'integer', // Delay between attempts in seconds
         'ssh_port'        => 'integer', // Number of SSH port
         'ssh_timeout'     => 'integer', // Max timeout for read from RouterOS via SSH proto (for "/export" command)
-        'ssh_private_key' => 'string',  // Max timeout for read from RouterOS via SSH proto (for "/export" command)
+        'ssh_private_key' => 'string', // Max timeout for read from RouterOS via SSH proto (for "/export" command)
     ];
 
     /**

configs/routeros-api.php

Spacing +13 added lines, -13 removed lines

@@ -15,9 +15,9 @@ 
      */
 
     'host' => env('ROUTEROS_HOST', '192.168.88.1'), // Address of Mikrotik RouterOS
-    'user' => env('ROUTEROS_USER', 'admin'),        // Username
-    'pass' => env('ROUTEROS_PASS'),                 // Password
-    'port' => (int) env('ROUTEROS_PORT', 8728),     // RouterOS API port number for access (if not set use default or default with SSL if SSL enabled)
+    'user' => env('ROUTEROS_USER', 'admin'), // Username
+    'pass' => env('ROUTEROS_PASS'), // Password
+    'port' => (int) env('ROUTEROS_PORT', 8728), // RouterOS API port number for access (if not set use default or default with SSL if SSL enabled)
 
     /*
      |--------------------------------------------------------------------------
@@ -30,11 +30,11 @@ 
      |
      */
 
-    'attempts'        => (int) env('ROUTEROS_ATTEMPTS', 10),                                      // Count of attempts to establish TCP session
-    'delay'           => (int) env('ROUTEROS_DELAY', 1),                                          // Delay between attempts in seconds
-    'timeout'         => (int) env('ROUTEROS_TIMEOUT', 10),                                       // Max timeout for instantiating connection with RouterOS
-    'socket_timeout'  => (int) env('ROUTEROS_SOCKET_TIMEOUT', env('ROUTEROS_TIMEOUT', 30)),       // Max timeout for read from RouterOS
-    'socket_blocking' => (bool) env('ROUTEROS_SOCKET_BLOCKING', true),                            // Set blocking mode on a socket stream
+    'attempts'        => (int) env('ROUTEROS_ATTEMPTS', 10), // Count of attempts to establish TCP session
+    'delay'           => (int) env('ROUTEROS_DELAY', 1), // Delay between attempts in seconds
+    'timeout'         => (int) env('ROUTEROS_TIMEOUT', 10), // Max timeout for instantiating connection with RouterOS
+    'socket_timeout'  => (int) env('ROUTEROS_SOCKET_TIMEOUT', env('ROUTEROS_TIMEOUT', 30)), // Max timeout for read from RouterOS
+    'socket_blocking' => (bool) env('ROUTEROS_SOCKET_BLOCKING', true), // Set blocking mode on a socket stream
 
     // @see https://www.php.net/manual/en/context.socket.php
     'socket_options'  => [
@@ -65,9 +65,9 @@ 
 
     // @see https://www.php.net/manual/en/context.ssl.php
     'ssl_options' => [
-        'ciphers'           => env('ROUTEROS_SSL_CIPHERS', 'ADH:ALL'),              // ADH:ALL, ADH:ALL@SECLEVEL=0, ADH:ALL@SECLEVEL=1 ... ADH:ALL@SECLEVEL=5
-        'verify_peer'       => (bool) env('ROUTEROS_SSL_VERIFY_PEER', false),       // Require verification of SSL certificate used.
-        'verify_peer_name'  => (bool) env('ROUTEROS_SSL_VERIFY_PEER_NAME', false),  // Require verification of peer name.
+        'ciphers'           => env('ROUTEROS_SSL_CIPHERS', 'ADH:ALL'), // ADH:ALL, ADH:ALL@SECLEVEL=0, ADH:ALL@SECLEVEL=1 ... ADH:ALL@SECLEVEL=5
+        'verify_peer'       => (bool) env('ROUTEROS_SSL_VERIFY_PEER', false), // Require verification of SSL certificate used.
+        'verify_peer_name'  => (bool) env('ROUTEROS_SSL_VERIFY_PEER_NAME', false), // Require verification of peer name.
         'allow_self_signed' => (bool) env('ROUTEROS_SSL_ALLOW_SELF_SIGNED', false), // Allow self-signed certificates. Requires verify_peer=true.
     ],
 
@@ -81,9 +81,9 @@ 
      |
      */
 
-    'ssh_port'        => (int) env('ROUTEROS_SSH_PORT', 22),                             // Number of SSH port
+    'ssh_port'        => (int) env('ROUTEROS_SSH_PORT', 22), // Number of SSH port
     'ssh_timeout'     => (int) env('ROUTEROS_SSH_TIMEOUT', env('ROUTEROS_TIMEOUT', 30)), // Max timeout for read from RouterOS via SSH proto (for "/export" command)
-    'ssh_private_key' => env('ROUTEROS_SSH_PRIVKEY', '~/.ssh/id_rsa.pub'),               // Full path to required private key
+    'ssh_private_key' => env('ROUTEROS_SSH_PRIVKEY', '~/.ssh/id_rsa.pub'), // Full path to required private key
 
     /*
      |--------------------------------------------------------------------------

src/Client.php

Spacing +2 added lines, -2 removed lines

@@ -252,7 +252,7 @@ 
         }
 
         // Read answer from socket in loop, or until timeout reached
-        $startTime  = time();
+        $startTime = time();
         while (true) {
             // Exit from loop if timeout reached
             if (time() > $startTime + $this->config('socket_timeout')) {
@@ -374,7 +374,7 @@ 
                 }
 
                 // Save as result
-                if(null != $this->parseResponse($item)) $result[] = $this->parseResponse($item)[0];
+                if (null != $this->parseResponse($item)) $result[] = $this->parseResponse($item)[0];
             }
 
         } else {

Braces +3 added lines, -1 removed lines

@@ -374,7 +374,9 @@
                 }
 
                 // Save as result
-                if(null != $this->parseResponse($item)) $result[] = $this->parseResponse($item)[0];
+                if(null != $this->parseResponse($item)) {
+                    $result[] = $this->parseResponse($item)[0];
+                }
             }
 
         } else {