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

Removed some PHPStan ignoreErrors #5356

Merged
merged 1 commit into from
Feb 4, 2025

Conversation

rldhont
Copy link
Collaborator

@rldhont rldhont commented Feb 4, 2025

Remove some PHPStan ignore errors

@rldhont rldhont added php Pull requests that update Php code backport release_3_8 backport release_3_9 labels Feb 4, 2025
@github-actions github-actions bot added this to the 3.10.0 milestone Feb 4, 2025
@rldhont rldhont force-pushed the phpstan-baseline-clean branch from 63e5a05 to 9197473 Compare February 4, 2025 16:11
@rldhont rldhont merged commit 4142ee2 into 3liz:master Feb 4, 2025
17 checks passed
@3liz-bot
Copy link
Contributor

3liz-bot commented Feb 4, 2025

The backport to release_3_8 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 91974731d... Removed some PHPStan ignoreErrors
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 set advice.mergeConflict false"

stdout
Auto-merging phpstan-baseline.neon
CONFLICT (content): Merge conflict in phpstan-baseline.neon

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

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

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