From 35830b48a4cfdd51eadc288883465f847294fc54 Mon Sep 17 00:00:00 2001
From: Stephan Huber <stephan@factorial.io>
Date: Tue, 23 Aug 2022 11:00:20 +0200
Subject: [PATCH] fix: Fix edge-cases where 1password cli is not installed

---
 src/Utilities/PasswordManager.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Utilities/PasswordManager.php b/src/Utilities/PasswordManager.php
index de14b434..2f0155a2 100644
--- a/src/Utilities/PasswordManager.php
+++ b/src/Utilities/PasswordManager.php
@@ -264,7 +264,7 @@ private function get1PasswordCliFilePath()
     {
         $op_file_path = getenv('PHAB_OP_FILE_PATH') ?: '/usr/local/bin/op';
         if (!$op_file_path || !file_exists($op_file_path)) {
-            return new CommandResult(1, ['Could not find 1password binary.']);
+            return false;
         }
         return $op_file_path;
     }
@@ -275,6 +275,9 @@ private function get1PasswordCliVersion()
         static $op_version = false;
         if (!$op_version) {
             $op_file_path = $this->get1PasswordCliFilePath();
+            if (!$op_file_path) {
+                return false;
+            }
             $output = [];
             $result_code = 0;
             $result = exec(sprintf("%s --version", $op_file_path), $output, $result_code);
@@ -293,6 +296,9 @@ private function get1PasswordCliVersion()
     private function exec1PasswordCli($cmd_v1, $cmd_v2)
     {
         $op_file_path = $this->get1PasswordCliFilePath();
+        if (!$op_file_path) {
+            return new CommandResult(1, ['Could not find 1password binary.']);
+        }
         $output = [];
         $result_code = 0;