sdc-build-wp 5.6.13 → 5.6.14

package/.phpcs.xml

@@ -13,12 +13,6 @@
 	</rule>
 	<rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
 	<rule ref="Generic.WhiteSpace.LanguageConstructSpacing"/>
-	<rule ref="Generic.WhiteSpace.ScopeIndent">
-		<properties>
-			<property name="exact" value="true" />
-			<property name="indent" value="2"/>
-		</properties>
-	</rule>
 	<rule ref="Generic.WhiteSpace.ArbitraryParenthesesSpacing"/>
 	<rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
 	<rule ref="Generic.CodeAnalysis.EmptyPHPStatement"/>

package/lib/components/php.js

@@ -83,21 +83,33 @@ export default class PHPComponent extends BaseComponent {
 		} catch (error) {
 			// Filter out Time: and Memory: lines from error output
 			const filterLines = str => str
-				? str.split('\n').filter(line => !line.trim().startsWith('Time:') && !line.trim().startsWith('Memory:')).join('\n')
+				? str.split('\n').filter(line => !line.trim().startsWith('Time:') && !line.trim().startsWith('Memory:')).join('\n').trim()
 				: str;
-			if (filterLines(error.stderr)?.length && error.stderr.includes('No fixable errors were found')) {
+			const filteredStderr = filterLines(error.stderr);
+			const filteredStdout = filterLines(error.stdout);
+			if (filteredStderr && error.stderr.includes('No fixable errors were found')) {
 				// No fixable errors were found
 			} else if (
-				(filterLines(error.stderr)?.length && !error.stderr.trim().startsWith('Time:')) ||
-				(
-					filterLines(error.stdout)?.length &&
-					(
-						error.stdout.startsWith('ERROR:') ||
-						error.stdout.includes('FAILED TO FIX')
-					)
-				)
+				(filteredStderr && !error.stderr.trim().startsWith('Time:')) ||
+				(filteredStdout && (error.stdout.startsWith('ERROR:') || error.stdout.includes('FAILED TO FIX')))
 			) {
-				this.log(null, filterLines(error.stderr)?.length ? filterLines(error.stderr) : filterLines(error.stdout));
+				let detail = filteredStderr || filteredStdout;
+				// If phpcbf failed to fix remaining errors, run phpcs to surface the actual violations
+				if (error.stdout.includes('FAILED TO FIX') && options.lintType === 'fix') {
+					try {
+						const phpcsCmd = [`php`, `-d`, `memory_limit=2G`, `vendor/bin/phpcs`, phpFiles].join(' ');
+						const execPromise2 = promisify(exec);
+						await execPromise2(phpcsCmd, {
+							cwd: this.path.resolve(this.path.dirname(fileURLToPath(import.meta.url)), '../../')
+						});
+					} catch (phpcsError) {
+						const phpcsDetail = filterLines(phpcsError.stdout) || filterLines(phpcsError.stderr);
+						if (phpcsDetail) {
+							detail = phpcsDetail;
+						}
+					}
+				}
+				this.log(null, detail);
 				this.log('error', `Failed linting ${entryLabel.replace(this.project.path, '')} - See above error.`);
 				return false;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sdc-build-wp",
-	"version": "5.6.13",
+	"version": "5.6.14",
 	"description": "Custom WordPress build process.",
 	"engines": {
 		"node": ">=22"