Review 9.5 Merged

63782[BUGFIX] Properly merge RequireJS configuration

Daniel Goerz CR +2 V +2 Normal +55 −1 updated 03/20/20, 17:03

Commit message

If PageRenderer->addRequireJsConfiguration() is consecutively called,
the configuration is now properly merged by using
array_merge_recursive(). The previously used
ArrayUtility::mergeRecursiveWithOverrule() overrode any previously set
keys of the numeric array which broke the configuration.

Review

  • Code review CR +2 Done
    • Daniel Goerz +2
  • Verified V +2 Done
    • Daniel Goerz +2
    • TYPO3com +1 CI

Issues 1

Files 2

Review log 610

  1. Daniel Goerz commented on patch set 1 03/20/20, 15:58

    Cherry Picked from branch master. The following files contain Git conflicts: * typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
  2. TYPO3com voted on patch set 1 V -1 03/20/20, 15:59 Completed build in 27s on Fri, 20 Mar, 03:59 PM Test Summary: No tests found Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC95-287

  3. Daniel Goerz commented on patch set 2 03/20/20, 16:04

    Published edit on patch set 1.
  4. Daniel Goerz commented on patch set 2 03/20/20, 16:07

    This change is ready for review.
  5. TYPO3com voted on patch set 2 V -1 03/20/20, 16:17 Completed build in 13m 25s on Fri, 20 Mar, 04:17 PM Test Summary: 3 of 74573 failed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC95-288

  6. Daniel Goerz uploaded patch set 3 03/20/20, 16:33

  7. TYPO3com voted on patch set 3 V -1 03/20/20, 16:46 Completed build in 12m 20s on Fri, 20 Mar, 04:46 PM Test Summary: 74340 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC95-289

  8. TYPO3com voted on patch set 3 V +1 03/20/20, 16:49 Completed build in 27m 47s on Fri, 20 Mar, 04:49 PM Test Summary: 74340 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC95-289

  9. Daniel Goerz voted on patch set 3 V +2 CR +2 03/20/20, 17:03

  10. Daniel Goerz merged patch set 4 03/20/20, 17:03