Ensure $run_dir is defined

swissspidy · swissspidy · commit 557cde8db238 · 2023-10-19T15:52:13.000+02:00
diff --git a/src/Context/FeatureContext.php b/src/Context/FeatureContext.php
@@ -951,7 +951,6 @@ public function download_wp( $subdir = '' ) {
 		if ( 'sqlite' === self::$db_type ) {
 			self::copy_dir( self::$sqlite_cache_dir, $dest_dir . '/wp-content/plugins' );
 			self::configure_sqlite( $dest_dir );
-
 		}
 	}
 
@@ -1012,10 +1011,11 @@ public function install_wp( $subdir = '' ) {
 			'skip-email'     => true,
 		];
 
+		$run_dir            = '' !== $subdir ? ( $this->variables['RUN_DIR'] . "/$subdir" ) : $this->variables['RUN_DIR'];
 		$install_cache_path = '';
+
 		if ( self::$install_cache_dir ) {
 			$install_cache_path = self::$install_cache_dir . '/install_' . md5( implode( ':', $install_args ) . ':subdir=' . $subdir );
-			$run_dir            = '' !== $subdir ? ( $this->variables['RUN_DIR'] . "/$subdir" ) : $this->variables['RUN_DIR'];
 		}
 
 		if ( $install_cache_path && file_exists( $install_cache_path ) ) {

Original file line number	Diff line number	Diff line change
`@@ -951,7 +951,6 @@ public function download_wp( $subdir = '' ) {`
`951`	`951`	`if ( 'sqlite' === self::$db_type ) {`
`952`	`952`	`self::copy_dir( self::$sqlite_cache_dir, $dest_dir . '/wp-content/plugins' );`
`953`	`953`	`self::configure_sqlite( $dest_dir );`
`954`		`-`
`955`	`954`	`}`
`956`	`955`	`}`
`957`	`956`
`@@ -1012,10 +1011,11 @@ public function install_wp( $subdir = '' ) {`
`1012`	`1011`	`'skip-email' => true,`
`1013`	`1012`	`];`
`1014`	`1013`
	`1014`	`+ $run_dir = '' !== $subdir ? ( $this->variables['RUN_DIR'] . "/$subdir" ) : $this->variables['RUN_DIR'];`
`1015`	`1015`	`$install_cache_path = '';`
	`1016`	`+`
`1016`	`1017`	`if ( self::$install_cache_dir ) {`
`1017`	`1018`	`$install_cache_path = self::$install_cache_dir . '/install_' . md5( implode( ':', $install_args ) . ':subdir=' . $subdir );`
`1018`		`- $run_dir = '' !== $subdir ? ( $this->variables['RUN_DIR'] . "/$subdir" ) : $this->variables['RUN_DIR'];`
`1019`	`1019`	`}`
`1020`	`1020`
`1021`	`1021`	`if ( $install_cache_path && file_exists( $install_cache_path ) ) {`