[PHP] Replace substr(PHP_OS) calls with PHP_OS_FAMILY in PHP 7.2

Ayesh · Ayesh · commit 6e04c8e4ee88 · 2024-07-06T17:32:43.000+07:00
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
@@ -2257,11 +2257,11 @@ function get_temp_dir() {
  * @return bool Whether the path is writable.
  */
 function wp_is_writable( $path ) {
-	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) ) {
+	if ( PHP_OS_FAMILY === 'Windows' ) {
 		return win_is_writable( $path );
-	} else {
-		return @is_writable( $path );
 	}
+
+	return @is_writable( $path );
 }
 
 /**
diff --git a/tests/phpunit/tests/filesystem/wpFilesystemDirect/base.php b/tests/phpunit/tests/filesystem/wpFilesystemDirect/base.php
@@ -160,7 +160,7 @@ public function create_file_if_needed( $path, $contents = '' ) {
 	 * @return bool Whether the operating system is Windows.
 	 */
 	public static function is_windows() {
-		return 'WIN' === substr( PHP_OS, 0, 3 );
+		return 'Windows' === PHP_OS_FAMILY;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -2257,11 +2257,11 @@ function get_temp_dir() {`
`2257`	`2257`	`* @return bool Whether the path is writable.`
`2258`	`2258`	`*/`
`2259`	`2259`	`function wp_is_writable( $path ) {`
`2260`		`- if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) ) {`
	`2260`	`+ if ( PHP_OS_FAMILY === 'Windows' ) {`
`2261`	`2261`	`return win_is_writable( $path );`
`2262`		`- } else {`
`2263`		`- return @is_writable( $path );`
`2264`	`2262`	`}`
	`2263`	`+`
	`2264`	`+ return @is_writable( $path );`
`2265`	`2265`	`}`
`2266`	`2266`
`2267`	`2267`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public function create_file_if_needed( $path, $contents = '' ) {`
`160`	`160`	`* @return bool Whether the operating system is Windows.`
`161`	`161`	`*/`
`162`	`162`	`public static function is_windows() {`
`163`		`- return 'WIN' === substr( PHP_OS, 0, 3 );`
	`163`	`+ return 'Windows' === PHP_OS_FAMILY;`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`/**`