WordPress · adamziel · Sep 4, 2025 · Sep 4, 2025 · Sep 4, 2025 · Sep 4, 2025
diff --git a/...nts/BlockParser/class-wp-block-parser.php → ...nents/BlockParser/class-wpblockparser.php b/...nts/BlockParser/class-wp-block-parser.php → ...nents/BlockParser/class-wpblockparser.php
@@ -410,11 +410,11 @@ public function add_block_from_stack( $end_offset = null ) {
  *
  * Required for backward compatibility in WordPress Core.
  */
-require_once __DIR__ . '/class-wp-block-parser-block.php';
+require_once __DIR__ . '/class-wpblockparserblock.php';
 
 /**
  * WP_Block_Parser_Frame class.
  *
  * Required for backward compatibility in WordPress Core.
  */
-require_once __DIR__ . '/class-wp-block-parser-frame.php';
+require_once __DIR__ . '/class-wpblockparserframe.php';
diff --git a/...ockParser/class-wp-block-parser-block.php → .../BlockParser/class-wpblockparserblock.php b/...ockParser/class-wp-block-parser-block.php → .../BlockParser/class-wpblockparserblock.php
diff --git a/...ockParser/class-wp-block-parser-error.php → .../BlockParser/class-wpblockparsererror.php b/...ockParser/class-wp-block-parser-error.php → .../BlockParser/class-wpblockparsererror.php
diff --git a/...ockParser/class-wp-block-parser-frame.php → .../BlockParser/class-wpblockparserframe.php b/...ockParser/class-wp-block-parser-frame.php → .../BlockParser/class-wpblockparserframe.php
diff --git a/...rints/DataReference/AbsoluteLocalPath.php → ...DataReference/class-absolutelocalpath.php b/...rints/DataReference/AbsoluteLocalPath.php → ...DataReference/class-absolutelocalpath.php
diff --git a/...lueprints/DataReference/DataReference.php → ...nts/DataReference/class-datareference.php b/...lueprints/DataReference/DataReference.php → ...nts/DataReference/class-datareference.php
diff --git a/...s/DataReference/DataReferenceResolver.php → ...Reference/class-datareferenceresolver.php b/...s/DataReference/DataReferenceResolver.php → ...Reference/class-datareferenceresolver.php
diff --git a/...ts/Blueprints/DataReference/Directory.php → ...eprints/DataReference/class-directory.php b/...ts/Blueprints/DataReference/Directory.php → ...eprints/DataReference/class-directory.php
diff --git a/...ts/DataReference/ExecutionContextPath.php → ...aReference/class-executioncontextpath.php b/...ts/DataReference/ExecutionContextPath.php → ...aReference/class-executioncontextpath.php
diff --git a/components/Blueprints/DataReference/File.php → ...s/Blueprints/DataReference/class-file.php b/components/Blueprints/DataReference/File.php → ...s/Blueprints/DataReference/class-file.php
diff --git a/...ents/Blueprints/DataReference/GitPath.php → ...lueprints/DataReference/class-gitpath.php b/...ents/Blueprints/DataReference/GitPath.php → ...lueprints/DataReference/class-gitpath.php
diff --git a/...eprints/DataReference/InlineDirectory.php → ...s/DataReference/class-inlinedirectory.php b/...eprints/DataReference/InlineDirectory.php → ...s/DataReference/class-inlinedirectory.php
diff --git a/...s/Blueprints/DataReference/InlineFile.php → ...prints/DataReference/class-inlinefile.php b/...s/Blueprints/DataReference/InlineFile.php → ...prints/DataReference/class-inlinefile.php
diff --git a/...s/Blueprints/DataReference/RemoteFile.php → ...prints/DataReference/class-remotefile.php b/...s/Blueprints/DataReference/RemoteFile.php → ...prints/DataReference/class-remotefile.php
diff --git a/...Blueprints/DataReference/URLReference.php → ...ints/DataReference/class-urlreference.php b/...Blueprints/DataReference/URLReference.php → ...ints/DataReference/class-urlreference.php
diff --git a/...ints/DataReference/WordPressOrgPlugin.php → ...ataReference/class-wordpressorgplugin.php b/...ints/DataReference/WordPressOrgPlugin.php → ...ataReference/class-wordpressorgplugin.php
diff --git a/...rints/DataReference/WordPressOrgTheme.php → ...DataReference/class-wordpressorgtheme.php b/...rints/DataReference/WordPressOrgTheme.php → ...DataReference/class-wordpressorgtheme.php
diff --git a/...Exception/BlueprintExecutionException.php → ...ion/class-blueprintexecutionexception.php b/...Exception/BlueprintExecutionException.php → ...ion/class-blueprintexecutionexception.php
diff --git a/...nts/Exception/DataResolutionException.php → ...ception/class-dataresolutionexception.php b/...nts/Exception/DataResolutionException.php → ...ception/class-dataresolutionexception.php
diff --git a/...prints/Exception/PermissionsException.php → .../Exception/class-permissionsexception.php b/...prints/Exception/PermissionsException.php → .../Exception/class-permissionsexception.php
diff --git a/components/Blueprints/Logger/CLILogger.php → ...nts/Blueprints/Logger/class-clilogger.php b/components/Blueprints/Logger/CLILogger.php → ...nts/Blueprints/Logger/class-clilogger.php
diff --git a/components/Blueprints/Logger/NoopLogger.php → ...ts/Blueprints/Logger/class-nooplogger.php b/components/Blueprints/Logger/NoopLogger.php → ...ts/Blueprints/Logger/class-nooplogger.php
diff --git a/components/Blueprints/Progress/DoneEvent.php → ...s/Blueprints/Progress/class-doneevent.php b/components/Blueprints/Progress/DoneEvent.php → ...s/Blueprints/Progress/class-doneevent.php
diff --git a/...nts/Blueprints/Progress/ProgressEvent.php → ...ueprints/Progress/class-progressevent.php b/...nts/Blueprints/Progress/ProgressEvent.php → ...ueprints/Progress/class-progressevent.php
diff --git a/...ts/Progress/ProgressTrackedReadStream.php → ...gress/class-progresstrackedreadstream.php b/...ts/Progress/ProgressTrackedReadStream.php → ...gress/class-progresstrackedreadstream.php
diff --git a/components/Blueprints/Progress/Tracker.php → ...nts/Blueprints/Progress/class-tracker.php b/components/Blueprints/Progress/Tracker.php → ...nts/Blueprints/Progress/class-tracker.php
diff --git a/...nts/SiteResolver/ExistingSiteResolver.php → ...teResolver/class-existingsiteresolver.php b/...nts/SiteResolver/ExistingSiteResolver.php → ...teResolver/class-existingsiteresolver.php
diff --git a/...ueprints/SiteResolver/NewSiteResolver.php → ...ts/SiteResolver/class-newsiteresolver.php b/...ueprints/SiteResolver/NewSiteResolver.php → ...ts/SiteResolver/class-newsiteresolver.php
diff --git a/...s/Blueprints/Steps/ActivatePluginStep.php → ...prints/Steps/class-activatepluginstep.php b/...s/Blueprints/Steps/ActivatePluginStep.php → ...prints/Steps/class-activatepluginstep.php
diff --git a/...ts/Blueprints/Steps/ActivateThemeStep.php → ...eprints/Steps/class-activatethemestep.php b/...ts/Blueprints/Steps/ActivateThemeStep.php → ...eprints/Steps/class-activatethemestep.php
diff --git a/components/Blueprints/Steps/CpStep.php → components/Blueprints/Steps/class-cpstep.php b/components/Blueprints/Steps/CpStep.php → components/Blueprints/Steps/class-cpstep.php
diff --git a/.../Blueprints/Steps/DefineConstantsStep.php → ...rints/Steps/class-defineconstantsstep.php b/.../Blueprints/Steps/DefineConstantsStep.php → ...rints/Steps/class-defineconstantsstep.php
diff --git a/.../Blueprints/Steps/EnableMultisiteStep.php → ...rints/Steps/class-enablemultisitestep.php b/.../Blueprints/Steps/EnableMultisiteStep.php → ...rints/Steps/class-enablemultisitestep.php
diff --git a/...ts/Blueprints/Steps/ImportContentStep.php → ...eprints/Steps/class-importcontentstep.php b/...ts/Blueprints/Steps/ImportContentStep.php → ...eprints/Steps/class-importcontentstep.php
diff --git a/...ents/Blueprints/Steps/ImportMediaStep.php → ...lueprints/Steps/class-importmediastep.php b/...ents/Blueprints/Steps/ImportMediaStep.php → ...lueprints/Steps/class-importmediastep.php
diff --git a/...s/Steps/ImportThemeStarterContentStep.php → ...s/class-importthemestartercontentstep.php b/...s/Steps/ImportThemeStarterContentStep.php → ...s/class-importthemestartercontentstep.php
diff --git a/...ts/Blueprints/Steps/InstallPluginStep.php → ...eprints/Steps/class-installpluginstep.php b/...ts/Blueprints/Steps/InstallPluginStep.php → ...eprints/Steps/class-installpluginstep.php
diff --git a/...nts/Blueprints/Steps/InstallThemeStep.php → ...ueprints/Steps/class-installthemestep.php b/...nts/Blueprints/Steps/InstallThemeStep.php → ...ueprints/Steps/class-installthemestep.php
diff --git a/components/Blueprints/Steps/MkdirStep.php → ...ents/Blueprints/Steps/class-mkdirstep.php b/components/Blueprints/Steps/MkdirStep.php → ...ents/Blueprints/Steps/class-mkdirstep.php
diff --git a/components/Blueprints/Steps/MvStep.php → components/Blueprints/Steps/class-mvstep.php b/components/Blueprints/Steps/MvStep.php → components/Blueprints/Steps/class-mvstep.php
diff --git a/components/Blueprints/Steps/RmDirStep.php → ...ents/Blueprints/Steps/class-rmdirstep.php b/components/Blueprints/Steps/RmDirStep.php → ...ents/Blueprints/Steps/class-rmdirstep.php
diff --git a/components/Blueprints/Steps/RmStep.php → components/Blueprints/Steps/class-rmstep.php b/components/Blueprints/Steps/RmStep.php → components/Blueprints/Steps/class-rmstep.php
diff --git a/components/Blueprints/Steps/RunPHPStep.php → ...nts/Blueprints/Steps/class-runphpstep.php b/components/Blueprints/Steps/RunPHPStep.php → ...nts/Blueprints/Steps/class-runphpstep.php
diff --git a/components/Blueprints/Steps/RunSqlStep.php → ...nts/Blueprints/Steps/class-runsqlstep.php b/components/Blueprints/Steps/RunSqlStep.php → ...nts/Blueprints/Steps/class-runsqlstep.php
diff --git a/.../Blueprints/Steps/SetSiteLanguageStep.php → ...rints/Steps/class-setsitelanguagestep.php b/.../Blueprints/Steps/SetSiteLanguageStep.php → ...rints/Steps/class-setsitelanguagestep.php
diff --git a/...s/Blueprints/Steps/SetSiteOptionsStep.php → ...prints/Steps/class-setsiteoptionsstep.php b/...s/Blueprints/Steps/SetSiteOptionsStep.php → ...prints/Steps/class-setsiteoptionsstep.php
diff --git a/components/Blueprints/Steps/UnzipStep.php → ...ents/Blueprints/Steps/class-unzipstep.php b/components/Blueprints/Steps/UnzipStep.php → ...ents/Blueprints/Steps/class-unzipstep.php
diff --git a/components/Blueprints/Steps/WPCLIStep.php → ...ents/Blueprints/Steps/class-wpclistep.php b/components/Blueprints/Steps/WPCLIStep.php → ...ents/Blueprints/Steps/class-wpclistep.php
diff --git a/...nents/Blueprints/Steps/WriteFilesStep.php → ...Blueprints/Steps/class-writefilesstep.php b/...nents/Blueprints/Steps/WriteFilesStep.php → ...Blueprints/Steps/class-writefilesstep.php
diff --git a/...onents/Blueprints/Steps/StepInterface.php → ...prints/Steps/interface-step-interface.php b/...onents/Blueprints/Steps/StepInterface.php → ...prints/Steps/interface-step-interface.php
diff --git a/components/Blueprints/Tests/Unit/Steps/CpStepTest.php b/components/Blueprints/Tests/Unit/Steps/CpStepTest.php
@@ -6,6 +6,8 @@
 use WordPress\Blueprints\Steps\CpStep;
 use WordPress\Filesystem\FilesystemException;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class CpStepTest extends StepTestCase {
 	public function testCopyFile() {
 		$this->runtime->getTargetFilesystem()->put_contents( 'source_file.txt', 'test content' );

diff --git a/components/Blueprints/Tests/Unit/Steps/DefineConstantsStepTest.php b/components/Blueprints/Tests/Unit/Steps/DefineConstantsStepTest.php
@@ -6,6 +6,8 @@
 use WordPress\Blueprints\Progress\Tracker;
 use WordPress\Blueprints\Steps\DefineConstantsStep;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class DefineConstantsStepTest extends StepTestCase {
 	/**
 	 * Test updating existing constants

diff --git a/components/Blueprints/Tests/Unit/Steps/EnableMultisiteStepTest.php b/components/Blueprints/Tests/Unit/Steps/EnableMultisiteStepTest.php
@@ -7,6 +7,8 @@
 use WordPress\Blueprints\Progress\Tracker;
 use WordPress\Blueprints\Steps\EnableMultisiteStep;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class EnableMultisiteStepTest extends StepTestCase {
 	public function setUp(): void {
 		parent::setUp();

diff --git a/components/Blueprints/Tests/Unit/Steps/InstallPluginStepTest.php b/components/Blueprints/Tests/Unit/Steps/InstallPluginStepTest.php
@@ -11,6 +11,8 @@
 
 use function WordPress\Filesystem\wp_join_unix_paths;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class InstallPluginStepTest extends StepTestCase {
 	const PLUGIN_FILE_CONTENT = <<<'PHP'
 <?php

diff --git a/components/Blueprints/Tests/Unit/Steps/InstallThemeStepTest.php b/components/Blueprints/Tests/Unit/Steps/InstallThemeStepTest.php
@@ -11,6 +11,8 @@
 
 use function WordPress\Filesystem\wp_join_unix_paths;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class InstallThemeStepTest extends StepTestCase {
 	const THEME_STYLE_CSS_CONTENT = <<<'CSS'
 /*

diff --git a/components/Blueprints/Tests/Unit/Steps/MkdirStepTest.php b/components/Blueprints/Tests/Unit/Steps/MkdirStepTest.php
@@ -7,6 +7,8 @@
 use WordPress\Blueprints\Steps\MkdirStep;
 use WordPress\Filesystem\FilesystemException;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class MkdirStepTest extends StepTestCase {
 
 	public function testCreateDirectoryWhenUsingRelativePath() {

diff --git a/components/Blueprints/Tests/Unit/Steps/MvStepTest.php b/components/Blueprints/Tests/Unit/Steps/MvStepTest.php
@@ -6,6 +6,8 @@
 use WordPress\Blueprints\Steps\MvStep;
 use WordPress\Filesystem\FilesystemException;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class MvStepTest extends StepTestCase {
 
 	public function testMoveFile() {

diff --git a/components/Blueprints/Tests/Unit/Steps/RmDirStepTest.php b/components/Blueprints/Tests/Unit/Steps/RmDirStepTest.php
@@ -6,6 +6,8 @@
 use WordPress\Blueprints\Steps\RmDirStep;
 use WordPress\Filesystem\FilesystemException;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class RmDirStepTest extends StepTestCase {
 
 	public function testRemoveEmptyDirectory() {

diff --git a/components/Blueprints/Tests/Unit/Steps/RmStepTest.php b/components/Blueprints/Tests/Unit/Steps/RmStepTest.php
@@ -6,6 +6,8 @@
 use WordPress\Blueprints\Steps\RmStep;
 use WordPress\Filesystem\FilesystemException;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class RmStepTest extends StepTestCase {
 
 	public function testRemoveFile() {

diff --git a/components/Blueprints/Tests/Unit/Steps/RunPHPStepTest.php b/components/Blueprints/Tests/Unit/Steps/RunPHPStepTest.php
@@ -9,6 +9,8 @@
 
 use function WordPress\Filesystem\wp_join_unix_paths;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class RunPHPStepTest extends StepTestCase {
 
 	/**

diff --git a/components/Blueprints/Tests/Unit/Steps/RunSQLStepTest.php b/components/Blueprints/Tests/Unit/Steps/RunSQLStepTest.php
@@ -7,6 +7,8 @@
 use WordPress\Blueprints\Progress\Tracker;
 use WordPress\Blueprints\Steps\RunSqlStep;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class RunSQLStepTest extends StepTestCase {
 	/**
 	 * Test running a simple SQL query

diff --git a/components/Blueprints/Tests/Unit/Steps/SetSiteOptionsStepTest.php b/components/Blueprints/Tests/Unit/Steps/SetSiteOptionsStepTest.php
@@ -5,6 +5,8 @@
 use WordPress\Blueprints\Progress\Tracker;
 use WordPress\Blueprints\Steps\SetSiteOptionsStep;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class SetSiteOptionsStepTest extends StepTestCase {
 	/**
 	 * Helper to verify options in WordPress

diff --git a/components/Blueprints/Tests/Unit/Steps/UnzipStepTest.php b/components/Blueprints/Tests/Unit/Steps/UnzipStepTest.php
@@ -12,6 +12,8 @@
 
 use function WordPress\Filesystem\wp_join_unix_paths;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class UnzipStepTest extends StepTestCase {
 
 	public function setUp(): void {

diff --git a/components/Blueprints/Tests/Unit/Steps/WriteFilesStepTest.php b/components/Blueprints/Tests/Unit/Steps/WriteFilesStepTest.php
@@ -8,6 +8,8 @@
 use WordPress\Blueprints\Progress\Tracker;
 use WordPress\Blueprints\Steps\WriteFilesStep;
 
+require_once __DIR__ . '/StepTestCase.php';
+
 class WriteFilesStepTest extends StepTestCase {
 	/**
 	 * Test writing a file with string data

diff --git a/...alidator/HumanFriendlySchemaValidator.php → ...or/class-humanfriendlyschemavalidator.php b/...alidator/HumanFriendlySchemaValidator.php → ...or/class-humanfriendlyschemavalidator.php
diff --git a/.../Validator/UnsupportedSchemaException.php → ...ator/class-unsupportedschemaexception.php b/.../Validator/UnsupportedSchemaException.php → ...ator/class-unsupportedschemaexception.php
diff --git a/.../Blueprints/Validator/ValidationError.php → ...rints/Validator/class-validationerror.php b/.../Blueprints/Validator/ValidationError.php → ...rints/Validator/class-validationerror.php
diff --git a/.../Blueprints/VersionStrings/PHPVersion.php → ...rints/VersionStrings/class-phpversion.php b/.../Blueprints/VersionStrings/PHPVersion.php → ...rints/VersionStrings/class-phpversion.php
diff --git a/...nts/Blueprints/VersionStrings/Version.php → ...ueprints/VersionStrings/class-version.php b/...nts/Blueprints/VersionStrings/Version.php → ...ueprints/VersionStrings/class-version.php
diff --git a/...ints/VersionStrings/VersionConstraint.php → ...ersionStrings/class-versionconstraint.php b/...ints/VersionStrings/VersionConstraint.php → ...ersionStrings/class-versionconstraint.php
diff --git a/...rints/VersionStrings/WordPressVersion.php → ...VersionStrings/class-wordpressversion.php b/...rints/VersionStrings/WordPressVersion.php → ...VersionStrings/class-wordpressversion.php
diff --git a/...ts/Versions/Version1/V1ToV2Transpiler.php → ...sions/Version1/class-v1tov2transpiler.php b/...ts/Versions/Version1/V1ToV2Transpiler.php → ...sions/Version1/class-v1tov2transpiler.php
diff --git a/...onents/Blueprints/MediaFileDefinition.php → .../Blueprints/class-mediafiledefinition.php b/...onents/Blueprints/MediaFileDefinition.php → .../Blueprints/class-mediafiledefinition.php
diff --git a/components/Blueprints/Metadata.php → components/Blueprints/class-metadata.php b/components/Blueprints/Metadata.php → components/Blueprints/class-metadata.php
diff --git a/components/Blueprints/Process.php → components/Blueprints/class-process.php b/components/Blueprints/Process.php → components/Blueprints/class-process.php
diff --git a/...nts/Blueprints/ProcessFailedException.php → ...ueprints/class-processfailedexception.php b/...nts/Blueprints/ProcessFailedException.php → ...ueprints/class-processfailedexception.php
diff --git a/components/Blueprints/ProgressObserver.php → ...nts/Blueprints/class-progressobserver.php b/components/Blueprints/ProgressObserver.php → ...nts/Blueprints/class-progressobserver.php
diff --git a/components/Blueprints/Runner.php → components/Blueprints/class-runner.php b/components/Blueprints/Runner.php → components/Blueprints/class-runner.php
diff --git a/...onents/Blueprints/RunnerConfiguration.php → .../Blueprints/class-runnerconfiguration.php b/...onents/Blueprints/RunnerConfiguration.php → .../Blueprints/class-runnerconfiguration.php
diff --git a/components/Blueprints/Runtime.php → components/Blueprints/class-runtime.php b/components/Blueprints/Runtime.php → components/Blueprints/class-runtime.php
diff --git a/...tream/ByteTransformer/ByteTransformer.php → ...ByteTransformer/class-bytetransformer.php b/...tream/ByteTransformer/ByteTransformer.php → ...ByteTransformer/class-bytetransformer.php
diff --git a/...m/ByteTransformer/ChecksumTransformer.php → ...Transformer/class-checksumtransformer.php b/...m/ByteTransformer/ChecksumTransformer.php → ...Transformer/class-checksumtransformer.php
diff --git a/...am/ByteTransformer/DeflateTransformer.php → ...eTransformer/class-deflatetransformer.php b/...am/ByteTransformer/DeflateTransformer.php → ...eTransformer/class-deflatetransformer.php
diff --git a/...am/ByteTransformer/InflateTransformer.php → ...eTransformer/class-inflatetransformer.php b/...am/ByteTransformer/InflateTransformer.php → ...eTransformer/class-inflatetransformer.php
diff --git a/...eStream/ReadStream/BaseByteReadStream.php → ...m/ReadStream/class-basebytereadstream.php b/...eStream/ReadStream/BaseByteReadStream.php → ...m/ReadStream/class-basebytereadstream.php
diff --git a/.../ByteStream/ReadStream/ByteReadStream.php → ...tream/ReadStream/class-bytereadstream.php b/.../ByteStream/ReadStream/ByteReadStream.php → ...tream/ReadStream/class-bytereadstream.php
diff --git a/...teStream/ReadStream/DeflateReadStream.php → ...am/ReadStream/class-deflatereadstream.php b/...teStream/ReadStream/DeflateReadStream.php → ...am/ReadStream/class-deflatereadstream.php
diff --git a/.../ByteStream/ReadStream/FileReadStream.php → ...tream/ReadStream/class-filereadstream.php b/.../ByteStream/ReadStream/FileReadStream.php → ...tream/ReadStream/class-filereadstream.php
diff --git a/...teStream/ReadStream/InflateReadStream.php → ...am/ReadStream/class-inflatereadstream.php b/...teStream/ReadStream/InflateReadStream.php → ...am/ReadStream/class-inflatereadstream.php
diff --git a/...ream/ReadStream/LimitedByteReadStream.php → ...eadStream/class-limitedbytereadstream.php b/...ream/ReadStream/LimitedByteReadStream.php → ...eadStream/class-limitedbytereadstream.php
diff --git a/...ream/ReadStream/TransformedReadStream.php → ...eadStream/class-transformedreadstream.php b/...ream/ReadStream/TransformedReadStream.php → ...eadStream/class-transformedreadstream.php
diff --git a/...yteStream/WriteStream/ByteWriteStream.php → ...eam/WriteStream/class-bytewritestream.php b/...yteStream/WriteStream/ByteWriteStream.php → ...eam/WriteStream/class-bytewritestream.php
diff --git a/...yteStream/WriteStream/FileWriteStream.php → ...eam/WriteStream/class-filewritestream.php b/...yteStream/WriteStream/FileWriteStream.php → ...eam/WriteStream/class-filewritestream.php
diff --git a/...am/WriteStream/TransformedWriteStream.php → ...teStream/class-transformedwritestream.php b/...am/WriteStream/TransformedWriteStream.php → ...teStream/class-transformedwritestream.php
diff --git a/components/ByteStream/BytePipe.php → components/ByteStream/class-bytepipe.php b/components/ByteStream/BytePipe.php → components/ByteStream/class-bytepipe.php
diff --git a/...onents/ByteStream/ByteStreamException.php → .../ByteStream/class-bytestreamexception.php b/...onents/ByteStream/ByteStreamException.php → .../ByteStream/class-bytestreamexception.php
diff --git a/...onents/ByteStream/FileReadWriteStream.php → .../ByteStream/class-filereadwritestream.php b/...onents/ByteStream/FileReadWriteStream.php → .../ByteStream/class-filereadwritestream.php
diff --git a/components/ByteStream/MemoryPipe.php → components/ByteStream/class-memorypipe.php b/components/ByteStream/MemoryPipe.php → components/ByteStream/class-memorypipe.php
diff --git a/...nts/ByteStream/NotEnoughDataException.php → ...teStream/class-notenoughdataexception.php b/...nts/ByteStream/NotEnoughDataException.php → ...teStream/class-notenoughdataexception.php
diff --git a/components/ByteStream/composer.json b/components/ByteStream/composer.json
@@ -16,9 +16,9 @@
 		"php": ">=7.2"
 	},
 	"autoload": {
-		"psr-4": {
-			"WordPress\\ByteStream\\": ""
-		},
+		"classmap": [
+			"./"
+		],
 		"exclude-from-classmap": [
 			"/Tests/"
 		]

diff --git a/components/CLI/CLI.php → components/CLI/class-cli.php b/components/CLI/CLI.php → components/CLI/class-cli.php
diff --git a/...tion/BlockMarkup/BlockMarkupProcessor.php → ...lockMarkup/class-blockmarkupprocessor.php b/...tion/BlockMarkup/BlockMarkupProcessor.php → ...lockMarkup/class-blockmarkupprocessor.php
diff --git a/...n/BlockMarkup/BlockMarkupUrlProcessor.php → ...kMarkup/class-blockmarkupurlprocessor.php b/...n/BlockMarkup/BlockMarkupUrlProcessor.php → ...kMarkup/class-blockmarkupurlprocessor.php
diff --git a/...ataLiberation/BlockMarkup/BlockObject.php → ...eration/BlockMarkup/class-blockobject.php b/...ataLiberation/BlockMarkup/BlockObject.php → ...eration/BlockMarkup/class-blockobject.php
diff --git a/...Consumer/AnnotatedBlockMarkupConsumer.php → ...er/class-annotatedblockmarkupconsumer.php b/...Consumer/AnnotatedBlockMarkupConsumer.php → ...er/class-annotatedblockmarkupconsumer.php
diff --git a/...DataFormatConsumer/BlocksWithMetadata.php → ...rmatConsumer/class-blockswithmetadata.php b/...DataFormatConsumer/BlocksWithMetadata.php → ...rmatConsumer/class-blockswithmetadata.php
diff --git a/...ormatConsumer/MarkupProcessorConsumer.php → ...onsumer/class-markupprocessorconsumer.php b/...ormatConsumer/MarkupProcessorConsumer.php → ...onsumer/class-markupprocessorconsumer.php
diff --git a/...DataFormatConsumer/DataFormatConsumer.php → ...nsumer/interface-data-format-consumer.php b/...DataFormatConsumer/DataFormatConsumer.php → ...nsumer/interface-data-format-consumer.php
diff --git a/...Producer/AnnotatedBlockMarkupProducer.php → ...er/class-annotatedblockmarkupproducer.php b/...Producer/AnnotatedBlockMarkupProducer.php → ...er/class-annotatedblockmarkupproducer.php
diff --git a/...DataFormatProducer/DataFormatProducer.php → ...oducer/interface-data-format-producer.php b/...DataFormatProducer/DataFormatProducer.php → ...oducer/interface-data-format-producer.php
diff --git a/...Reader/BlocksWithMetadataEntityReader.php → .../class-blockswithmetadataentityreader.php b/...Reader/BlocksWithMetadataEntityReader.php → .../class-blockswithmetadataentityreader.php
diff --git a/...ityReader/DatabaseContentEntityReader.php → ...der/class-databasecontententityreader.php b/...ityReader/DatabaseContentEntityReader.php → ...der/class-databasecontententityreader.php
diff --git a/...EntityReader/DatabaseRowsEntityReader.php → ...Reader/class-databaserowsentityreader.php b/...EntityReader/DatabaseRowsEntityReader.php → ...Reader/class-databaserowsentityreader.php
diff --git a/...ion/EntityReader/EntityReaderIterator.php → ...tityReader/class-entityreaderiterator.php b/...ion/EntityReader/EntityReaderIterator.php → ...tityReader/class-entityreaderiterator.php
diff --git a/...eration/EntityReader/EPubEntityReader.php → ...n/EntityReader/class-epubentityreader.php b/...eration/EntityReader/EPubEntityReader.php → ...n/EntityReader/class-epubentityreader.php
diff --git a/...n/EntityReader/FilesystemEntityReader.php → ...tyReader/class-filesystementityreader.php b/...n/EntityReader/FilesystemEntityReader.php → ...tyReader/class-filesystementityreader.php
diff --git a/...eration/EntityReader/HTMLEntityReader.php → ...n/EntityReader/class-htmlentityreader.php b/...eration/EntityReader/HTMLEntityReader.php → ...n/EntityReader/class-htmlentityreader.php
diff --git a/...beration/EntityReader/WXREntityReader.php → ...on/EntityReader/class-wxrentityreader.php b/...beration/EntityReader/WXREntityReader.php → ...on/EntityReader/class-wxrentityreader.php
diff --git a/...aLiberation/EntityReader/EntityReader.php → .../EntityReader/interface-entity-reader.php b/...aLiberation/EntityReader/EntityReader.php → .../EntityReader/interface-entity-reader.php
diff --git a/...beration/EntityWriter/MySQLDumpWriter.php → ...on/EntityWriter/class-mysqldumpwriter.php b/...beration/EntityWriter/MySQLDumpWriter.php → ...on/EntityWriter/class-mysqldumpwriter.php
diff --git a/...on/EntityWriter/StaticPostFilesWriter.php → ...ityWriter/class-staticpostfileswriter.php b/...on/EntityWriter/StaticPostFilesWriter.php → ...ityWriter/class-staticpostfileswriter.php
diff --git a/...DataLiberation/EntityWriter/WXRWriter.php → ...beration/EntityWriter/class-wxrwriter.php b/...DataLiberation/EntityWriter/WXRWriter.php → ...beration/EntityWriter/class-wxrwriter.php
diff --git a/...aLiberation/EntityWriter/EntityWriter.php → .../EntityWriter/interface-entity-writer.php b/...aLiberation/EntityWriter/EntityWriter.php → .../EntityWriter/interface-entity-writer.php
diff --git a/...eration/Importer/AttachmentDownloader.php → ...n/Importer/class-attachmentdownloader.php b/...eration/Importer/AttachmentDownloader.php → ...n/Importer/class-attachmentdownloader.php
diff --git a/...on/Importer/AttachmentDownloaderEvent.php → ...orter/class-attachmentdownloaderevent.php b/...on/Importer/AttachmentDownloaderEvent.php → ...orter/class-attachmentdownloaderevent.php
diff --git a/...ataLiberation/Importer/EntityImporter.php → ...eration/Importer/class-entityimporter.php b/...ataLiberation/Importer/EntityImporter.php → ...eration/Importer/class-entityimporter.php
diff --git a/...beration/Importer/EntityIteratorChain.php → ...on/Importer/class-entityiteratorchain.php b/...beration/Importer/EntityIteratorChain.php → ...on/Importer/class-entityiteratorchain.php
diff --git a/...aLiberation/Importer/FileVisitorEvent.php → ...ation/Importer/class-filevisitorevent.php b/...aLiberation/Importer/FileVisitorEvent.php → ...ation/Importer/class-filevisitorevent.php
diff --git a/...DataLiberation/Importer/ImportSession.php → ...beration/Importer/class-importsession.php b/...DataLiberation/Importer/ImportSession.php → ...beration/Importer/class-importsession.php
diff --git a/...s/DataLiberation/Importer/ImportUtils.php → ...Liberation/Importer/class-importutils.php b/...s/DataLiberation/Importer/ImportUtils.php → ...Liberation/Importer/class-importutils.php
diff --git a/...on/Importer/RetryFrontloadingIterator.php → ...orter/class-retryfrontloadingiterator.php b/...on/Importer/RetryFrontloadingIterator.php → ...orter/class-retryfrontloadingiterator.php
diff --git a/...ataLiberation/Importer/StreamImporter.php → ...eration/Importer/class-streamimporter.php b/...ataLiberation/Importer/StreamImporter.php → ...eration/Importer/class-streamimporter.php
diff --git a/...DataLiberation/URL/URLInTextProcessor.php → ...beration/URL/class-urlintextprocessor.php b/...DataLiberation/URL/URLInTextProcessor.php → ...beration/URL/class-urlintextprocessor.php
diff --git a/components/DataLiberation/URL/WPURL.php → ...onents/DataLiberation/URL/class-wpurl.php b/components/DataLiberation/URL/WPURL.php → ...onents/DataLiberation/URL/class-wpurl.php
diff --git a/...ataLiberation/DataLiberationException.php → ...eration/class-dataliberationexception.php b/...ataLiberation/DataLiberationException.php → ...eration/class-dataliberationexception.php
diff --git a/...iberation/DataLiberationHTMLProcessor.php → ...ion/class-dataliberationhtmlprocessor.php b/...iberation/DataLiberationHTMLProcessor.php → ...ion/class-dataliberationhtmlprocessor.php
diff --git a/components/DataLiberation/ImportEntity.php → ...nts/DataLiberation/class-importentity.php b/components/DataLiberation/ImportEntity.php → ...nts/DataLiberation/class-importentity.php
diff --git a/components/DataLiberation/composer.json b/components/DataLiberation/composer.json
@@ -17,16 +17,12 @@
 	},
 	"autoload": {
 		"classmap": [
+			"./",
 			"vendor-patched/"
 		],
 		"files": [
 			"URL/functions.php"
 		],
-		"psr-4": {
-			"WordPress\\DataLiberation\\": "",
-			"Rowbot\\": "vendor-patched/",
-			"Brick\\": "vendor-patched/"
-		},
 		"exclude-from-classmap": [
 			"/Tests/"
 		]

diff --git a/...stem/ByteStream/FilesystemWriteStream.php → ...yteStream/class-filesystemwritestream.php b/...stem/ByteStream/FilesystemWriteStream.php → ...yteStream/class-filesystemwritestream.php
diff --git a/components/Filesystem/Layer/ChrootLayer.php → ...ts/Filesystem/Layer/class-chrootlayer.php b/components/Filesystem/Layer/ChrootLayer.php → ...ts/Filesystem/Layer/class-chrootlayer.php
diff --git a/components/Filesystem/Layer/Layer.php → components/Filesystem/Layer/class-layer.php b/components/Filesystem/Layer/Layer.php → components/Filesystem/Layer/class-layer.php
diff --git a/...in/Interfaces/InternalizedWriteStream.php → ...ces/interface-internalizedwritestream.php b/...in/Interfaces/InternalizedWriteStream.php → ...ces/interface-internalizedwritestream.php
diff --git a/...xin/BufferedWriteStreamViaPutContents.php → ...ait-bufferedwritestreamviaputcontents.php b/...xin/BufferedWriteStreamViaPutContents.php → ...ait-bufferedwritestreamviaputcontents.php
diff --git a/...lesystem/Mixin/CopyDirectoryRecursive.php → ...em/Mixin/trait-copydirectoryrecursive.php b/...lesystem/Mixin/CopyDirectoryRecursive.php → ...em/Mixin/trait-copydirectoryrecursive.php
diff --git a/...Filesystem/Mixin/CopyFileViaStreaming.php → ...stem/Mixin/trait-copyfileviastreaming.php b/...Filesystem/Mixin/CopyFileViaStreaming.php → ...stem/Mixin/trait-copyfileviastreaming.php
diff --git a/...ystem/Mixin/CopyRecursiveViaStreaming.php → ...Mixin/trait-copyrecursiveviastreaming.php b/...ystem/Mixin/CopyRecursiveViaStreaming.php → ...Mixin/trait-copyrecursiveviastreaming.php
diff --git a/...system/Mixin/GetContentsViaReadStream.php → .../Mixin/trait-getcontentsviareadstream.php b/...system/Mixin/GetContentsViaReadStream.php → .../Mixin/trait-getcontentsviareadstream.php
diff --git a/...lesystem/Mixin/InternalizeWriteStream.php → ...em/Mixin/trait-internalizewritestream.php b/...lesystem/Mixin/InternalizeWriteStream.php → ...em/Mixin/trait-internalizewritestream.php
diff --git a/...nents/Filesystem/Mixin/MkdirRecursive.php → ...Filesystem/Mixin/trait-mkdirrecursive.php b/...nents/Filesystem/Mixin/MkdirRecursive.php → ...Filesystem/Mixin/trait-mkdirrecursive.php
diff --git a/...ystem/Mixin/PutContentsViaWriteStream.php → ...Mixin/trait-putcontentsviawritestream.php b/...ystem/Mixin/PutContentsViaWriteStream.php → ...Mixin/trait-putcontentsviawritestream.php
diff --git a/...s/Filesystem/Mixin/ReadOnlyFilesystem.php → ...system/Mixin/trait-readonlyfilesystem.php b/...s/Filesystem/Mixin/ReadOnlyFilesystem.php → ...system/Mixin/trait-readonlyfilesystem.php
diff --git a/...lesystem/Mixin/RenameFileViaCopyAndRm.php → ...em/Mixin/trait-renamefileviacopyandrm.php b/...lesystem/Mixin/RenameFileViaCopyAndRm.php → ...em/Mixin/trait-renamefileviacopyandrm.php
diff --git a/...nents/Filesystem/Mixin/RmdirRecursive.php → ...Filesystem/Mixin/trait-rmdirrecursive.php b/...nents/Filesystem/Mixin/RmdirRecursive.php → ...Filesystem/Mixin/trait-rmdirrecursive.php
diff --git a/components/Filesystem/Path/WindowsPath.php → ...nts/Filesystem/Path/class-windowspath.php b/components/Filesystem/Path/WindowsPath.php → ...nts/Filesystem/Path/class-windowspath.php
diff --git a/...s/Filesystem/Visitor/FileVisitorEvent.php → ...system/Visitor/class-filevisitorevent.php b/...s/Filesystem/Visitor/FileVisitorEvent.php → ...system/Visitor/class-filevisitorevent.php
diff --git a/.../Filesystem/Visitor/FilesystemVisitor.php → .../Visitor/interface-filesystem-visitor.php b/.../Filesystem/Visitor/FilesystemVisitor.php → .../Visitor/interface-filesystem-visitor.php
diff --git a/...onents/Filesystem/FilesystemException.php → .../Filesystem/class-filesystemexception.php b/...onents/Filesystem/FilesystemException.php → .../Filesystem/class-filesystemexception.php
diff --git a/components/Filesystem/InMemoryFilesystem.php → ...s/Filesystem/class-inmemoryfilesystem.php b/components/Filesystem/InMemoryFilesystem.php → ...s/Filesystem/class-inmemoryfilesystem.php
diff --git a/components/Filesystem/LocalFilesystem.php → ...ents/Filesystem/class-localfilesystem.php b/components/Filesystem/LocalFilesystem.php → ...ents/Filesystem/class-localfilesystem.php
diff --git a/components/Filesystem/SQLiteFilesystem.php → ...nts/Filesystem/class-sqlitefilesystem.php b/components/Filesystem/SQLiteFilesystem.php → ...nts/Filesystem/class-sqlitefilesystem.php
diff --git a/components/Filesystem/UploadedFilesystem.php → ...s/Filesystem/class-uploadedfilesystem.php b/components/Filesystem/UploadedFilesystem.php → ...s/Filesystem/class-uploadedfilesystem.php
diff --git a/components/Filesystem/Filesystem.php → ...nents/Filesystem/interface-filesystem.php b/components/Filesystem/Filesystem.php → ...nents/Filesystem/interface-filesystem.php
diff --git a/components/Git/Model/Commit.php → components/Git/Model/class-commit.php b/components/Git/Model/Commit.php → components/Git/Model/class-commit.php
diff --git a/components/Git/Model/Tree.php → components/Git/Model/class-tree.php b/components/Git/Model/Tree.php → components/Git/Model/class-tree.php
diff --git a/components/Git/Model/TreeEntry.php → components/Git/Model/class-treeentry.php b/components/Git/Model/TreeEntry.php → components/Git/Model/class-treeentry.php
diff --git a/...ents/Git/Protocol/Parser/CommitParser.php → ...it/Protocol/Parser/class-commitparser.php b/...ents/Git/Protocol/Parser/CommitParser.php → ...it/Protocol/Parser/class-commitparser.php
diff --git a/...nts/Git/Protocol/Parser/DeltaResolver.php → ...t/Protocol/Parser/class-deltaresolver.php b/...nts/Git/Protocol/Parser/DeltaResolver.php → ...t/Protocol/Parser/class-deltaresolver.php
diff --git a/...it/Protocol/Parser/GitProtocolDecoder.php → ...tocol/Parser/class-gitprotocoldecoder.php b/...it/Protocol/Parser/GitProtocolDecoder.php → ...tocol/Parser/class-gitprotocoldecoder.php
diff --git a/...ents/Git/Protocol/Parser/PacketParser.php → ...it/Protocol/Parser/class-packetparser.php b/...ents/Git/Protocol/Parser/PacketParser.php → ...it/Protocol/Parser/class-packetparser.php
diff --git a/...onents/Git/Protocol/Parser/PackParser.php → .../Git/Protocol/Parser/class-packparser.php b/...onents/Git/Protocol/Parser/PackParser.php → .../Git/Protocol/Parser/class-packparser.php
diff --git a/...Protocol/Parser/ProtocolDemultiplexer.php → ...ol/Parser/class-protocoldemultiplexer.php b/...Protocol/Parser/ProtocolDemultiplexer.php → ...ol/Parser/class-protocoldemultiplexer.php
diff --git a/...onents/Git/Protocol/Parser/TreeParser.php → .../Git/Protocol/Parser/class-treeparser.php b/...onents/Git/Protocol/Parser/TreeParser.php → .../Git/Protocol/Parser/class-treeparser.php
diff --git a/...s/Git/Protocol/GitProtocolEncoderPipe.php → ...Protocol/class-gitprotocolencoderpipe.php b/...s/Git/Protocol/GitProtocolEncoderPipe.php → ...Protocol/class-gitprotocolencoderpipe.php
diff --git a/...it/Protocol/PackfileEncoderReadStream.php → ...tocol/class-packfileencoderreadstream.php b/...it/Protocol/PackfileEncoderReadStream.php → ...tocol/class-packfileencoderreadstream.php
diff --git a/components/Git/GitEndpoint.php → components/Git/class-gitendpoint.php b/components/Git/GitEndpoint.php → components/Git/class-gitendpoint.php
diff --git a/components/Git/GitException.php → components/Git/class-gitexception.php b/components/Git/GitException.php → components/Git/class-gitexception.php
diff --git a/components/Git/GitFilesystem.php → components/Git/class-gitfilesystem.php b/components/Git/GitFilesystem.php → components/Git/class-gitfilesystem.php
diff --git a/components/Git/GitObjectDecoder.php → components/Git/class-gitobjectdecoder.php b/components/Git/GitObjectDecoder.php → components/Git/class-gitobjectdecoder.php
diff --git a/components/Git/GitObjectEncoder.php → components/Git/class-gitobjectencoder.php b/components/Git/GitObjectEncoder.php → components/Git/class-gitobjectencoder.php
diff --git a/...ents/Git/GitPathDoesNotExistException.php → ...it/class-gitpathdoesnotexistexception.php b/...ents/Git/GitPathDoesNotExistException.php → ...it/class-gitpathdoesnotexistexception.php
diff --git a/components/Git/GitRemote.php → components/Git/class-gitremote.php b/components/Git/GitRemote.php → components/Git/class-gitremote.php
diff --git a/components/Git/GitRemoteException.php → components/Git/class-gitremoteexception.php b/components/Git/GitRemoteException.php → components/Git/class-gitremoteexception.php
diff --git a/components/Git/GitRepository.php → components/Git/class-gitrepository.php b/components/Git/GitRepository.php → components/Git/class-gitrepository.php
diff --git a/...ss-wp-html-active-formatting-elements.php → .../class-wphtmlactiveformattingelements.php b/...ss-wp-html-active-formatting-elements.php → .../class-wphtmlactiveformattingelements.php
diff --git a/...ts/HTML/class-wp-html-attribute-token.php → ...nents/HTML/class-wphtmlattributetoken.php b/...ts/HTML/class-wp-html-attribute-token.php → ...nents/HTML/class-wphtmlattributetoken.php
diff --git a/components/HTML/class-wp-html-decoder.php → components/HTML/class-wphtmldecoder.php b/components/HTML/class-wp-html-decoder.php → components/HTML/class-wphtmldecoder.php
diff --git a/...nents/HTML/class-wp-html-doctype-info.php → components/HTML/class-wphtmldoctypeinfo.php b/...nents/HTML/class-wp-html-doctype-info.php → components/HTML/class-wphtmldoctypeinfo.php
diff --git a/...ents/HTML/class-wp-html-open-elements.php → components/HTML/class-wphtmlopenelements.php b/...ents/HTML/class-wp-html-open-elements.php → components/HTML/class-wphtmlopenelements.php
diff --git a/components/HTML/class-wp-html-processor.php → components/HTML/class-wphtmlprocessor.php b/components/HTML/class-wp-html-processor.php → components/HTML/class-wphtmlprocessor.php
diff --git a/...ts/HTML/class-wp-html-processor-state.php → ...nents/HTML/class-wphtmlprocessorstate.php b/...ts/HTML/class-wp-html-processor-state.php → ...nents/HTML/class-wphtmlprocessorstate.php
diff --git a/components/HTML/class-wp-html-span.php → components/HTML/class-wphtmlspan.php b/components/HTML/class-wp-html-span.php → components/HTML/class-wphtmlspan.php
diff --git a/...onents/HTML/class-wp-html-stack-event.php → components/HTML/class-wphtmlstackevent.php b/...onents/HTML/class-wp-html-stack-event.php → components/HTML/class-wphtmlstackevent.php
diff --git a/...ents/HTML/class-wp-html-tag-processor.php → components/HTML/class-wphtmltagprocessor.php b/...ents/HTML/class-wp-html-tag-processor.php → components/HTML/class-wphtmltagprocessor.php
diff --git a/...s/HTML/class-wp-html-text-replacement.php → ...ents/HTML/class-wphtmltextreplacement.php b/...s/HTML/class-wp-html-text-replacement.php → ...ents/HTML/class-wphtmltextreplacement.php
diff --git a/components/HTML/class-wp-html-token.php → components/HTML/class-wphtmltoken.php b/components/HTML/class-wp-html-token.php → components/HTML/class-wphtmltoken.php
diff --git a/...L/class-wp-html-unsupported-exception.php → ...HTML/class-wphtmlunsupportedexception.php b/...L/class-wp-html-unsupported-exception.php → ...HTML/class-wphtmlunsupportedexception.php
diff --git a/components/HTML/class-wp-token-map.php → components/HTML/class-wptokenmap.php b/components/HTML/class-wp-token-map.php → components/HTML/class-wptokenmap.php
diff --git a/...t/ByteStream/ChunkedDecoderReadStream.php → ...Stream/class-chunkeddecoderreadstream.php b/...t/ByteStream/ChunkedDecoderReadStream.php → ...Stream/class-chunkeddecoderreadstream.php
diff --git a/...eStream/ChunkedEncoderByteTransformer.php → ...m/class-chunkedencoderbytetransformer.php b/...eStream/ChunkedEncoderByteTransformer.php → ...m/class-chunkedencoderbytetransformer.php
diff --git a/...tpClient/ByteStream/RequestReadStream.php → ...nt/ByteStream/class-requestreadstream.php b/...tpClient/ByteStream/RequestReadStream.php → ...nt/ByteStream/class-requestreadstream.php
diff --git a/.../ByteStream/SeekableRequestReadStream.php → ...tream/class-seekablerequestreadstream.php b/.../ByteStream/SeekableRequestReadStream.php → ...tream/class-seekablerequestreadstream.php
diff --git a/...HttpClient/Middleware/CacheMiddleware.php → ...ient/Middleware/class-cachemiddleware.php b/...HttpClient/Middleware/CacheMiddleware.php → ...ient/Middleware/class-cachemiddleware.php
diff --git a/.../HttpClient/Middleware/HttpMiddleware.php → ...lient/Middleware/class-httpmiddleware.php b/.../HttpClient/Middleware/HttpMiddleware.php → ...lient/Middleware/class-httpmiddleware.php
diff --git a/...ient/Middleware/RedirectionMiddleware.php → ...iddleware/class-redirectionmiddleware.php b/...ient/Middleware/RedirectionMiddleware.php → ...iddleware/class-redirectionmiddleware.php
diff --git a/...Client/Middleware/MiddlewareInterface.php → ...lient/Middleware/middleware-interface.php b/...Client/Middleware/MiddlewareInterface.php → ...lient/Middleware/middleware-interface.php
diff --git a/components/HttpClient/Tests/CacheMiddlewareIntegrationTest.php b/components/HttpClient/Tests/CacheMiddlewareIntegrationTest.php
@@ -7,6 +7,8 @@
 use WordPress\HttpClient\Client;
 use WordPress\HttpClient\Request;
 
+require_once __DIR__ . '/WithServerTrait.php';
+
 class CacheMiddlewareIntegrationTest extends TestCase {
 
 	use WithServerTrait;

diff --git a/components/HttpClient/Tests/CurlTransportTest.php b/components/HttpClient/Tests/CurlTransportTest.php
@@ -6,6 +6,8 @@
 use WordPress\HttpClient\HttpError;
 use WordPress\HttpClient\Request;
 
+require_once __DIR__ . '/ClientTestBase.php';
+
 class CurlTransportTest extends ClientTestBase {
 
     public function test_unsupported_encoding() {

diff --git a/components/HttpClient/Tests/SocketTransportTest.php b/components/HttpClient/Tests/SocketTransportTest.php
@@ -5,6 +5,8 @@
 use WordPress\HttpClient\Client;
 use WordPress\HttpClient\Request;
 
+require_once __DIR__ . '/ClientTestBase.php';
+
 class SocketTransportTest extends ClientTestBase {
 
     public function test_unsupported_encoding() {

diff --git a/...ts/HttpClient/Transport/CurlTransport.php → ...pClient/Transport/class-curltransport.php b/...ts/HttpClient/Transport/CurlTransport.php → ...pClient/Transport/class-curltransport.php
diff --git a/.../HttpClient/Transport/SocketTransport.php → ...lient/Transport/class-sockettransport.php b/.../HttpClient/Transport/SocketTransport.php → ...lient/Transport/class-sockettransport.php
diff --git a/...tpClient/Transport/TransportInterface.php → ...ransport/interface-transportinterface.php b/...tpClient/Transport/TransportInterface.php → ...ransport/interface-transportinterface.php
diff --git a/components/HttpClient/Client.php → components/HttpClient/class-client.php b/components/HttpClient/Client.php → components/HttpClient/class-client.php
diff --git a/components/HttpClient/ClientState.php → components/HttpClient/class-clientstate.php b/components/HttpClient/ClientState.php → components/HttpClient/class-clientstate.php
diff --git a/components/HttpClient/Connection.php → components/HttpClient/class-connection.php b/components/HttpClient/Connection.php → components/HttpClient/class-connection.php
diff --git a/components/HttpClient/Crawler.php → components/HttpClient/class-crawler.php b/components/HttpClient/Crawler.php → components/HttpClient/class-crawler.php
diff --git a/...onents/HttpClient/HttpClientException.php → .../HttpClient/class-httpclientexception.php b/...onents/HttpClient/HttpClientException.php → .../HttpClient/class-httpclientexception.php
diff --git a/components/HttpClient/HttpError.php → components/HttpClient/class-httperror.php b/components/HttpClient/HttpError.php → components/HttpClient/class-httperror.php
diff --git a/components/HttpClient/Request.php → components/HttpClient/class-request.php b/components/HttpClient/Request.php → components/HttpClient/class-request.php
diff --git a/components/HttpClient/Response.php → components/HttpClient/class-response.php b/components/HttpClient/Response.php → components/HttpClient/class-response.php
diff --git a/...rver/Response/BufferingResponseWriter.php → ...esponse/class-bufferingresponsewriter.php b/...rver/Response/BufferingResponseWriter.php → ...esponse/class-bufferingresponsewriter.php
diff --git a/...tpServer/Response/ResponseWriteStream.php → ...er/Response/class-responsewritestream.php b/...tpServer/Response/ResponseWriteStream.php → ...er/Response/class-responsewritestream.php
diff --git a/...rver/Response/StreamingResponseWriter.php → ...esponse/class-streamingresponsewriter.php b/...rver/Response/StreamingResponseWriter.php → ...esponse/class-streamingresponsewriter.php
diff --git a/...erver/Response/TcpResponseWriteStream.php → ...Response/class-tcpresponsewritestream.php b/...erver/Response/TcpResponseWriteStream.php → ...Response/class-tcpresponsewritestream.php
diff --git a/components/HttpServer/IncomingRequest.php → ...ents/HttpServer/class-incomingrequest.php b/components/HttpServer/IncomingRequest.php → ...ents/HttpServer/class-incomingrequest.php
diff --git a/components/HttpServer/StatusCode.php → components/HttpServer/class-statuscode.php b/components/HttpServer/StatusCode.php → components/HttpServer/class-statuscode.php
diff --git a/components/HttpServer/TcpServer.php → components/HttpServer/class-tcpserver.php b/components/HttpServer/TcpServer.php → components/HttpServer/class-tcpserver.php
diff --git a/components/Markdown/MarkdownConsumer.php → ...nents/Markdown/class-markdownconsumer.php b/components/Markdown/MarkdownConsumer.php → ...nents/Markdown/class-markdownconsumer.php
diff --git a/components/Markdown/MarkdownImporter.php → ...nents/Markdown/class-markdownimporter.php b/components/Markdown/MarkdownImporter.php → ...nents/Markdown/class-markdownimporter.php
diff --git a/components/Markdown/MarkdownProducer.php → ...nents/Markdown/class-markdownproducer.php b/components/Markdown/MarkdownProducer.php → ...nents/Markdown/class-markdownproducer.php
diff --git a/components/Merge/Diff/Diff.php → components/Merge/Diff/class-diff.php b/components/Merge/Diff/Diff.php → components/Merge/Diff/class-diff.php
diff --git a/components/Merge/Diff/Differ.php → components/Merge/Diff/class-differ.php b/components/Merge/Diff/Differ.php → components/Merge/Diff/class-differ.php
diff --git a/components/Merge/Diff/LineDiffer.php → components/Merge/Diff/class-linediffer.php b/components/Merge/Diff/LineDiffer.php → components/Merge/Diff/class-linediffer.php
diff --git a/components/Merge/Diff/MyersDiffer.php → components/Merge/Diff/class-myersdiffer.php b/components/Merge/Diff/MyersDiffer.php → components/Merge/Diff/class-myersdiffer.php
diff --git a/components/Merge/Merge/Chunk.php → components/Merge/Merge/class-chunk.php b/components/Merge/Merge/Chunk.php → components/Merge/Merge/class-chunk.php
diff --git a/components/Merge/Merge/ChunkMerger.php → components/Merge/Merge/class-chunkmerger.php b/components/Merge/Merge/ChunkMerger.php → components/Merge/Merge/class-chunkmerger.php
diff --git a/components/Merge/Merge/LineMerger.php → components/Merge/Merge/class-linemerger.php b/components/Merge/Merge/LineMerger.php → components/Merge/Merge/class-linemerger.php
diff --git a/components/Merge/Merge/MergeConflict.php → ...nents/Merge/Merge/class-mergeconflict.php b/components/Merge/Merge/MergeConflict.php → ...nents/Merge/Merge/class-mergeconflict.php
diff --git a/components/Merge/Merge/Merger.php → components/Merge/Merge/class-merger.php b/components/Merge/Merge/Merger.php → components/Merge/Merge/class-merger.php
diff --git a/components/Merge/Merge/MergeResult.php → components/Merge/Merge/class-mergeresult.php b/components/Merge/Merge/MergeResult.php → components/Merge/Merge/class-mergeresult.php
diff --git a/...ge/Validate/BlockMarkupMergeValidator.php → ...idate/class-blockmarkupmergevalidator.php b/...ge/Validate/BlockMarkupMergeValidator.php → ...idate/class-blockmarkupmergevalidator.php
diff --git a/.../Merge/Validate/InvalidMergeException.php → .../Validate/class-invalidmergeexception.php b/.../Merge/Validate/InvalidMergeException.php → .../Validate/class-invalidmergeexception.php
diff --git a/components/Merge/Validate/MergeValidator.php → ...s/Merge/Validate/class-mergevalidator.php b/components/Merge/Validate/MergeValidator.php → ...s/Merge/Validate/class-mergevalidator.php
diff --git a/...nents/Merge/__ExperimentalDiffRebaser.php → ...s/Merge/class-experimentaldiffrebaser.php b/...nents/Merge/__ExperimentalDiffRebaser.php → ...s/Merge/class-experimentaldiffrebaser.php
diff --git a/components/Merge/MergeException.php → components/Merge/class-mergeexception.php b/components/Merge/MergeException.php → components/Merge/class-mergeexception.php
diff --git a/components/Merge/MergeStrategy.php → components/Merge/class-mergestrategy.php b/components/Merge/MergeStrategy.php → components/Merge/class-mergestrategy.php
diff --git a/components/XML/XMLAttributeToken.php → components/XML/class-xmlattributetoken.php b/components/XML/XMLAttributeToken.php → components/XML/class-xmlattributetoken.php
diff --git a/components/XML/XMLDecoder.php → components/XML/class-xmldecoder.php b/components/XML/XMLDecoder.php → components/XML/class-xmldecoder.php
diff --git a/components/XML/XMLElement.php → components/XML/class-xmlelement.php b/components/XML/XMLElement.php → components/XML/class-xmlelement.php
diff --git a/components/XML/XMLProcessor.php → components/XML/class-xmlprocessor.php b/components/XML/XMLProcessor.php → components/XML/class-xmlprocessor.php
diff --git a/components/XML/XMLUnsupportedException.php → ...nts/XML/class-xmlunsupportedexception.php b/components/XML/XMLUnsupportedException.php → ...nts/XML/class-xmlunsupportedexception.php
diff --git a/components/XML/composer.json b/components/XML/composer.json
@@ -16,9 +16,9 @@
 		"php": ">=7.2"
 	},
 	"autoload": {
-		"psr-4": {
-			"WordPress\\XML\\": ""
-		},
+		"classmap": [
+			"./"
+		],
 		"exclude-from-classmap": [
 			"/Tests/"
 		]

diff --git a/components/Zip/CentralDirectoryEntry.php → ...nents/Zip/class-centraldirectoryentry.php b/components/Zip/CentralDirectoryEntry.php → ...nents/Zip/class-centraldirectoryentry.php
diff --git a/components/Zip/EndCentralDirectoryEntry.php → ...ts/Zip/class-endcentraldirectoryentry.php b/components/Zip/EndCentralDirectoryEntry.php → ...ts/Zip/class-endcentraldirectoryentry.php
diff --git a/components/Zip/FileEntry.php → components/Zip/class-fileentry.php b/components/Zip/FileEntry.php → components/Zip/class-fileentry.php
diff --git a/components/Zip/ZipDecoder.php → components/Zip/class-zipdecoder.php b/components/Zip/ZipDecoder.php → components/Zip/class-zipdecoder.php
diff --git a/components/Zip/ZipEncoder.php → components/Zip/class-zipencoder.php b/components/Zip/ZipEncoder.php → components/Zip/class-zipencoder.php
diff --git a/components/Zip/ZipFilesystem.php → components/Zip/class-zipfilesystem.php b/components/Zip/ZipFilesystem.php → components/Zip/class-zipfilesystem.php
diff --git a/composer-ci-matrix-tests.json b/composer-ci-matrix-tests.json
@@ -35,11 +35,23 @@
         ],
         "classmap": [
             "components/BlockParser/",
+            "components/Blueprints/",
             "components/Blueprints/vendor-patched/",
+            "components/CLI/",
+            "components/DataLiberation/",
             "components/DataLiberation/vendor-patched/",
+            "components/Filesystem/",
+            "components/Git/",
+            "components/HTML/./",
+            "components/HttpClient/",
+            "components/HttpServer/",
+            "components/Markdown/",
             "components/Markdown/vendor-patched",
+            "components/Merge/",
             "components/Merge/vendor-patched",
-            "components/HTML/./"
+            "components/ByteStream/",
+            "components/XML/",
+            "components/Zip/"
         ],
         "files": [
             "components/DataLiberation/URL/functions.php",
@@ -52,20 +64,9 @@
             "components/Git/functions.php"
         ],
         "psr-4": {
-            "WordPress\\Blueprints\\": "components/Blueprints/",
-            "WordPress\\DataLiberation\\": "components/DataLiberation/",
             "Rowbot\\": "components/DataLiberation/vendor-patched/",
             "Brick\\": "components/DataLiberation/vendor-patched/",
-            "WordPress\\HttpClient\\": "components/HttpClient/",
-            "WordPress\\Merge\\": "components/Merge/",
-            "WordPress\\Markdown\\": "components/Markdown/",
-            "WordPress\\Filesystem\\": "components/Filesystem/",
-            "WordPress\\XML\\": "components/XML/",
-            "WordPress\\ByteStream\\": "components/ByteStream/",
-            "WordPress\\Zip\\": "components/Zip/",
-            "WordPress\\HttpServer\\": "components/HttpServer/",
-            "WordPress\\CORSProxy\\": "components/CORSProxy/",
-            "WordPress\\Git\\": "components/Git/"
+            "WordPress\\CORSProxy\\": "components/CORSProxy/"
         }
     },
     "scripts": {

diff --git a/composer.json b/composer.json
@@ -38,11 +38,23 @@
         ],
         "classmap": [
             "components/BlockParser/",
+            "components/Blueprints/",
             "components/Blueprints/vendor-patched/",
+            "components/CLI/",
+            "components/DataLiberation/",
             "components/DataLiberation/vendor-patched/",
+            "components/Filesystem/",
+            "components/Git/",
+            "components/HTML/./",
+            "components/HttpClient/",
+            "components/HttpServer/",
+            "components/Markdown/",
             "components/Markdown/vendor-patched",
+            "components/Merge/",
             "components/Merge/vendor-patched",
-            "components/HTML/./"
+            "components/ByteStream/",
+            "components/XML/",
+            "components/Zip/"
         ],
         "files": [
             "components/DataLiberation/URL/functions.php",
@@ -56,21 +68,9 @@
             "components/Git/functions.php"
         ],
         "psr-4": {
-            "WordPress\\Blueprints\\": "components/Blueprints/",
-            "WordPress\\CLI\\": "components/CLI/",
-            "WordPress\\DataLiberation\\": "components/DataLiberation/",
             "Rowbot\\": "components/DataLiberation/vendor-patched/",
             "Brick\\": "components/DataLiberation/vendor-patched/",
-            "WordPress\\HttpClient\\": "components/HttpClient/",
-            "WordPress\\Merge\\": "components/Merge/",
-            "WordPress\\Markdown\\": "components/Markdown/",
-            "WordPress\\Filesystem\\": "components/Filesystem/",
-            "WordPress\\XML\\": "components/XML/",
-            "WordPress\\ByteStream\\": "components/ByteStream/",
-            "WordPress\\Zip\\": "components/Zip/",
-            "WordPress\\HttpServer\\": "components/HttpServer/",
-            "WordPress\\CORSProxy\\": "components/CORSProxy/",
-            "WordPress\\Git\\": "components/Git/"
+            "WordPress\\CORSProxy\\": "components/CORSProxy/"
         }
     },
     "scripts": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,8 @@ @@
     use function WordPress\Filesystem\wp_join_unix_paths;
+    require_once __DIR__ . '/StepTestCase.php';
     class RunPHPStepTest extends StepTestCase {
     	/**
@@ Expand Down @@