74576[BUGFIX] Fix typolink parameter stdWrap when using additional info
Commit message
Review
-
Code review CR +2 Done
- Stefan Bürk +2
- Benni Mack +1
-
Verified V +2 Done
- Stefan Bürk +2
- Benni Mack +1
- core-ci +1 CI
Issues 2
Files 3
Review log 1823
-
Felix Nagel uploaded patch set 1 05/09/22, 09:06
-
core-ci voted on patch set 1 V -1 05/09/22, 09:14 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/27018
-
Felix Nagel uploaded patch set 2 05/09/22, 09:28
-
Oliver Klee commented on patch set 2 05/09/22, 09:35
Is main not affected? (And usually, the "Releases" line should have all targeted releases, not only the target of the current branch-specific changeset.) -
Felix Nagel commented on patch set 2 05/09/22, 09:38
Reply
Not sure, but probably yes. Thing is, the whole typolink functionality has been refactored in main, so there needs to be a commit for 10.4 (see here: https://review.typo3.org/c/Packages/TYPO3.CMS/+/74534), 11.5 (this PR) and main separately. -
core-ci voted on patch set 2 V -1 05/09/22, 09:42 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/27019
-
Oliver Klee commented on patch set 2 05/09/22, 09:42
Reply
The the process is to start with main and create the 11.5 and 10.4 versions once the main version is merged. The releases line then should be: Releases: main, 11.5, 10.4 or Releases: main, 11.5 (You'll need to check with the Benni (I think) whether this bug fix is critical enough to go into 10.4. If he says it's not for 10.4, you can still user Composer patches on your installation(s) to have this patch in 10.4.) -
Felix Nagel commented on patch set 2 05/09/22, 09:49
Reply
Ok, thanks for the feedback. I will ask Benni then how to proceed. Can you give me a hint what phpstan wants me to fix? -
Oliver Klee commented on patch set 2 05/09/22, 10:10
Reply
It's the other way around: You've improved the code and removed one warning, which still is ignored via the baseline file. :-) You'll need to regenerate the baseline: ./Build/Scripts/runTests.sh -s phpstanGenerateBaseline -
Felix Nagel commented on patch set 2 05/09/22, 11:43
Reply
Ahhhhhh... that makes much more sense :-) I've tried this but had much more (unrelated?!) changes to phpstan-baseline.neon than I expected (added 71, removed 17 lines). -
Oliver Klee commented on patch set 2 05/11/22, 11:30
Reply
You also need to make sure to have the same PHPStan version installed (composer install) as different versions create slightly different baselines. -
Benni Mack updated the commit message in patch set 3 05/16/22, 08:39
-
core-ci voted on patch set 3 V -1 05/16/22, 08:47 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/27250
-
Benni Mack rebased onto patch set 4 05/25/22, 19:25
-
Benni Mack commented on patch set 4 05/25/22, 19:25
Reply
Master change now got merged, will make sure this one works again -
core-ci voted on patch set 4 V -1 05/25/22, 19:33 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/27465
-
Stefan Bürk uploaded patch set 5 05/25/22, 20:55
-
core-ci voted on patch set 5 V +1 05/25/22, 21:03 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/27467
-
Stefan Bürk commented on patch set 5 05/25/22, 21:05
@benni not sure what else to do, pipeline was red because of solved phpstan issue. ``` Build/Scripts/runTests.sh -s phpstanGenerateBaseline ``` removed one ignorePattern count ans get tests green. -
Benni Mack commented on patch set 5 V +1 CR +1 05/25/22, 21:11
Yes. that was it! Thank you! main patch is merged, can go in now. -
Stefan Bürk voted on patch set 5 V +2 CR +2 05/25/22, 21:14
-
Stefan Bürk commented on patch set 5 05/25/22, 21:14
Reply
Done -
Stefan Bürk merged patch set 6 05/25/22, 21:15