chore(legacy): deprecate OC_Util::runningOnMac()

joshtrichards · joshtrichards · commit cc873ccaecf9 · 2025-12-02T21:52:58.000-05:00
- Easy enough query directly these days; Only used in one spot anyhow
- Updated the runningOnMac method to use PHP_OS_FAMILY just for clarity until we can remove the function entirely (same result; supported since PHP ~7.4).

Signed-off-by: Josh &lt;josh.t.richards@gmail.com&gt;
diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php
@@ -733,12 +733,16 @@ public static function obEnd() {
 	}
 
 	/**
-	 * Checks whether the server is running on Mac OS X
+	 * Checks whether PHP is running directly on macOS. 
+	 *
+	 * Note: In a Linux container, this will be false even on a macOS host 
+	 * (PHP just sees "Linux").
 	 *
 	 * @return bool true if running on Mac OS X, false otherwise
+	 * @deprecated 33.0.0 Query PHP_OS_FAMILY directly.
 	 */
 	public static function runningOnMac() {
-		return (strtoupper(substr(PHP_OS, 0, 6)) === 'DARWIN');
+		return (PHP_OS_FAMILY === 'Darwin');
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -733,12 +733,16 @@ public static function obEnd() {`
`733`	`733`	`}`
`734`	`734`
`735`	`735`	`/**`
`736`		`- * Checks whether the server is running on Mac OS X`
	`736`	`+ * Checks whether PHP is running directly on macOS.`
	`737`	`+ *`
	`738`	`+ * Note: In a Linux container, this will be false even on a macOS host`
	`739`	`+ * (PHP just sees "Linux").`
`737`	`740`	`*`
`738`	`741`	`* @return bool true if running on Mac OS X, false otherwise`
	`742`	`+ * @deprecated 33.0.0 Query PHP_OS_FAMILY directly.`
`739`	`743`	`*/`
`740`	`744`	`public static function runningOnMac() {`
`741`		`- return (strtoupper(substr(PHP_OS, 0, 6)) === 'DARWIN');`
	`745`	`+ return (PHP_OS_FAMILY === 'Darwin');`
`742`	`746`	`}`
`743`	`747`
`744`	`748`	`/**`