From db9ba83001e2a2e6aa49e1e250d211c3f1e72fcf Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Mon, 6 Jan 2025 23:05:06 +0000
Subject: [PATCH] Make some assumptions about proc_open()

---
 src/utils/Git.php     |  2 +-
 src/utils/Process.php | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/utils/Git.php b/src/utils/Git.php
index 041d795a1..2b9e242bc 100644
--- a/src/utils/Git.php
+++ b/src/utils/Git.php
@@ -39,7 +39,7 @@ final class Git{
 	 * @param bool $dirty reference parameter, set to whether the repo has local changes
 	 */
 	public static function getRepositoryState(string $dir, bool &$dirty) : ?string{
-		if(Process::execute("git -C \"$dir\" rev-parse HEAD", $out) === 0 && $out !== false && strlen($out = trim($out)) === 40){
+		if(Process::execute("git -C \"$dir\" rev-parse HEAD", $out) === 0 && strlen($out = trim($out)) === 40){
 			if(Process::execute("git -C \"$dir\" diff --quiet") === 1 || Process::execute("git -C \"$dir\" diff --cached --quiet") === 1){ //Locally-modified
 				$dirty = true;
 			}
diff --git a/src/utils/Process.php b/src/utils/Process.php
index 1370ab27c..90149870a 100644
--- a/src/utils/Process.php
+++ b/src/utils/Process.php
@@ -174,8 +174,17 @@ final class Process{
 			return -1;
 		}
 
-		$stdout = stream_get_contents($pipes[1]);
-		$stderr = stream_get_contents($pipes[2]);
+		$out = stream_get_contents($pipes[1]);
+		if($out === false){
+			throw new AssumptionFailedError("Presume this can't happen for proc_open ... ???");
+		}
+		$stdout = $out;
+
+		$err = stream_get_contents($pipes[2]);
+		if($err === false){
+			throw new AssumptionFailedError("Presume this can't happen for proc_open ... ???");
+		}
+		$stderr = $err;
 
 		foreach($pipes as $p){
 			fclose($p);