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

[TASK] Establish a main "PHP architecture" chapter #5242

Merged
merged 2 commits into from
Jan 16, 2025

Conversation

lolli42
Copy link
Contributor

@lolli42 lolli42 commented Jan 16, 2025

The patch merges "CGl->PHP architecture" and
"CGL->PHP best practices" to a general new top
level chapter. This should give extension developers general thoughts about separation of concerns and
best practices at hand, and documents how core
development handles specific PHP related architectural questions.

The patch merges "CGl->PHP architecture" and
"CGL->PHP best practices" to a general new top
level chapter. This should give extension developers
general thoughts about separation of concerns and
best practices at hand, and documents how core
development handles specific PHP related architectural
questions.
linawolf
linawolf previously approved these changes Jan 16, 2025
@linawolf linawolf self-assigned this Jan 16, 2025
@linawolf linawolf added the backport 13.4 Backport to TYPO3v13 label Jan 16, 2025
@linawolf linawolf merged commit c7e4b51 into TYPO3-Documentation:main Jan 16, 2025
5 checks passed
Copy link
Contributor

The backport to 13.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1420cd5f7... [TASK] Establish a main "PHP architecture" chapter
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".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
CONFLICT (modify/delete): Documentation/CodingGuidelines/CodingBestPractices/Index.rst deleted in 1420cd5f7 ([TASK] Establish a main "PHP architecture" chapter) and modified in HEAD.  Version HEAD of Documentation/CodingGuidelines/CodingBestPractices/Index.rst left in tree.
CONFLICT (file location): Documentation/CodingGuidelines/CodingBestPractices/ClassNamesOfUserFiles.rst added in HEAD inside a directory that was renamed in 1420cd5f7 ([TASK] Establish a main "PHP architecture" chapter), suggesting it should perhaps be moved to Documentation/PhpArchitecture/ClassNamesOfUserFiles.rst.

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-13.4 13.4
# Navigate to the new working tree
cd .worktrees/backport-13.4
# Create a new branch
git switch --create backport-5242-to-13.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1420cd5f7ddecdd86cb9b9386bf82660418ba8e4,518a3879cb9c15109f86a53aff697137eebf6480
# Push it to GitHub
git push --set-upstream origin backport-5242-to-13.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-13.4

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

@lolli42 lolli42 deleted the lolli-13 branch January 16, 2025 17:25
linawolf pushed a commit that referenced this pull request Jan 17, 2025
* [TASK] Establish a main "PHP architecture" chapter

The patch merges "CGl->PHP architecture" and
"CGL->PHP best practices" to a general new top
level chapter. This should give extension developers
general thoughts about separation of concerns and
best practices at hand, and documents how core
development handles specific PHP related architectural
questions.

* Update Index.rst

---------

Co-authored-by: Lina Wolf <[email protected]>

(cherry picked from commit c7e4b51)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 13.4 Backport to TYPO3v13 backport-done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants