Review main Merged Breaking

79449[!!!][TASK] Resolve remaining #[ReturnTypeWillChange] attributes

Thomas Hohn CR +2 V +2 Normal +64 −78 updated 06/20/23, 10:44

Commit message

Set `mixed` return types where it has been been marked
with the `#[ReturnTypeWillChange]` attribute.

Review

  • Code review CR +2 Done
    • Christian Kuhn +2
    • Oliver Klee +1
  • Verified V +2 Done
    • Christian Kuhn +2
    • Oliver Klee +1
    • core-ci +1 CI

Issues 3

Files 13

Review log 2129

Show 24 earlier messages
  1. Thomas Hohn uploaded patch set 1 06/16/23, 21:04

  2. core-ci voted on patch set 1 V -1 06/16/23, 21:07 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/42756

  3. Thomas Hohn uploaded patch set 2 V -1 06/16/23, 21:10

  4. core-ci voted on patch set 2 V +1 06/16/23, 21:17 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/42757

  1. Thomas Hohn updated the commit message in patch set 3 V +1 06/16/23, 21:17

  2. core-ci voted on patch set 3 V +1 06/16/23, 21:25 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/42758

  3. Oliver Klee voted on patch set 3 V +1 06/16/23, 21:52

  4. Thomas Hohn updated the commit message in patch set 4 V +1 06/16/23, 21:54

  5. Oliver Klee commented on patch set 4 06/16/23, 21:57

    AbstractFileCollection.php:80

    Isn't the identifier still a `string`?

    MetaDataAspect.php:93

    Now that we have the native return type, we can drop the PHPDoc annotation for it. (Ditto for all other similar instances that we're changing in this change.)

    ResourceCollection.php:158

    This still is an int. So I propose adding a `@return int` PHPDoc annotation.
  6. core-ci voted on patch set 4 V +1 06/16/23, 22:01 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/42759

  7. Thomas Hohn uploaded patch set 5 V +1 06/17/23, 05:59

  8. core-ci voted on patch set 5 V +1 06/17/23, 06:06 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/42768

  9. Oliver Klee commented on patch set 5 06/17/23, 08:08

    AbstractFileCollection.php:80 Reply

    Done

    ResourceCollection.php:158 Reply

    Done
  10. Oliver Klee commented on patch set 5 06/17/23, 08:08

    MetaDataAspect.php:93 Reply

    We still need to change some other occurrences.
  11. Thomas Hohn commented on patch set 5 06/17/23, 09:27

    MetaDataAspect.php:93 Reply

    Ack
  12. Oliver Klee commented on patch set 5 06/17/23, 10:12

    AbstractRecordCollection.php:101

    @return T|null

    LogRecord.php:306

    We can drop this PHPDoc annotation.

    FlashMessageQueue.php:86

    @return null

    MetaDataAspect.php:133

    We can drop this annotation.

    EmptyFileSearchResult.php:30

    @return null

    EmptyFileSearchResult.php:36

    @return null

    LazyLoadingProxy.php:192

    We can drop this annotation.

    LazyLoadingProxy.php:203

    @return int (I think)

    LazyObjectStorage.php:182

    @return TEntity|null

    QueryResult.php:157

    We can replace the @return and @phpstan-return with this now: ``` @return TValue|null ```

    QueryResult.php:194

    We can replace this now with: ``` @return TValue|false ```

    QueryResult.php:205

    We now can replace this with: ``` @return int|null ```

    ResourceCollection.php:153

    @return ResourceInterface|null
  13. Thomas Hohn commented on patch set 5 06/17/23, 10:24

    AbstractRecordCollection.php:101 Reply

    Done

    LogRecord.php:306 Reply

    Done

    FlashMessageQueue.php:86 Reply

    Done

    MetaDataAspect.php:133 Reply

    Done

    EmptyFileSearchResult.php:30 Reply

    Done

    EmptyFileSearchResult.php:36 Reply

    Done

    LazyLoadingProxy.php:192 Reply

    Done

    LazyLoadingProxy.php:203 Reply

    According to php storm int|string|null

    LazyObjectStorage.php:182 Reply

    Done

    QueryResult.php:157 Reply

    Done

    QueryResult.php:194 Reply

    Done

    QueryResult.php:205 Reply

    Done

    ResourceCollection.php:153 Reply

    Done
  14. Thomas Hohn uploaded patch set 6 V +1 06/17/23, 10:30

  15. core-ci voted on patch set 6 V +1 06/17/23, 10:38 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/42774

  16. Oliver Klee commented on patch set 6 06/17/23, 10:39

    LazyLoadingProxy.php:203 Reply

    Done
  17. Oliver Klee uploaded patch set 7 V +1 06/17/23, 10:51

  18. Oliver Klee voted on patch set 7 V +1 CR +1 06/17/23, 10:51

  19. core-ci voted on patch set 7 V +1 06/17/23, 10:58 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/42775

  20. Oliver Klee uploaded patch set 8 CR +1 V +1 06/17/23, 15:35

  21. Oliver Klee voted on patch set 8 V +1 CR +1 06/17/23, 15:35

  22. core-ci voted on patch set 8 V +1 06/17/23, 15:42 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/42782

  23. Thomas Hohn commented on patch set 8 06/19/23, 11:11

    LazyLoadingProxy.php:203 Reply

    Done
  24. Christian Kuhn voted on patch set 8 V +2 CR +2 06/20/23, 10:44

  25. Christian Kuhn merged patch set 9 06/20/23, 10:44