[Backport 13.4] [TASK] Indent the PHP examples with two spaces - #877
Merged
Merged
Conversation
The shared .editorconfig asks code examples to indent two spaces, so that a nested example still fits the 80 characters the prose around it is wrapped to. php-cs-fixer would undo that at the next `make fix`: without Config::setIndent() it normalises every example back to the four spaces PER-CS prescribes, silently and without a conflict. The fixer now indents two, and the three PHP files under Documentation/ follow in the same commit. Separately this does not work — the CGL check runs as a dry run in CI and would fail from the moment the setting lands until the files match it. The second fixer config in the repository root goes with it. It is a copy of the one under Build/, differing only in the path it hands the finder, and nothing reads it: Build/Scripts/runTests.sh names Build/.php-cs-fixer.dist.php in both the check and the fix command, and no Makefile target, workflow or composer script mentions the other. Left in place it would be the file someone edits when the two disagree. Whitespace only in the examples, git diff -w is empty there. The repository was CGL-clean beforehand, so nothing unrelated hides in the diff. Belongs with #873, which brings the .editorconfig itself. Releases: main, 14.3, 13.4 Assisted-by: Claude Opus 5 <noreply@anthropic.com> Signed-off-by: Lina Wolf Signed-off-by: Lina Wolf (cherry picked from commit 78ed1a3)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Backport of #876 to
13.4.