Code

[5.x] Move sites out of config#9632

Code

Merged

jasonvarga merged 157 commits intomasterstatamic/cms:masterfrom move-sites-out-of-configstatamic/cms:move-sites-out-of-configCopy head branch name to clipboardApr 9, 2024

+2,336-815

Commits

Commits on Mar 1, 2024

• Update Sites class constructor and setters.

  jesseleite

  committed
  c9a2cbb

  Copy full SHA for c9a2cbb

• Add set() onto Site.

  jesseleite

  committed
  a8e757c

  Copy full SHA for a8e757c

• Do not load config here, let Sites class handle.

  jesseleite

  committed
  d372d0c

  Copy full SHA for d372d0c

• Update Sites constructors in SitesTest.

  jesseleite

  committed
  d743f75

  Copy full SHA for d743f75

• These never did anything.

  jesseleite

  committed
  2b6a7c3

  Copy full SHA for 2b6a7c3

• Use setSiteValue().

  jesseleite

  committed
  df74335

  Copy full SHA for df74335

• Fix graphql sites test.

  jesseleite

  committed
  27a6bec

  Copy full SHA for 27a6bec

• Rip out sites cnfig here as well.

  jesseleite

  committed
  8cd3d65

  Copy full SHA for 8cd3d65

• Use setSiteValue() here as well.

  jesseleite

  committed
  2f4a01b

  Copy full SHA for 2f4a01b

• Update middleware to check using Site facade.

  jesseleite

  committed
  7686a2c

  Copy full SHA for 7686a2c

• Update EntriesTest.

  jesseleite

  committed
  38c7751

  Copy full SHA for 38c7751

• Update command (wip).

  jesseleite

  committed
  9b35187

  Copy full SHA for 9b35187

• Wip.

  jesseleite

  committed
  20b8743

  Copy full SHA for 20b8743

• Do not need this anymore.

  jesseleite

  committed
  174038b

  Copy full SHA for 174038b

• Docblock.

  jesseleite

  committed
  e04da78

  Copy full SHA for e04da78

• Add test.

  jesseleite

  committed
  ec6ddf3

  Copy full SHA for ec6ddf3

• Update config.

  jesseleite

  committed
  93d4a58

  Copy full SHA for 93d4a58

• Handle saving of sites.

  jesseleite

  committed
  01a300c

  Copy full SHA for 01a300c

• Controller.

  jesseleite

  committed
  391d8d1

  Copy full SHA for 391d8d1

• Permission.

  jesseleite

  committed
  b496cf0

  Copy full SHA for b496cf0

• Front end.

  jesseleite

  committed
  ac88dea

  Copy full SHA for ac88dea

• Pass config down.

  jesseleite

  committed
  8799e58

  Copy full SHA for 8799e58

• Show in CP nav.

  jesseleite

  committed
  81cb472

  Copy full SHA for 81cb472

• Update multisite command.

  jesseleite

  committed
  fd3d113

  Copy full SHA for fd3d113

• False by default.

  jesseleite

  committed
  4944103

  Copy full SHA for 4944103

• Whoops, the routes too.

  jesseleite

  committed
  41bcce7

  Copy full SHA for 41bcce7

• Jack ❤️

  jesseleite

  committed
  59514e6

  Copy full SHA for 59514e6

Commits on Mar 2, 2024

• Test pluralization of core nav item.

  jesseleite

  committed
  6047d8b

  Copy full SHA for 6047d8b

• Pass these again.

  jesseleite

  committed
  015d4d0

  Copy full SHA for 015d4d0

• Refactor deprecated Site::setConfig() to Site::setSites().

  jesseleite

  committed
  ad72178

  Copy full SHA for ad72178

• Pass CascadeTest again.

  jesseleite

  committed
  f56ab65

  Copy full SHA for f56ab65

• Merge branch 'master' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  0c34ceb

  Copy full SHA for 0c34ceb

Commits on Mar 11, 2024

• Merge branch 'master' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  950b532

  Copy full SHA for 950b532

• Normalize site handles on save.

  jesseleite

  committed
  23a23e0

  Copy full SHA for 23a23e0

• Ensure handles are always set off site instance when toArray()ing.

  jesseleite

  committed
  c43f7ed

  Copy full SHA for c43f7ed

Commits on Mar 12, 2024

• Simplify singleton.

  jesseleite

  committed
  c26fb4b

  Copy full SHA for c26fb4b

• Add test coverage around Site facade reading from / saving to sites.yaml.

  jesseleite

  committed
  3e9c2c3

  Copy full SHA for 3e9c2c3

• More test coverage.

  jesseleite

  committed
  27d6e32

  Copy full SHA for 27d6e32

• Merge branch 'master' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  fabb513

  Copy full SHA for fabb513

• John wants more cache 💰

  jesseleite

  committed
  92309f2

  Copy full SHA for 92309f2

• Validate that at least 1 site is submitted.

  jesseleite

  committed
  7058b1b

  Copy full SHA for 7058b1b

Commits on Mar 13, 2024

• Add antlers resolving logic to Site.

  jesseleite

  committed
  5e4f625

  Copy full SHA for 5e4f625

• We still need raw config (without antlers resolving) for edit form and yaml, etc.

  jesseleite

  committed
  fed692a

  Copy full SHA for fed692a

• Not doing this in Sites anymore.

  jesseleite

  committed
  bebb8a5

  Copy full SHA for bebb8a5

• Use new rawConfig() helper when showing in publish form or saving to yaml.

  jesseleite

  committed
  041e67a

  Copy full SHA for 041e67a

• Rename these methods for clarity.

  jesseleite

  committed
  01edb85

  Copy full SHA for 01edb85

• Merge branch 'master' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  bd954bb

  Copy full SHA for bd954bb

• Extract text direction logic for reuse.

  jesseleite

  committed
  3958401

  Copy full SHA for 3958401

Commits on Mar 14, 2024

• nitpick

  jasonvarga

  committed
  4e33c97

  Copy full SHA for 4e33c97

• Merge branch 'extract-text-direction-for-reuse' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  c00abe4

  Copy full SHA for c00abe4

• Ditch direction field.

  jesseleite

  committed
  30a65e7

  Copy full SHA for 30a65e7

• Hardcode $site->direction() to read from TextDirection.

  jesseleite

  committed
  18bf06b

  Copy full SHA for 18bf06b

• Update normalization and pass tests again.

  jesseleite

  committed
  ae6dd45

  Copy full SHA for ae6dd45

• Test antlers handling.

  jesseleite

  committed
  0f42464

  Copy full SHA for 0f42464

• If you take 🔪 decide to hide display label, hide this too.

  jesseleite

  committed
  f0a6424

  Copy full SHA for f0a6424

• Fix margin issues (see PR screenshots for edge cases).

  jesseleite

  committed
  5b3d54e

  Copy full SHA for 5b3d54e

• Merge branch 'fix/stacked-grid-margins' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  5f09cda

  Copy full SHA for 5f09cda

• Use <publish-tabs> to get rid of tab title.

  jesseleite

  committed
  27e3a89

  Copy full SHA for 27e3a89

• Don’t need to define sections anymore.

  jesseleite

  committed
  bdc0cf8

  Copy full SHA for bdc0cf8

• Encourage php please multisite right from the config.

  jesseleite

  committed
  91835e3

  Copy full SHA for 91835e3

• Docs callout.

  jesseleite

  committed
  2658699

  Copy full SHA for 2658699

Commits on Mar 15, 2024

• Detect when user is changing or removing a site handle and warn them 🔪

  jesseleite

  committed
  8bfeb84

  Copy full SHA for 8bfeb84

• Merge branch 'master' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  4afca73

  Copy full SHA for 4afca73

Commits on Mar 19, 2024

• Update script.

  jesseleite

  committed
  c10551c

  Copy full SHA for c10551c

• Register update script.

  jesseleite

  committed
  bd432ec

  Copy full SHA for bd432ec

• Update script test coverage.

  jesseleite

  committed
  1aa5ebd

  Copy full SHA for 1aa5ebd

• Addressed this elsewhere.

  jesseleite

  committed
  29dae78

  Copy full SHA for 29dae78

• Merge branch 'master' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  a99f399

  Copy full SHA for a99f399

Commits on Mar 20, 2024

• Add optional —update-config to update/migrate their editions config as well.

  jesseleite

  committed
  3ba2861

  Copy full SHA for 3ba2861

• Defer to pro:enable command, since it has much smarter logic.

  jesseleite

  committed
  c8ce0bf

  Copy full SHA for c8ce0bf

• Suggest running with option, otherwise instruct on how to update yourself.

  jesseleite

  committed
  49b9b23

  Copy full SHA for 49b9b23

• Merge branch 'feature/enable-pro-improvements' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  30268bb

  Copy full SHA for 30268bb

• Fix false positive and setting of in-memory config.

  jesseleite

  committed
  0be2497

  Copy full SHA for 0be2497

• Test pls pro:enable command and —update-config option.

  jesseleite

  committed
  cbc359d

  Copy full SHA for cbc359d

• Ensure directory exists for Laravel 9?

  jesseleite

  committed
  6ebd628

  Copy full SHA for 6ebd628

Commits on Mar 21, 2024

• Merge branch 'feature/enable-pro-improvements' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  836d1ad

  Copy full SHA for 836d1ad

Commits on Mar 22, 2024

• Merge branch '4.x' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  80d4795

  Copy full SHA for 80d4795

• Rework Statamic Pro handling.

  jesseleite

  committed
  ad4742d

  Copy full SHA for ad4742d

• Add ValidatesCustomRule testing helper trait.

  jesseleite

  committed
  94d57a4

  Copy full SHA for 94d57a4

• Add custom Handle validation rule.

  jesseleite

  committed
  321cdac

  Copy full SHA for 321cdac

• Test Handle validation.

  jesseleite

  committed
  411d2c0

  Copy full SHA for 411d2c0

• Add custom Slug validation rule.

  jesseleite

  committed
  f83be4a

  Copy full SHA for f83be4a

• Test Slug validation.

  jesseleite

  committed
  9b7535b

  Copy full SHA for 9b7535b

• Slugs should allow uppercase and numbers.

  jesseleite

  committed
  482d8d6

  Copy full SHA for 482d8d6

• Handles should allow numbers, as long as they don’t start with numbers.

  jesseleite

  committed
  bcb4942

  Copy full SHA for bcb4942

• Use new Slug rule instead of alpha_dash.

  jesseleite

  committed
  a20da1f

  Copy full SHA for a20da1f

• Use new Handle rule instead of alpha_dash.

  jesseleite

  committed
  5727c61

  Copy full SHA for 5727c61

• Merge branch 'master' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  f852c61

  Copy full SHA for f852c61

• Merge branch 'master' of https://github.com/statamic/cms into feature/slug-and-snake-case-rules

  jesseleite

  committed
  1e4bd39

  Copy full SHA for 1e4bd39

• Fix diff.

  jesseleite

  committed
  be78b43

  Copy full SHA for be78b43

• Merge branch 'feature/slug-and-snake-case-rules' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  7bf6ed7

  Copy full SHA for 7bf6ed7

Commits on Mar 28, 2024

• Merge branch 'master' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  13fee12

  Copy full SHA for 13fee12

Commits on Mar 29, 2024

• Overhaul and cleanup overall command structure.

  jesseleite

  committed
  9a9d014

  Copy full SHA for 9a9d014

• Save explicit site config with user confirmed handle.

  jesseleite

  committed
  46fcd49

  Copy full SHA for 46fcd49

• Ensure multisite is enabled in sites config.

  jesseleite

  committed
  9278407

  Copy full SHA for 9278407

• Improve output.

  jesseleite

  committed
  a1759d6

  Copy full SHA for a1759d6

• Oh right, use the new Handle validation rule.

  jesseleite

  committed
  b5f2d20

  Copy full SHA for b5f2d20

• Improve step order.

  jesseleite

  committed
  e14699c

  Copy full SHA for e14699c

• This stuff was causing too many issues. Checking Site::hasMultiple() should be enough.

  jesseleite

  committed
  db792e8

  Copy full SHA for db792e8

• Fix site handle confirmation when accepting default.

  jesseleite

  committed
  254e6e5

  Copy full SHA for 254e6e5

Commits on Apr 2, 2024

• tweak test to show that its based on the language

  jasonvarga

  committed
  b918c52

  Copy full SHA for b918c52

• now unnecessary

  jasonvarga

  committed
  3253a4c

  Copy full SHA for 3253a4c

• fix yaml tests

  jasonvarga

  committed
  7e59cac

  Copy full SHA for 7e59cac

• Merge branch 'master' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  67922b2

  Copy full SHA for 67922b2

• Move config into statamic.system.multisite.

  jesseleite

  committed
  8b2d86d

  Copy full SHA for 8b2d86d

• Add Site::multiEnabled() helper.

  jesseleite

  committed
  798f1f9

  Copy full SHA for 798f1f9

• Use multiEnabled() helper.

  jesseleite

  committed
  e1e72c2

  Copy full SHA for e1e72c2

• Remove sites config file references.

  jesseleite

  committed
  448b6f7

  Copy full SHA for 448b6f7

• Update tests to use new config.

  jesseleite

  committed
  d668f93

  Copy full SHA for d668f93

• Update exception messaging.

  jesseleite

  committed
  efb49af

  Copy full SHA for efb49af

• Update assertions.

  jesseleite

  committed
  8744789

  Copy full SHA for 8744789

• Ensure fresh system.php config is put back after each test.

  jesseleite

  committed
  a4e8e28

  Copy full SHA for a4e8e28

• Update update script script.

  jesseleite

  committed
  760dc05

  Copy full SHA for 760dc05

• Is this line even needed anymore?

  jesseleite

  committed
  3a3b3f9

  Copy full SHA for 3a3b3f9

• Remove constructor param, since we never actually use this.

  jesseleite

  committed
  04f41df

  Copy full SHA for 04f41df

• Smorter middleware.

  jesseleite

  committed
  9b021cb

  Copy full SHA for 9b021cb

Commits on Apr 3, 2024

• Refactor to setSites() TestCase helper.

  jesseleite

  committed
  a8a4283

  Copy full SHA for a8a4283

• Fix bad find replaces.

  jesseleite

  committed
  e3b62b7

  Copy full SHA for e3b62b7

• Not used anymore.

  jesseleite

  committed
  6a869bd

  Copy full SHA for 6a869bd

• Actually use Site facade in these tests.

  jesseleite

  committed
  1558ba0

  Copy full SHA for 1558ba0

• Put whitespace back.

  jesseleite

  committed
  64c2c02

  Copy full SHA for 64c2c02

• Bring these back.

  jesseleite

  committed
  3c102b8

  Copy full SHA for 3c102b8

• Pass these again.

  jesseleite

  committed
  21c743c

  Copy full SHA for 21c743c

• Add setSiteValue() test helper that also manages multisite config.

  jesseleite

  committed
  023d330

  Copy full SHA for 023d330

• Merge branch 'master' of https://github.com/statamic/cms into move-sites-out-of-config

  jesseleite

  committed
  5737e8d

  Copy full SHA for 5737e8d

Commits on Apr 4, 2024

• Whoops! Remove ray() call.

  jesseleite

  committed
  7f97859

  Copy full SHA for 7f97859

• We moved config.

  jesseleite

  committed
  f6f0a59

  Copy full SHA for f6f0a59

• Revert "This stuff was causing too many issues. Checking Site::hasMultiple() should be enough."

  Show description for cd954aa
  jesseleite

  committed
  cd954aa

  Copy full SHA for cd954aa

• Improve directory checking when re-running command.

  jesseleite

  committed
  ed9d1e8

  Copy full SHA for ed9d1e8

• Make default site name dynamic for new installs without explicit sites.yaml file.

  jesseleite

  committed
  ea7506f

  Copy full SHA for ea7506f

• Always throw exception if multisite is enabled without pro.

  jesseleite

  committed
  62606af

  Copy full SHA for 62606af

• Ensure config is set in memory for rest of the command.

  jesseleite

  committed
  98ea6c4

  Copy full SHA for 98ea6c4

• Determine multisite globals using boolean instead of hasMultiple().

  jesseleite

  committed
  791ed52

  Copy full SHA for 791ed52

• Determine multisite everywhere else using boolean instead of hasMultiple().

  jesseleite

  committed
  59da8ef

  Copy full SHA for 59da8ef

• Update tests.

  jesseleite

  committed
  17ea3a3

  Copy full SHA for 17ea3a3

• Simplify site handle prompt step.

  jesseleite

  committed
  502777b

  Copy full SHA for 502777b

• Needs to be disabled when converting collection content.

  jesseleite

  committed
  3c4010e

  Copy full SHA for 3c4010e

• Improve messaging.

  jesseleite

  committed
  144075d

  Copy full SHA for 144075d

• Improve messaging.

  jesseleite

  committed
  b40dd61

  Copy full SHA for b40dd61

• Tweakeroo.

  jesseleite

  committed
  f76acd6

  Copy full SHA for f76acd6

• Failing tests for system config changes to update script.

  jesseleite

  committed
  f8d2e51

  Copy full SHA for f8d2e51

• Migrate new multisite config into old config/system.php.

  jesseleite

  committed
  75b6c6b

  Copy full SHA for 75b6c6b

• Improve assertion around multisite config insertion.

  jesseleite

  committed
  e46f83e

  Copy full SHA for e46f83e

• If it can’t cleanly insert new multisite config where it’s supposed to go, just append to end of file.

  jesseleite

  committed
  b9bc727

  Copy full SHA for b9bc727

• More helpful error.

  jesseleite

  committed
  eea9233

  Copy full SHA for eea9233

• Types and intelli-gents.

  jesseleite

  committed
  8539d21

  Copy full SHA for 8539d21

Commits on Apr 5, 2024

• Merge branch 'master' into move-sites-out-of-config

  jasonvarga

  committed
  b280b0f

  Copy full SHA for b280b0f

• Fix setup state.

  jesseleite

  committed
  eb7dcee

  Copy full SHA for eb7dcee

• Remove text direction keys from sites config in update script.

  jesseleite

  committed
  c6a7ce9

  Copy full SHA for c6a7ce9

• Nitpick.

  jesseleite

  committed
  bc021fd

  Copy full SHA for bc021fd

• bloop

  jasonvarga

  committed
  69650f1

  Copy full SHA for 69650f1

• maybe a method there was useful at some point but here's fine

  jasonvarga

  committed
  11e1c41

  Copy full SHA for 11e1c41

• doesnt need to be available on login screen etc

  jasonvarga

  committed
  6a1d391

  Copy full SHA for 6a1d391

• yup, re: 3a3b3f9 ...

  Show description for 00447c8
  jasonvarga

  committed
  00447c8

  Copy full SHA for 00447c8

Commits on Apr 8, 2024

• remove old direction references

  jasonvarga

  committed
  c31ca4d

  Copy full SHA for c31ca4d

• use a method that exists

  jasonvarga

  committed
  6f6d158

  Copy full SHA for 6f6d158

• Merge branch 'master' into move-sites-out-of-config

  Show description for 9ac64d9
  jasonvarga

  committed
  9ac64d9

  Copy full SHA for 9ac64d9