upgrade to php 8

avramovic · May 14, 2022 · 36a8a17 · 36a8a17
1 parent 8371365
commit 36a8a17
Show file tree

Hide file tree

Showing 10 changed files with 432 additions and 121 deletions.
diff --git a/Commands/BaseCommand.php b/Commands/BaseCommand.php
@@ -2,14 +2,14 @@
 
 use SSHConf\SSHConf;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\OutputInterface;
 
 abstract class BaseCommand extends Command
 {
     protected static $defaultName = null;
-    protected $sshConf;
-    /** @var  OutputInterface */
-    protected $output;
+    protected SSHConf $sshConf;
+    protected OutputInterface $output;
 
     public function __construct()
     {
@@ -42,4 +42,11 @@ public function setOutput(&$output)
     {
         $this->output = $output;
     }
+
+    public function runCommand(string $cmd, ?array $args = [])
+    {
+        $command = $this->getApplication()->find($cmd);
+
+        return $command->run(new ArrayInput($args), $this->output);
+    }
 }
diff --git a/Commands/EditHostCommand.php b/Commands/EditHostCommand.php
@@ -145,5 +145,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $output->writeln('');
         $this->info(sprintf('Successfully edited "%s" SSH connection.', $host));
+
+        return 0;
     }
 }
diff --git a/Commands/ListHostsCommand.php b/Commands/ListHostsCommand.php
@@ -20,7 +20,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $data = [];
 
         foreach ($this->sshConf->all() as $host => $conf) {
-            $data[] = [$host, $conf['hostname'] . ($conf['port'] ? ':'.$conf['port'] : ''), $conf['user'] ?? get_current_user()];
+            $data[] = [$host, $conf['hostname'] . (isset($conf['port']) ? ':'.$conf['port'] : ''), $conf['user'] ?? get_current_user()];
         }
 
         $table = new Table($output);
@@ -34,5 +34,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             ->setHeaderTitle('SSH connections')
             ->setFooterTitle('Total: '.count($this->sshConf->all()))
             ->render();
+
+        return 0;
     }
 }
diff --git a/Commands/RemoveHostCommand.php b/Commands/RemoveHostCommand.php
@@ -32,5 +32,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->sshConf->remove($host)->save();
 
         $this->info(sprintf('Successfully removed "%s" SSH connection.', $host));
+
+        return 0;
     }
 }
diff --git a/Commands/ViewHostCommand.php b/Commands/ViewHostCommand.php
@@ -46,5 +46,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             ->setHeaderTitle('SSH: '.$host)
             ->setFooterTitle('Total: '.count($data))
             ->render();
+
+        return 0;
     }
 }
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Small CLI utility to manage ssh config file on Linux/Mac
 ## Requirements
 
 * wget or cURL
-* PHP 7.1
+* PHP 8.0
 
 ## Installation
 

diff --git a/SSHConf/SSHConf.php b/SSHConf/SSHConf.php
@@ -2,13 +2,8 @@
 
 class SSHConf
 {
-
-
-    /**
-     * @var null
-     */
-    protected $sshConfFile;
-    public $sshConf = [];
+    protected string $sshConfFile;
+    protected array $sshConf = [];
 
     public function __construct($sshConfFile = null)
     {
@@ -94,6 +89,11 @@ public function all()
         return $this->sshConf;
     }
 
+    public function count()
+    {
+        return count($this->sshConf);
+    }
+
     public function dump()
     {
         $text = '';

diff --git a/composer.json b/composer.json
@@ -10,7 +10,8 @@
         }
     ],
     "require": {
-        "symfony/console": "^4.3"
+        "symfony/console": "^6",
+        "symfony/process": "^6.0"
     },
     "autoload": {
         "psr-4": {