Allow for temp folder to be prefixed with /private (#68)

schlessera · web-flow · commit 8a004e9a4ac9 · 2019-06-13T17:01:38.000+02:00
Allow for temp folder to be prefixed with `/private`
diff --git a/features/steps/given.php b/features/steps/given.php
@@ -24,7 +24,8 @@ function ( $world, $empty_or_nonexistent, $dir ) {
 
 		$temp_dir = sys_get_temp_dir();
 
-		if ( 0 !== strpos( $dir, $temp_dir ) ) {
+		// Also check for temp dir prefixed with `/private` for Mac OS X.
+		if ( 0 !== strpos( $dir, $temp_dir ) && 0 !== strpos( $dir, "/private{$temp_dir}" ) ) {
 			throw new RuntimeException( sprintf( "Attempted to delete directory '%s' that is not in the temp directory '%s'. " . __FILE__ . ':' . __LINE__, $dir, $temp_dir ) );
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ function ( $world, $empty_or_nonexistent, $dir ) {`
`24`	`24`
`25`	`25`	`$temp_dir = sys_get_temp_dir();`
`26`	`26`
`27`		`- if ( 0 !== strpos( $dir, $temp_dir ) ) {`
	`27`	+ // Also check for temp dir prefixed with `/private` for Mac OS X.
	`28`	`+ if ( 0 !== strpos( $dir, $temp_dir ) && 0 !== strpos( $dir, "/private{$temp_dir}" ) ) {`
`28`	`29`	`throw new RuntimeException( sprintf( "Attempted to delete directory '%s' that is not in the temp directory '%s'. " . __FILE__ . ':' . __LINE__, $dir, $temp_dir ) );`
`29`	`30`	`}`
`30`	`31`