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.

Sign up for GitHub

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

Jump to bottom

TASK: Level up to phpstan 2 (Flow 9 adjustments) #3217

Merged
merged 5 commits into from
Jan 24, 2024
Merged

TASK: Level up to phpstan 2 (Flow 9 adjustments) #3217

merged 5 commits into from
Jan 24, 2024

Conversation

mhsdesign
Copy link
Member

@mhsdesign mhsdesign commented Nov 4, 2023 •
edited
Loading

The upgrade to phpstan level two was introduced via #3264, this holds the flow 9 specific adjustments.

Related (phpstan level 1) #3216

Upgrade instructions

Review instructions

Checklist

  • Code follows the PSR-2 coding style
  • Tests have been created, run and adjusted as needed
  • The PR is created against the lowest maintained branch
  • Reviewer - PR Title is brief but complete and starts with FEATURE|TASK|BUGFIX
  • Reviewer - The first section explains the change briefly for change-logs
  • Reviewer - Breaking Changes are marked wit !!! and have upgrade-instructions

mficzel
mficzel reviewed Nov 7, 2023
View reviewed changes
Copy link
Member

@mficzel mficzel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally like this very much, left some questions

mhsdesign
mhsdesign commented Nov 7, 2023
View reviewed changes
Copy link
Member Author

@mhsdesign mhsdesign left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

Neos.FluidAdaptor/Classes/View/TemplatePaths.php Show resolved Hide resolved
Neos.FluidAdaptor/Classes/Core/Parser/Interceptor/ResourceInterceptor.php Show resolved Hide resolved
@mhsdesign mhsdesign force-pushed the task/phpStanLevel2 branch 2 times, most recently from ee9dfbc to 1d29723 Compare November 7, 2023 21:11
Base automatically changed from task/addPhpStan to 9.0 November 8, 2023 10:39
@mhsdesign mhsdesign marked this pull request as ready for review November 8, 2023 10:40
@mhsdesign mhsdesign force-pushed the task/phpStanLevel2 branch 4 times, most recently from 9d12dc0 to 490eb2d Compare January 16, 2024 19:24
@mhsdesign
Copy link
Member Author

This is now ready to be merged. The tests are now completely green with phpstan level 2.

NOTE FOR REVIEWERS
Changes which do not seem self explanatory have been extracted into separate commits with in depth information.
Adding uncritical php type doc comments has been squashed into one commit.

@mhsdesign
Copy link
Member Author

Thänks @kitsunet ❤️

mhsdesign added a commit to mhsdesign/flow-development-collection that referenced this pull request Jan 17, 2024
@mhsdesign
TASK: Backport phpstan level 2 to Flow 8.3 and ignore to be fixed things
c51d0d4 
Flow 9 Pr neos#3217
@mhsdesign mhsdesign mentioned this pull request Jan 17, 2024
Merged
6 tasks
mhsdesign added a commit to mhsdesign/flow-development-collection that referenced this pull request Jan 17, 2024
@mhsdesign
TASK: Backport phpstan level 2 to Flow 8.3 and ignore to be fixed things
b1ce5f0 
Flow 9 Pr neos#3217
@mhsdesign
Copy link
Member Author

Fyi i also created a backport for Flow 8.3 #3264

bwaidelich
bwaidelich approved these changes Jan 17, 2024
View reviewed changes
Copy link
Member

@bwaidelich bwaidelich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 by reading

mhsdesign added a commit to mhsdesign/flow-development-collection that referenced this pull request Jan 17, 2024
@mhsdesign
TASK: Backport phpstan level 2 to Flow 8.3 and ignore to be fixed things
c1646dd 
Flow 9 Pr neos#3217
mhsdesign added a commit to mhsdesign/flow-development-collection that referenced this pull request Jan 17, 2024
@mhsdesign
TASK: Backport phpstan level 2 to Flow 8.3 and ignore to be fixed things
0145b9a 
Flow 9 Pr neos#3217
mhsdesign added a commit to mhsdesign/flow-development-collection that referenced this pull request Jan 17, 2024
@mhsdesign
TASK: Backport phpstan level 2 to Flow 8.3 and ignore to be fixed things
883ad0b 
Flow 9 Pr neos#3217
@mhsdesign
Copy link
Member Author

i think it would make sense to merge the backport first to not mess to much with the history: #3264

The backport basically contains all changes of TASK: **Pling pling** level up to phpstan 2 as cherry-pick plus an adjustment commit TASK: Backport phpstan level 2 to Flow 8.3 and ignore to be fixed things to make things work on 8.3

@mhsdesign mhsdesign marked this pull request as draft January 19, 2024 11:48
@mhsdesign mhsdesign force-pushed the task/phpStanLevel2 branch 2 times, most recently from 22cc909 to 100c5f3 Compare January 20, 2024 19:19
@mhsdesign mhsdesign marked this pull request as ready for review January 20, 2024 19:19
neos-bot pushed a commit to neos/eel that referenced this pull request Jan 20, 2024
@mhsdesign
TASK: Backport phpstan level 2 to Flow 8.3 and ignore to be fixed things
c23175d 
Flow 9 Pr neos/flow-development-collection#3217
neos-bot pushed a commit to neos/flow that referenced this pull request Jan 20, 2024
@mhsdesign
TASK: Backport phpstan level 2 to Flow 8.3 and ignore to be fixed things
ffb6107 
Flow 9 Pr neos/flow-development-collection#3217
neos-bot pushed a commit to neos/fluidadaptor that referenced this pull request Jan 20, 2024
@mhsdesign
TASK: Backport phpstan level 2 to Flow 8.3 and ignore to be fixed things
f79459e 
Flow 9 Pr neos/flow-development-collection#3217
@mhsdesign
TASK: Remove obsolete internal method `TemplatePaths::getPackagePriva…
664ab49 
…teResourcesPath`
@mhsdesign
TASK: `Neos\FluidAdaptor\Core\Parser\Interceptor\ResourceInterceptor:…
6562a70 
…:process` early return

Previously it was assumed that `$node` is always a `TextNode`, as the following code implies, by calling for example `getText`.
This might fail, as this is a generic processor.
And for full correctness we will just early return instead of causing an error.
@mhsdesign
TASK: Find a working workaround for phpstan to accept this weird situ…
17a46d2 
…ation

This must be cleaned up at some point:
See #3272
@mhsdesign
TASK: **Pling pling** level up to phpstan 2 - Flow 9 adjustments
984971c
@mhsdesign mhsdesign changed the title TASK: Level up to phpstan 2 TASK: Level up to phpstan 2 (Neos 9 adjustments) Jan 24, 2024
@mhsdesign mhsdesign changed the title TASK: Level up to phpstan 2 (Neos 9 adjustments) TASK: Level up to phpstan 2 (Flow 9 adjustments) Jan 24, 2024
@mhsdesign mhsdesign merged commit 3ca08aa into 9.0 Jan 24, 2024
10 checks passed
@mhsdesign mhsdesign deleted the task/phpStanLevel2 branch January 24, 2024 21:54
@mhsdesign mhsdesign restored the task/phpStanLevel2 branch January 25, 2024 08:23
@mhsdesign mhsdesign deleted the task/phpStanLevel2 branch January 25, 2024 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kitsunet kitsunet kitsunet approved these changes

@bwaidelich bwaidelich bwaidelich approved these changes

@mficzel mficzel Awaiting requested review from mficzel

@fcool fcool Awaiting requested review from fcool

@Sebobo Sebobo Awaiting requested review from Sebobo

@markusguenther markusguenther Awaiting requested review from markusguenther

@nezaniel nezaniel Awaiting requested review from nezaniel

@ahaeslich ahaeslich Awaiting requested review from ahaeslich

@grebaldi grebaldi Awaiting requested review from grebaldi

@albe albe Awaiting requested review from albe

@dlubitz dlubitz Awaiting requested review from dlubitz

Assignees
No one assigned
Labels
9.0 Task
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mhsdesign @bwaidelich @kitsunet @mficzel