degagne / libssh2

lib/Builder.php

Indentation +26 added lines, -26 removed lines

@@ -11,21 +11,21 @@ 
 class Builder
 {
 
-	/**
+    /**
      * Command prefix.
      *
      * @var string
      */
-	public $prefix;
+    public $prefix;
 	
-	/**
+    /**
      * Command options.
      *
      * @var string
      */
     public $options;
 	
-	/**
+    /**
      * Command arguments.
      *
      * @var string
@@ -67,16 +67,16 @@ 
     {
         $options = [];
         foreach ($opts as $key => $value)
-		{
-			if (preg_match('/^-.*$/', $key, $matches))
-			{
-				$options[] = is_bool($value) ? $key : str_pad($key, strlen($key) + 1, ' ', STR_PAD_RIGHT) . $value;
-			}
-			if (preg_match('/^-.*$/', $value, $matches))
-			{
-				$options[] = $value;
-			}
-		}
+        {
+            if (preg_match('/^-.*$/', $key, $matches))
+            {
+                $options[] = is_bool($value) ? $key : str_pad($key, strlen($key) + 1, ' ', STR_PAD_RIGHT) . $value;
+            }
+            if (preg_match('/^-.*$/', $value, $matches))
+            {
+                $options[] = $value;
+            }
+        }
         $this->options = implode(' ', array_filter($options, 'strlen'));
         return $this;
     }
@@ -89,19 +89,19 @@ 
      */
     final public function setArguments(array $args)
     {
-		$arguments = [];
+        $arguments = [];
         foreach ($args as $key => $value)
-		{
-			if (preg_match('/^-.*$/', $key, $matches))
-			{
-				$arguments[] = is_bool($value) ? $key : str_pad($key, strlen($key) + 1, ' ', STR_PAD_RIGHT) . $value;
-			}
-			else
-			{
-				$arguments[] = is_array($value) ? implode(' ', $value) : $value;
-			}
-		}
-		$this->arguments = implode(' ', array_filter($arguments, 'strlen'));
+        {
+            if (preg_match('/^-.*$/', $key, $matches))
+            {
+                $arguments[] = is_bool($value) ? $key : str_pad($key, strlen($key) + 1, ' ', STR_PAD_RIGHT) . $value;
+            }
+            else
+            {
+                $arguments[] = is_array($value) ? implode(' ', $value) : $value;
+            }
+        }
+        $this->arguments = implode(' ', array_filter($arguments, 'strlen'));
         return $this;
     }
 }

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 		{
 			if (preg_match('/^-.*$/', $key, $matches))
 			{
-				$options[] = is_bool($value) ? $key : str_pad($key, strlen($key) + 1, ' ', STR_PAD_RIGHT) . $value;
+				$options[] = is_bool($value) ? $key : str_pad($key, strlen($key) + 1, ' ', STR_PAD_RIGHT).$value;
 			}
 			if (preg_match('/^-.*$/', $value, $matches))
 			{
@@ -94,7 +94,7 @@ 
 		{
 			if (preg_match('/^-.*$/', $key, $matches))
 			{
-				$arguments[] = is_bool($value) ? $key : str_pad($key, strlen($key) + 1, ' ', STR_PAD_RIGHT) . $value;
+				$arguments[] = is_bool($value) ? $key : str_pad($key, strlen($key) + 1, ' ', STR_PAD_RIGHT).$value;
 			}
 			else
 			{

Braces +1 added lines, -2 removed lines

@@ -95,8 +95,7 @@
 			if (preg_match('/^-.*$/', $key, $matches))
 			{
 				$arguments[] = is_bool($value) ? $key : str_pad($key, strlen($key) + 1, ' ', STR_PAD_RIGHT) . $value;
-			}
-			else
+			} else
 			{
 				$arguments[] = is_array($value) ? implode(' ', $value) : $value;
 			}

lib/Kerberos.php

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
             ->write("export KRB5CCNAME=`mktemp /tmp/krb5cc_{$username}_XXXXXXXXXXXXX`;")
             ->write($command)
             ->write($this->configuration->get_password())
-            ->write('echo KRB5CCNAME:$KRB5CCNAME', TRUE)
+            ->write('echo KRB5CCNAME:$KRB5CCNAME', true)
             ->output();
 
         if (!preg_match("/KRB5CCNAME:(\/tmp\/krb5cc_.*)/", $shell->get_output(), $matches))
@@ -78,7 +78,7 @@ 
      * @param  array  $arguments klist command line arguments
      * @return int    return code (exit status code)
      */
-    final public function kdestroy(array $options = [], array $arguments = [], $strict = TRUE)
+    final public function kdestroy(array $options = [], array $arguments = [], $strict = true)
     {
         $command = (new Builder())
             ->setPrefix('kdestroy')
@@ -96,7 +96,7 @@ 
      * @param  array  $arguments klist command line arguments
      * @return string klist results
      */
-    final public function klist(array $options = [], array $arguments = [], $strict = TRUE)
+    final public function klist(array $options = [], array $arguments = [], $strict = true)
     {
         $command = (new Builder())
             ->setPrefix('klist')
@@ -117,7 +117,7 @@ 
      * @param  array  $arguments kinit command line arguments
      * @return int    exit status code
      */
-    final public function kinit(array $options = [], array $arguments = [], $strict = TRUE)
+    final public function kinit(array $options = [], array $arguments = [], $strict = true)
     {
         $command = (new Builder())
             ->setPrefix('kinit')

lib/Sessions/Shell.php

Spacing +3 added lines, -3 removed lines

@@ -93,12 +93,12 @@
      */
     final public function write($command, $returncode = FALSE)
     {
-        $command = ($returncode == FALSE) ? $command : $command . '; echo "RETURN_CODE:[$?]";';
+        $command = ($returncode == FALSE) ? $command : $command.'; echo "RETURN_CODE:[$?]";';
         $write_count = 0;
-        $string_len = strlen($command . PHP_EOL);
+        $string_len = strlen($command.PHP_EOL);
         while ($write_count < $string_len)
         {
-            $fwrite_count = fwrite($this->stream, substr($command . PHP_EOL, $write_count), 1024);
+            $fwrite_count = fwrite($this->stream, substr($command.PHP_EOL, $write_count), 1024);
             if ($fwrite_count === FALSE)
             {
                 throw new \RuntimeException('failed to write command to stream');

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
      */
     final public function shell()
     {
-        if (($this->stream = @ssh2_shell($this->connection)) === FALSE)
+        if (($this->stream = @ssh2_shell($this->connection)) === false)
         {
             throw new \RuntimeException($this->get_error_message());
         }
@@ -91,15 +91,15 @@ 
      * @param  instance $terminal Terminal instance
      * @return object
      */
-    final public function write($command, $returncode = FALSE)
+    final public function write($command, $returncode = false)
     {
-        $command = ($returncode == FALSE) ? $command : $command . '; echo "RETURN_CODE:[$?]";';
+        $command = ($returncode == false) ? $command : $command . '; echo "RETURN_CODE:[$?]";';
         $write_count = 0;
         $string_len = strlen($command . PHP_EOL);
         while ($write_count < $string_len)
         {
             $fwrite_count = fwrite($this->stream, substr($command . PHP_EOL, $write_count), 1024);
-            if ($fwrite_count === FALSE)
+            if ($fwrite_count === false)
             {
                 throw new \RuntimeException('failed to write command to stream');
             }

lib/Sessions/SFTP.php

Spacing +15 added lines, -15 removed lines

@@ -51,7 +51,7 @@ 
     {
         if ($this->is_file($srcfile) === FALSE)
         {
-            $this->set_error('Local file ' . $srcfile . ' does not exist.');
+            $this->set_error('Local file '.$srcfile.' does not exist.');
             $this->set_exitstatus(1);
             return;
         }
@@ -62,7 +62,7 @@ 
             $this->set_exitstatus(1);
             return;
         }
-        $this->set_output('Successfully copied file at: ' . $srcfile . ' to ' . $destfile);
+        $this->set_output('Successfully copied file at: '.$srcfile.' to '.$destfile);
         $this->set_exitstatus(0);
     }
 
@@ -91,7 +91,7 @@ 
                 continue;
             }
         }
-        $this->set_output('Successfully deleted remote file(s) at: ' . implode(', ', $files));
+        $this->set_output('Successfully deleted remote file(s) at: '.implode(', ', $files));
         $this->set_exitstatus(0);
     }
 
@@ -132,7 +132,7 @@ 
             {
                 if ($file != '.' && $file != '..')
                 {
-                    $filename = rtrim($path, '/') . '/' . $file;
+                    $filename = rtrim($path, '/').'/'.$file;
                     if ($this->is_dir($filename))
                     {
                         $files['directories'][] = $filename;
@@ -169,7 +169,7 @@ 
         $handle = opendir($this->sftp_url($directory));
         while (($file = readdir($handle)) !== FALSE)
         {
-            $files[] = preg_grep('/(^.*' . $pattern . '.*$)/', explode(PHP_EOL, $file));
+            $files[] = preg_grep('/(^.*'.$pattern.'.*$)/', explode(PHP_EOL, $file));
         }
 
         if (empty($files))
@@ -185,7 +185,7 @@ 
         $_files = [];
         foreach ($files as $file)
         {
-            $_files[] = rtrim($directory, '/') . '/' . $file;
+            $_files[] = rtrim($directory, '/').'/'.$file;
         }
         $this->set_output($_files);
         $this->set_exitstatus(0);
@@ -212,7 +212,7 @@ 
                 return;
             }
         }
-        $this->set_output('Successfully created remote directory(ies) at: ' . implode(', ', $directories));
+        $this->set_output('Successfully created remote directory(ies) at: '.implode(', ', $directories));
         $this->set_exitstatus(0);
     }
 
@@ -227,7 +227,7 @@ 
     {
         if ($this->is_file($oldfile) === FALSE)
         {
-            $this->set_error('Local file ' . $oldfile . ' does not exist.');
+            $this->set_error('Local file '.$oldfile.' does not exist.');
             $this->set_exitstatus(1);
             return;
         }
@@ -238,7 +238,7 @@ 
             $this->set_exitstatus(1);
             return;
         }
-        $this->set_output('Successfully renamed remote file at: ' . $oldfile . ' to ' . $newfile);
+        $this->set_output('Successfully renamed remote file at: '.$oldfile.' to '.$newfile);
         $this->set_exitstatus(0);
     }
 
@@ -281,7 +281,7 @@ 
                 }
             }
         }
-        $this->set_output('Successfully removed remote directory(ies) at: ' . implode(', ', $directories));
+        $this->set_output('Successfully removed remote directory(ies) at: '.implode(', ', $directories));
         $this->set_exitstatus(0);
     }
 
@@ -298,14 +298,14 @@ 
         $local_files = !is_array($local_files) ? [$local_files] : $local_files;
         foreach ($local_files as $local_file)
         {
-            if (!@ssh2_scp_send($this->connection, $local_file, rtrim($remote_dir, '/') . '/' . basename($local_file), $mode))
+            if (!@ssh2_scp_send($this->connection, $local_file, rtrim($remote_dir, '/').'/'.basename($local_file), $mode))
             {
                 $this->set_error($this->get_error_message());
                 $this->set_exitstatus(1);
                 return;
             }
         }
-        $this->set_output('Successfully sent local files to remote host at: ' . implode(', ', $local_files));
+        $this->set_output('Successfully sent local files to remote host at: '.implode(', ', $local_files));
         $this->set_exitstatus(0);
     }
 
@@ -321,14 +321,14 @@ 
         $remote_files = !is_array($remote_files) ? [$remote_files] : $remote_files;
         foreach ($remote_files as $remote_file)
         {
-            if (!@ssh2_scp_recv($this->connection, $remote_file, rtrim($local_dir, '/') . '/' . basename($remote_file)))
+            if (!@ssh2_scp_recv($this->connection, $remote_file, rtrim($local_dir, '/').'/'.basename($remote_file)))
             {
                 $this->set_error($this->get_error_message());
                 $this->set_exitstatus(1);
                 return;
             }
         }
-        $this->set_output('Successfully received remote files: ' . implode(', ', $remote_files));
+        $this->set_output('Successfully received remote files: '.implode(', ', $remote_files));
         $this->set_exitstatus(0);
     }
 
@@ -369,7 +369,7 @@ 
      */
     final private function sftp_url($path = '')
     {
-        return 'ssh2.sftp://' . $this->sftp . $path;
+        return 'ssh2.sftp://'.$this->sftp.$path;
     }
 	
 }

Upper-Lower-Casing +12 added lines, -12 removed lines

@@ -49,14 +49,14 @@ 
      */
     final public function copy($srcfile, $destfile)
     {
-        if ($this->is_file($srcfile) === FALSE)
+        if ($this->is_file($srcfile) === false)
         {
             $this->set_error('Local file ' . $srcfile . ' does not exist.');
             $this->set_exitstatus(1);
             return;
         }
 
-        if (@copy($this->sftp_url($srcfile), $this->sftp_url($destfile)) === FALSE)
+        if (@copy($this->sftp_url($srcfile), $this->sftp_url($destfile)) === false)
         {
             $this->set_error($this->get_error_message());
             $this->set_exitstatus(1);
@@ -82,7 +82,7 @@ 
         {
             if ($this->is_file($file))
             {
-                if (@unlink($this->sftp_url($file)) === FALSE)
+                if (@unlink($this->sftp_url($file)) === false)
                 {
                     $this->set_error($this->get_error_message());
                     $this->set_exitstatus(1);
@@ -128,7 +128,7 @@ 
         $files = [];
         if ($handle = @opendir($this->sftp_url($path)))
         {
-            while (($file = @readdir($handle)) !== FALSE)
+            while (($file = @readdir($handle)) !== false)
             {
                 if ($file != '.' && $file != '..')
                 {
@@ -138,7 +138,7 @@ 
                         $files['directories'][] = $filename;
                     }
 					
-                    if ($this->is_dir($filename) === FALSE)
+                    if ($this->is_dir($filename) === false)
                     {
                         $files['files'][] = $filename;
                     }
@@ -159,7 +159,7 @@ 
      */
     final public function glob($directory, $pattern = '')
     {
-        if ($this->is_dir($directory) == FALSE)
+        if ($this->is_dir($directory) == false)
         {
             $this->set_error($this->get_error_message());
             $this->set_exitstatus(1);
@@ -167,7 +167,7 @@ 
         }
 		
         $handle = opendir($this->sftp_url($directory));
-        while (($file = readdir($handle)) !== FALSE)
+        while (($file = readdir($handle)) !== false)
         {
             $files[] = preg_grep('/(^.*' . $pattern . '.*$)/', explode(PHP_EOL, $file));
         }
@@ -200,12 +200,12 @@ 
      * @param  int    $chgrp       change gid for directory
      * @return bool
      */
-    final public function mkdir($directories, $mode = 0777, $recursive = FALSE)
+    final public function mkdir($directories, $mode = 0777, $recursive = false)
     {
         $directories = !is_array($directories) ? [$directories] : $directories;
         foreach ($directories as $directory)
         {
-            if (@mkdir($this->sftp_url($directory), $mode, $recursive) === FALSE)
+            if (@mkdir($this->sftp_url($directory), $mode, $recursive) === false)
             {
                 $this->set_error($this->get_error_message());
                 $this->set_exitstatus(1);
@@ -225,7 +225,7 @@ 
      */
     final public function rename($oldfile, $newfile)
     {
-        if ($this->is_file($oldfile) === FALSE)
+        if ($this->is_file($oldfile) === false)
         {
             $this->set_error('Local file ' . $oldfile . ' does not exist.');
             $this->set_exitstatus(1);
@@ -265,7 +265,7 @@ 
                 $files = array_key_exists('files', $stdout) ? $stdout['files'] : [];
                 if (count($files) == 0)
                 {
-                    if (@rmdir($this->sftp_url($directory)) === FALSE)
+                    if (@rmdir($this->sftp_url($directory)) === false)
                     {
                         $this->set_error($this->get_error_message());
                         $this->set_exitstatus(1);
@@ -342,7 +342,7 @@ 
     {
         $statinfo = ssh2_sftp_stat($this->sftp, $path);
 
-        if ($statinfo === FALSE)	
+        if ($statinfo === false)	
         {
             $this->set_error($this->get_error_message());
             $this->set_exitstatus(0);

lib/Sessions/SSH.php

Spacing +2 added lines, -2 removed lines

@@ -139,7 +139,7 @@ 
                 break;
 
             default:
-                throw new \RuntimeException('Unknown output mode type: ' . $this->get_mode());
+                throw new \RuntimeException('Unknown output mode type: '.$this->get_mode());
         }
     }
 
@@ -154,7 +154,7 @@ 
     {
         if (!is_resource($this->connection))
         {
-            throw new \RuntimeException(__FUNCTION__ . ': not a valid SSH2 Session resource.');
+            throw new \RuntimeException(__FUNCTION__.': not a valid SSH2 Session resource.');
         }
 
         $command .= '; echo "RETURN_CODE:[$?]"';

Upper-Lower-Casing +8 added lines, -8 removed lines

@@ -42,14 +42,14 @@ 
      *
      * @var string
      */
-    public $mode = NULL;
+    public $mode = null;
 
     /**
      * Filename path.
      *
      * @var string
      */
-    public $filename = NULL;
+    public $filename = null;
 
     /**
      * Constructor.
@@ -92,7 +92,7 @@ 
      */
     final public function get_mode()
     {
-        return ($this->mode === NULL) ? self::WAIT : $this->mode;
+        return ($this->mode === null) ? self::WAIT : $this->mode;
     }
 
     /**
@@ -112,7 +112,7 @@ 
      * @param  instance $terminal Terminal instance
      * @return void
      */
-    final public function exec($command, Terminal $terminal = NULL)
+    final public function exec($command, Terminal $terminal = null)
     {
         if (!$terminal instanceof Terminal)
         {
@@ -167,11 +167,11 @@ 
             $terminal->get_height()
         );
         
-        if ($stream === FALSE)
+        if ($stream === false)
         {
             throw new \RuntimeException($this->get_error_message());
         }
-        stream_set_blocking($stream, TRUE);
+        stream_set_blocking($stream, true);
         return $stream;
     }
 
@@ -191,7 +191,7 @@ 
         do
         {
             sleep(1);
-            if ($out === FALSE || $err === FALSE)
+            if ($out === false || $err === false)
             {
                 $stderr .= 'STDOUT and/or STDERR stream(s) closed unexpectedly.';
                 return 1;
@@ -237,7 +237,7 @@ 
      */
     final private function exec_file($stream)
     {
-        if ($this->get_filename() === NULL)
+        if ($this->get_filename() === null)
         {
             throw new \RuntimeException('A valid filename path must be provided.');
         }

lib/Authentication/Hostbased.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
             $this->privkeyfile,
             $this->passphrase,
             $this->local_username
-        ) === FALSE)
+        ) === false)
         {
             throw new \RuntimeException('Hostbased file authentication failed.');
         }

lib/Configuration.php

Upper-Lower-Casing +19 added lines, -19 removed lines

@@ -16,42 +16,42 @@ 
      *
      * @var string
      */
-    protected $username = NULL;
+    protected $username = null;
 	
     /**
      * User password.
      *
      * @var string
      */
-    protected $password = NULL;
+    protected $password = null;
 
     /**
      * RSA public key.
      *
      * @var string
      */
-    protected $publickey = NULL;
+    protected $publickey = null;
 	
     /**
      * RSA private key.
      *
      * @var string
      */
-    protected $privatekey = NULL;
+    protected $privatekey = null;
 	
     /**
      * Passphrase.
      *
      * @var string
      */
-    protected $passphrase = NULL;
+    protected $passphrase = null;
 
     /**
      * Hostname.
      *
      * @var string
      */
-    protected $host = NULL;
+    protected $host = null;
 
     /**
      * Port.
@@ -72,14 +72,14 @@ 
      *
      * @var boolean
      */
-    protected $tunnel = FALSE;
+    protected $tunnel = false;
 
     /**
      * SSH tunnel hostname.
      *
      * @var string
      */
-    protected $tunnel_host = NULL;
+    protected $tunnel_host = null;
     
     /**
      * SSH tunnel port.
@@ -178,9 +178,9 @@ 
      * @param  array  $methods remote connection methods
      * @return object \LibSSH2\Configuration object
      */
-    final public function set_methods(array $methods = NULL)
+    final public function set_methods(array $methods = null)
     {
-        if ($methods !== NULL)
+        if ($methods !== null)
         {
             $this->methods = $methods;
         }
@@ -194,7 +194,7 @@ 
      */
     final public function set_tunnel()
     {
-        $this->tunnel = TRUE;
+        $this->tunnel = true;
         return $this;
     }
 
@@ -230,7 +230,7 @@ 
      */
     final public function get_username()
     {
-        if ($this->username === NULL)
+        if ($this->username === null)
         {
             throw new \RuntimeException('A username is required to authenticate to the remote server.');
         }
@@ -244,7 +244,7 @@ 
      */
     final public function get_password()
     {
-        if ($this->password === NULL)
+        if ($this->password === null)
         {
             throw new \RuntimeException('Password is not currently set.');
         }
@@ -258,7 +258,7 @@ 
      */
     final public function get_publickey()
     {
-        if ($this->publickey === NULL)
+        if ($this->publickey === null)
         {
             throw new \RuntimeException('No RSA public key found.');
         }
@@ -272,7 +272,7 @@ 
      */
     final public function get_privatekey()
     {
-        if ($this->privatekey === NULL)
+        if ($this->privatekey === null)
         {
             throw new \RuntimeException('No RSA private key found.');
         }
@@ -286,7 +286,7 @@ 
      */
     final public function get_passphrase()
     {
-        return ($this->passphrase === NULL) ? '' : $this->passphrase;
+        return ($this->passphrase === null) ? '' : $this->passphrase;
     }
 
     /**
@@ -296,7 +296,7 @@ 
      */
     final public function get_host()
     {
-        if ($this->host === NULL)
+        if ($this->host === null)
         {
             throw new \RuntimeException('Unable to create remote connection; no hostname was set.');
         }
@@ -320,7 +320,7 @@ 
      */
     final public function get_methods()
     {
-        if ($this->methods !== NULL || !empty($this->methods))
+        if ($this->methods !== null || !empty($this->methods))
         {
             return $this->methods;
         }
@@ -343,7 +343,7 @@ 
      */
     final public function get_tunnel_host()
     {
-        if ($this->tunnel_host === NULL)
+        if ($this->tunnel_host === null)
         {
             throw new \RuntimeException('A valid hostname must be set prior to attempting a tunnel connection.');
         }

lib/Connection.php

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function __construct(Configuration $configuration, Authentication $authentication)
     {
-        if (extension_loaded('ssh2') == FALSE)
+        if (extension_loaded('ssh2') == false)
         {
             throw new \RuntimeException('The libssh2 extension is not loaded.');
         }
@@ -62,7 +62,7 @@ 
     final public function connect(Configuration $configuration)
     {
         $this->connection = @ssh2_connect($configuration->get_host(), $configuration->get_port(), $configuration->get_methods());
-        if ($this->connection === FALSE || !is_resource($this->connection))
+        if ($this->connection === false || !is_resource($this->connection))
         {
             throw new \RuntimeException($this->get_error_message());
         }
@@ -78,7 +78,7 @@ 
     final public function tunnel(Configuration $configuration)
     {
         $tunnel = @ssh2_tunnel($this->connection, $configuration->get_tunnel_host(), $configuration->get_tunnel_port());
-        if ($tunnel === FALSE)
+        if ($tunnel === false)
         {
             throw new \RuntimeException($this->get_error_message());
         }