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] Mark properties as private in AdminModuleController #283

Merged
merged 1 commit into from
Aug 25, 2024

Conversation

brotkrueml
Copy link
Contributor

As the class is defined as final, it does not make sense to set the properties as protected as this class cannot be extended.

Releases: main, 12.4

As the class is defined as final, it does not make sense to set the properties as
protected as this class cannot be extended.

Releases: main, 12.4
@froemken froemken merged commit a1d9423 into main Aug 25, 2024
11 checks passed
@froemken froemken deleted the adminmodulecontroller-private branch August 25, 2024 07:46
Copy link

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply ca299c4... [TASK] Mark properties as private in AdminModuleController
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
Auto-merging Classes/Controller/AdminModuleController.php
CONFLICT (content): Merge conflict in Classes/Controller/AdminModuleController.php

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-283-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ca299c47b1646516e481cb9d0a96a5d3fb58bb93
# Push it to GitHub
git push --set-upstream origin backport-283-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-283-to-12.4.

froemken pushed a commit that referenced this pull request Aug 25, 2024
As the class is defined as final, it does not make sense to set the properties as
protected as this class cannot be extended.

Releases: main, 12.4
@froemken
Copy link
Contributor

Backport problem will be solved with PR: #284

sfroemkenjw pushed a commit that referenced this pull request Aug 26, 2024
* [TASK] Mark properties as private in AdminModuleController (#283)

As the class is defined as final, it does not make sense to set the properties as
protected as this class cannot be extended.

Releases: main, 12.4

* Remove empty line from ModuleController

---------

Co-authored-by: Chris Müller <[email protected]>
Co-authored-by: Lina Wolf <[email protected]>
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.

3 participants