Get Blueprints unit tests to work with the new API

Author: adamziel

components/Blueprints/DataReference/DataReferenceResolver.php

@@ -93,7 +93,7 @@ public function resolve( DataReference $reference, ?Tracker $progress_tracker =
 				return new File( $tracked_stream, basename( $path ) );
 			} elseif ( $this->executionContext->is_dir( $path ) ) {
 				// @TODO (low priority): Actually track the download progress for directories.
-				$this->subTrackers[ $reference->id ]->finish();
+				$progress_tracker->finish();
 
 				return new Directory(
 					new ChrootLayer( $this->executionContext, $path ),

components/Blueprints/ProgressObserver.php

@@ -20,8 +20,10 @@ class ProgressObserver {
 	 *
 	 * @param  callable  $logCallback  Function that receives progress updates
 	 */
-	public function __construct( callable $logCallback ) {
-		$this->logCallback = $logCallback;
+	public function __construct( ?callable $logCallback = null ) {
+		$this->logCallback = $logCallback ?? function() {
+			// noop
+		};
 	}
 
 	/**

components/Blueprints/Runner.php

@@ -52,10 +52,11 @@ class Runner {
 	private DataReferenceResolver $assets;
 	private Filesystem $blueprintExecutionContext;
 	private array $blueprintArray;
-	private array $dataReferences;
+	private array $dataReferences = [];
 	private ?VersionConstraint $phpVersionConstraint;
 	private Tracker $mainTracker;
 	private ProgressObserver $progressObserver;
+	public ?Runtime $runtime;
 
 	public function __construct( private RunnerConfiguration $configuration ) {
 		$this->client      = new Client( [
@@ -72,11 +73,7 @@ public function __construct( private RunnerConfiguration $configuration ) {
 		$this->mainTracker = new Tracker();
 
 		// Set up progress logging
-		$this->progressObserver = $configuration->getProgressObserver() ?? new ProgressObserver(
-			function ( $progress, $caption ) {
-				fprintf( STDERR, "[%3d%%] %s\n", $progress, $caption );
-			}
-		);
+		$this->progressObserver = $configuration->getProgressObserver() ?? new ProgressObserver();
 		$this->progressObserver->attachTo( $this->mainTracker );
 	}
 
@@ -106,7 +103,7 @@ public function run(): void {
 			$targetResolutionStage->setCaption( 'Resolving target site' );
 
 			$targetSiteFs = LocalFilesystem::create( $this->configuration->getTargetSiteRoot() );
-			$runtime      = new Runtime(
+			$this->runtime      = new Runtime(
 				$targetSiteFs,
 				$this->configuration,
 				$this->assets,
@@ -116,15 +113,15 @@ public function run(): void {
 			);
 
 			if ( $this->configuration->getExecutionMode() === 'apply-to-existing-site' ) {
-				ExistingSiteResolver::resolve( $runtime, $targetResolutionStage );
+				ExistingSiteResolver::resolve( $this->runtime, $targetResolutionStage );
 			} else {
-				NewSiteResolver::resolve( $runtime, $targetResolutionStage );
+				NewSiteResolver::resolve( $this->runtime, $targetResolutionStage );
 			}
 			$targetResolutionStage->finish();
 
 			$plan = $this->createExecutionPlan();
 			$this->assets->startEagerResolution( $this->dataReferences, $dataResolutionStage );
-			$this->executePlan( $executionStage, $plan, $runtime );
+			$this->executePlan( $executionStage, $plan, $this->runtime );
 		} finally {
 			LocalFilesystem::create( $tempRoot )->rmdir( '/', [
 				'recursive' => true,
@@ -160,8 +157,8 @@ private function loadBlueprint() {
 			$stream = $resolved->stream;
 
 			if ( is_zip_file_stream( $stream ) ) {
-				$this->blueprintExecutionContext = new ZipFilesystem( $stream );
 				$blueprintString        = $this->blueprintExecutionContext->get_contents( '/blueprint.json' );
+				$this->blueprintExecutionContext = $this->configuration->getExecutionContext() ?? new ZipFilesystem( $stream );
 			} else {
 				// JSON file
 				$blueprintString = $stream->consume_all();
@@ -171,16 +168,16 @@ private function loadBlueprint() {
 					// It was resolved as an ExecutionContextPath, but it's actually a local
 					// filesystem path at this point.
 					// The execution context is the directory containing the blueprint.json file.
-					$this->blueprintExecutionContext = LocalFilesystem::create( dirname( $reference->get_path() ) );
+					$this->blueprintExecutionContext = $this->configuration->getExecutionContext() ?? LocalFilesystem::create( dirname( $reference->get_path() ) );
 				} elseif ( $reference instanceof InlineFile ) {
-					$this->blueprintExecutionContext = InMemoryFilesystem::create();
+					$this->blueprintExecutionContext = $this->configuration->getExecutionContext() ?? InMemoryFilesystem::create();
 				} else {
 					throw new \Exception( 'Unsupported blueprint reference type: ' . get_class( $reference ) );
 				}
 			}
 		} elseif ( $resolved instanceof Directory ) {
-			$this->blueprintExecutionContext = $resolved->filesystem;
-			$blueprintString        = $this->blueprintExecutionContext->get_contents( '/blueprint.json' );
+			$blueprintString = $resolved->filesystem->get_contents( '/blueprint.json' );
+			$this->blueprintExecutionContext = $this->configuration->getExecutionContext() ?? $resolved->filesystem;
 		} else {
 			throw new \Exception( 'Invalid blueprint reference' );
 		}

components/Blueprints/Runtime.php

@@ -49,6 +49,10 @@ public function getTargetFilesystem(): Filesystem {
 		return $this->targetFs;
 	}
 
+	public function getTempRoot(): string {
+		return $this->tempRoot;
+	}
+
 	public function getDataReferenceResolver(): DataReferenceResolver {
 		return $this->assets;
 	}

components/Blueprints/Steps/InstallPluginStep.php

@@ -42,7 +42,7 @@ class InstallPluginStep implements StepInterface {
 	 * @param  DataReference  $source  Plugin source reference.
 	 * @param  bool  $active  Activate after install?
 	 * @param  array<string, mixed>|null  $activationOptions  Optional activation data.
-	 * @param  PluginErrorBehavior  $onError  Error handling behavior.
+	 * @param  string  $onError  Error handling behavior.
 	 */
 	public function __construct(
 		DataReference $source,
@@ -75,7 +75,6 @@ public function run( Runtime $runtime, Tracker $tracker ) {
 
 				if ( is_zip_file_stream( $plugin_data->stream ) ) {
 					pipe_stream( $plugin_data->stream, $zip_stream );
-					$plugin_data->stream->close_reading();
 				} else {
 					$zip_encoder = new ZipEncoder( $zip_stream );
 					$zip_encoder->append_file( new FileEntry( [
@@ -85,6 +84,7 @@ public function run( Runtime $runtime, Tracker $tracker ) {
 					] ) );
 					$zip_encoder->close();
 				}
+				$plugin_data->stream->close_reading();
 			}
 			$zip_stream->close_writing();
 

components/Blueprints/Steps/RmStep.php

@@ -4,6 +4,7 @@
 
 use WordPress\Blueprints\Progress\Tracker;
 use WordPress\Blueprints\Runtime;
+use WordPress\Filesystem\FilesystemException;
 
 /**
  * Represents the 'rm' (remove file) step.

components/Blueprints/tests/bootstrap.php

@@ -5,6 +5,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use WordPress\Blueprints\BlueprintV2Validator;
+use WordPress\Blueprints\Validator;
 
 /**
  * Tests for the BlueprintV2Validator class.
@@ -22,7 +23,7 @@ class BlueprintV2ValidatorTest extends TestCase {
 	 */
 	public function setUp(): void {
 		parent::setUp();
-		$this->validator = new BlueprintV2Validator();
+		$this->validator = new Validator();
 	}
 
 	/**