Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Use php-cs-fixer directly #420

Merged
merged 1 commit into from
Jan 22, 2024

Conversation

brotkrueml
Copy link
Contributor

The typo3/coding-standards package isn't compatible with Symfony 7 yet. But as this is only a proxy package for php-cs-fixer defining some rules, we can use php-cs-fixer directly.

The configuration from the TYPO3 Core is used.

See: https://github.com/TYPO3/typo3/blob/main/Build/php-cs-fixer/config.php
Related: TYPO3-Documentation/Changelog-To-Doc#786
Releases: main, 12.4

The typo3/coding-standards package isn't compatible with Symfony 7 yet. But as this is only
a proxy package for php-cs-fixer defining some rules, we can use php-cs-fixer directly.

The configuration from the TYPO3 Core is used.

See: https://github.com/TYPO3/typo3/blob/main/Build/php-cs-fixer/config.php
Related: TYPO3-Documentation/Changelog-To-Doc#786
Releases: main, 12.4
@brotkrueml
Copy link
Contributor Author

The PHP minimum version is fixed with #419.

@brotkrueml brotkrueml merged commit 02bd0db into TYPO3-Documentation:main Jan 22, 2024
1 of 2 checks passed
@brotkrueml brotkrueml deleted the php-cs-fixer branch January 22, 2024 13:15
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply cdabb54... [CI] Use php-cs-fixer directly
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging composer.json
CONFLICT (content): Merge conflict in composer.json

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-420-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick cdabb54a689cb4fbef4bdb6b4613228197ad4a52
# Push it to GitHub
git push --set-upstream origin backport-420-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-420-to-12.4.

brotkrueml added a commit to brotkrueml/TYPO3CMS-Reference-TSconfig that referenced this pull request Jan 22, 2024
The typo3/coding-standards package isn't compatible with Symfony 7 yet. But as this is only
a proxy package for php-cs-fixer defining some rules, we can use php-cs-fixer directly.

The configuration from the TYPO3 Core is used.

See: https://github.com/TYPO3/typo3/blob/main/Build/php-cs-fixer/config.php
Related: TYPO3-Documentation/Changelog-To-Doc#786
Releases: main, 12.4
brotkrueml added a commit that referenced this pull request Jan 22, 2024
The typo3/coding-standards package isn't compatible with Symfony 7 yet. But as this is only
a proxy package for php-cs-fixer defining some rules, we can use php-cs-fixer directly.

The configuration from the TYPO3 Core is used.

See: https://github.com/TYPO3/typo3/blob/main/Build/php-cs-fixer/config.php
Related: TYPO3-Documentation/Changelog-To-Doc#786
Releases: main, 12.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants