Review main Merged

61374[BUGFIX] Make sure AdditionalConfiguration is loaded

Jonas Eberle CR +2 V +2 Easy +6 −4 updated 08/03/19, 09:15

Commit message

This loads AdditionalConfiguration.php even if LocalConfiguration.php
could not be loaded.

Before this change, configuration for the install tool could only be
given if a LocalConfiguration was present.

With this change, AdditionalConfiguration (if present) is applied
on top of DefaultConfiguration.

In a FIRST_INSTALL scenario, this enables (among others) the correct
evaluation of a set trustedHostsPattern in AdditionalConfiguration.

Review

  • Code review CR +2 Done
    • Tobi Kretschmann +2
    • anonymized-54557 +1
    • Oliver Klee +1
    • Guido Schmechel +1
    • Marc von Schalscha +1
    • Andreas Kienast +1
    • Mathias Brodala +1
  • Verified V +2 Done
    • Tobi Kretschmann +2
    • anonymized-54557 +1
    • Randy Fay +1
    • TYPO3com +1 CI

Issues 2

Files 1

Review log 1518

  1. Jonas Eberle uploaded patch set 1 07/26/19, 09:17

  2. Jonas Eberle updated the commit message in patch set 2 07/26/19, 09:19

  3. Mathias Brodala voted on patch set 2 CR +1 07/26/19, 09:23

  4. Jonas Eberle uploaded patch set 3 07/26/19, 09:24

  5. TYPO3com voted on patch set 1 V +1 07/26/19, 09:30 Completed build in 13m 16s on Fri, 26 Jul, 11:30 AM Test Summary: 47160 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-35328

  6. TYPO3com voted on patch set 2 V +1 07/26/19, 09:33 Completed build in 13m 29s on Fri, 26 Jul, 11:33 AM Test Summary: 47160 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-35329

  7. Mathias Brodala voted on patch set 3 CR +1 07/26/19, 09:35

  8. TYPO3com voted on patch set 3 V +1 07/26/19, 09:37 Completed build in 12m 35s on Fri, 26 Jul, 11:37 AM Test Summary: 47160 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-35330

  9. Oliver Klee commented on patch set 3 CR +1 07/26/19, 10:30

    Would this make sense for 8.7 as well?
  10. Mathias Brodala commented on patch set 3 07/26/19, 11:11

    Reply Unresolved

    No, since v8 is in priority bugfix mode.
  11. Andreas Kienast voted on patch set 3 CR +1 07/26/19, 11:47

  12. Guido Schmechel voted on patch set 3 CR +1 07/26/19, 13:13

  13. Randy Fay commented on patch set 3 V +1 07/29/19, 13:41

    I tested this with ddev using https on a fresh install. ddev is a reverse-proxy environment, and when using https the ddev-router reverse proxy terminates https and uses port 443, while the nginx server itself uses port 80 and http. Without this patch, you usually get a 500 error and a stacktrace in the log complaining about the trustedHostsPattern mismatch, or you get (sometimes) the warning about it on the first install page (the same warning that is now consistently shown *with* the patch). With the patch, you don't seem to get the 500 error any more, but you still get the scary warning about the environment as shown in https://www.evernote.com/l/AA9NI6WZeedL1pHkAH-kDyczJgOE1d6ZADc - If you click "continue with errors" it does fine. But most users would not know to do that, I don't think. So this is *verified* if it's OK to show the scary warning, but I'm not sure why it should show the warning, if it's actually loading AdditionalConfiguration.php now. Note that I had to use the *very* latest ddev master to have this work, as without @jonaseberle's patch in https://github.com/drud/ddev/pull/1735 I just got the warning about nonexistent array and then a blank screen.
  14. Marc von Schalscha voted on patch set 3 CR +1 08/02/19, 19:58

  15. anonymized-54557 voted on patch set 3 CR +1 08/02/19, 20:41

  16. anonymized-54557 voted on patch set 3 V +1 08/02/19, 20:54

  17. Tobi Kretschmann voted on patch set 3 V +2 CR +2 08/03/19, 09:15

  18. Tobi Kretschmann merged patch set 4 08/03/19, 09:15