And only run if actually collecting coverage

Author: swissspidy

src/Context/FeatureContext.php

@@ -188,12 +188,21 @@ public static function forget_feature( AfterFeatureScope $scope ) {
 	}
 
 	/**
-	 * @AfterSuite
+	 * Whether tests are currently running with code coverage collection.
+	 *
+	 * @return bool
 	 */
-	public static function merge_coverage_reports() {
+	private static function running_with_code_coverage() {
 		$with_code_coverage = (string) getenv( 'WP_CLI_TEST_COVERAGE' );
 
-		if ( ! \in_array( $with_code_coverage, [ 'true', '1' ], true ) ) {
+		return \in_array( $with_code_coverage, [ 'true', '1' ], true );
+	}
+
+	/**
+	 * @AfterSuite
+	 */
+	public static function merge_coverage_reports() {
+		if ( self::running_with_code_coverage() ) {
 			return;
 		}
 
@@ -354,9 +363,7 @@ private static function get_process_env_variables() {
 			'TEST_RUN_DIR' => self::$behat_run_dir,
 		];
 
-		$with_code_coverage = (string) getenv( 'WP_CLI_TEST_COVERAGE' );
-
-		if ( \in_array( $with_code_coverage, [ 'true', '1' ], true ) ) {
+		if ( self::running_with_code_coverage() ) {
 			$has_coverage_driver = ( new Runtime() )->hasXdebug() || ( new Runtime() )->hasPCOV();
 
 			if ( ! $has_coverage_driver ) {
@@ -929,7 +936,7 @@ public function build_phar( $version = 'same' ) {
 		// so that it doesn't clash if autoloading is already happening outside of it,
 		// for example when generating code coverage.
 		// This modifies composer.json.
-		if ( $is_bundle ) {
+		if ( $is_bundle && self::running_with_code_coverage() ) {
 			$this->composer_command( 'config autoloader-suffix "WpCliTestsPhar" --working-dir=' . dirname( self::get_vendor_dir() ) );
 			$this->composer_command( 'dump-autoload --working-dir=' . dirname( self::get_vendor_dir() ) );
 		}
@@ -944,7 +951,7 @@ public function build_phar( $version = 'same' ) {
 		)->run_check();
 
 		// Revert the suffix change again
-		if ( $is_bundle ) {
+		if ( $is_bundle && self::running_with_code_coverage() ) {
 			$this->composer_command( 'config autoloader-suffix "WpCliBundle" --working-dir=' . dirname( self::get_vendor_dir() ) );
 			$this->composer_command( 'dump-autoload --working-dir=' . dirname( self::get_vendor_dir() ) );
 		}