Simplify core source parsing

WordPress · Aug 15, 2022 · 5c7914e · 5c7914e
1 parent 408de61
commit 5c7914e
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/packages/env/lib/config/parse-config.js b/packages/env/lib/config/parse-config.js
@@ -38,10 +38,7 @@ module.exports = async function parseConfig( config, options ) {
 		port: config.port,
 		phpVersion: config.phpVersion,
 		coreSource: includeTestsPath(
-			parseSourceString(
-				await getCoreSourceString( config.core ),
-				options
-			),
+			await parseCoreSource( config.core, options ),
 			options
 		),
 		pluginSources: config.plugins.map( ( sourceString ) =>
@@ -62,17 +59,19 @@ module.exports = async function parseConfig( config, options ) {
 	};
 };
 
-async function getCoreSourceString( coreSource ) {
-	if ( coreSource ) {
-		return coreSource;
-	}
-	const wpVersion = await getLatestWordPressVersion();
-	if ( ! wpVersion ) {
-		throw new ValidationError(
-			'Could not find the latest WordPress version. There may be a network issue.'
-		);
+async function parseCoreSource( coreSource, options ) {
+	// An empty source means we should use the latest version of WordPress.
+	if ( ! coreSource ) {
+		const wpVersion = await getLatestWordPressVersion();
+		if ( ! wpVersion ) {
+			throw new ValidationError(
+				'Could not find the latest WordPress version. There may be a network issue.'
+			);
+		}
+
+		coreSource = `WordPress/WordPress#${ wpVersion }`;
 	}
-	return `WordPress/WordPress#${ wpVersion }`;
+	return parseSourceString( coreSource, options );
 }
 
 /**