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] Check request object in conditions #807

Conversation

brotkrueml
Copy link
Contributor

@brotkrueml brotkrueml merged commit afb340e into TYPO3-Documentation:main Sep 30, 2023
2 checks passed
@brotkrueml brotkrueml deleted the check-for-request-in-conditions branch September 30, 2023 06:46
@github-actions
Copy link

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 11bc825... [TASK] Check request object in conditions
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 Documentation/Conditions/Index.rst
CONFLICT (content): Merge conflict in Documentation/Conditions/Index.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-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-807-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 11bc82548c4a561016ae2785902e81ae09132921
# Push it to GitHub
git push --set-upstream origin backport-807-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5

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

@brotkrueml brotkrueml added backport-done Changes have been backported to other branches already and removed backport failed labels Oct 1, 2023
cundd added a commit to cundd/news that referenced this pull request Nov 1, 2023
Prevent the PHP error 'Unable to call method "getQueryParams" of non-object "request".' in contexts without a request object (i.e. CLI).

See matching pull request on TYPO3 core: TYPO3-Documentation/TYPO3CMS-Reference-Typoscript#807
georgringer pushed a commit to georgringer/news that referenced this pull request Nov 1, 2023
Prevent the PHP error 'Unable to call method "getQueryParams" of non-object "request".' in contexts without a request object (i.e. CLI).

See matching pull request on TYPO3 core: TYPO3-Documentation/TYPO3CMS-Reference-Typoscript#807
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 12.4 backport-done Changes have been backported to other branches already
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants