[4.x] Split global set variables into its own repository and stache store

config/stache.php

@@ -70,6 +70,11 @@
  'directory' => base_path('content/globals'),
  ],
 
+ 'global-variables' => [
+ 'class' => Stores\GlobalVariablesStore::class,
+ 'directory' => base_path('content/globals'),
+ ],
+
  'asset-containers' => [
  'class' => Stores\AssetContainersStore::class,
  'directory' => base_path('content/assets'),

src/Contracts/Globals/GlobalVariablesRepository.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Statamic\Contracts\Globals;
+
+use Statamic\Globals\VariablesCollection;
+
+interface GlobalVariablesRepository
+{
+ public function all(): VariablesCollection;
+
+ public function find($id): ?Variables;
+
+ public function whereSet($handle): VariablesCollection;
+
+ public function save($variable);
+
+ public function delete($variable);
+}

src/Contracts/Globals/Variables.php

@@ -4,4 +4,5 @@
 
 interface Variables
 {
+ //
 }

src/Events/GlobalVariablesCreated.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesCreated extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesDeleted.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesDeleted extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaved.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaved extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaving.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaving extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+
+ /**
+ * Dispatch the event with the given arguments, and halt on first non-null listener response.
+ *
+ * @return mixed
+ */
+ public static function dispatch()
+ {
+ return event(new static(...func_get_args()), [], true);
+ }
+}

src/Facades/GlobalVariables.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Statamic\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use Statamic\Contracts\Globals\GlobalVariablesRepository;
+
+/**
+ * @method static \Statamic\Globals\VariablesCollection all()
+ * @method static null|\Statamic\Globals\Variables find($id)
+ * @method static \Statamic\Globals\VariablesCollection whereSet($set)
+ * @method static void save($variable);
+ *
+ * @see \Statamic\Globals\VariablesCollection
+ */
+class GlobalVariables extends Facade
+{
+ protected static function getFacadeAccessor()
+ {
+ return GlobalVariablesRepository::class;
+ }
+}

src/Globals/GlobalSet.php

@@ -3,13 +3,16 @@
 namespace Statamic\Globals;
 
 use Statamic\Contracts\Globals\GlobalSet as Contract;
+use Statamic\Contracts\Globals\Variables;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Events\GlobalSetCreated;
 use Statamic\Events\GlobalSetDeleted;
 use Statamic\Events\GlobalSetSaved;
 use Statamic\Events\GlobalSetSaving;
 use Statamic\Facades;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Blueprint;
+use Statamic\Facades\GlobalVariables;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Support\Arr;
@@ -21,7 +24,6 @@ class GlobalSet implements Contract
 
  protected $title;
  protected $handle;
- protected $localizations;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
 
@@ -91,6 +93,8 @@ public function save()
 
  Facades\GlobalSet::save($this);
 
+ $this->saveOrDeleteLocalizations();
+
  foreach ($afterSaveCallbacks as $callback) {
  $callback($this);
  }
@@ -106,8 +110,21 @@ public function save()
  return $this;
  }
 
+ protected function saveOrDeleteLocalizations()
+ {
+ $localizations = $this->localizations();
+
+ $localizations->each->save();
+
+ $this->freshLocalizations()
+ ->diffKeys($localizations)
+ ->each->delete();
+ }
+
  public function delete()
  {
+ $this->localizations()->each->delete();
+
  Facades\GlobalSet::delete($this);
 
  GlobalSetDeleted::dispatch($this);
@@ -121,9 +138,9 @@ public function fileData()
  'title' => $this->title(),
  ];
 
- if (! Site::hasMultiple()) {
+ if (! Site::hasMultiple() && ($variables = $this->in(Site::default()->handle()))) {
  $data['data'] = Arr::removeNullValues(
- $this->in(Site::default()->handle())->data()->all()
+ $variables->data()->all()
  );
  }
 
@@ -132,7 +149,7 @@ public function fileData()
 
  public function makeLocalization($site)
  {
- return (new Variables)
+ return app(Variables::class)
  ->globalSet($this)
  ->locale($site);
  }
@@ -141,21 +158,21 @@ public function addLocalization($localization)
  {
  $localization->globalSet($this);
 
- $this->localizations[$localization->locale()] = $localization;
+ $this->localizations()[$localization->locale()] = $localization;
 
  return $this;
  }
 
  public function removeLocalization($localization)
  {
-unset($this->localizations[$localization->locale()]);
+ $this->localizations()->forget($localization->locale());
 
  return $this;
  }
 
  public function in($locale)
  {
- return $this->localizations[$locale] ?? null;
+ return $this->localizations()->get($locale);
  }
 
  public function inSelectedSite()
@@ -180,7 +197,14 @@ public function existsIn($locale)
 
  public function localizations()
  {
- return collect($this->localizations);
+ return Blink::once('global-set-localizations-'.$this->id(), function () {
+ return $this->freshLocalizations();
+ });
+ }
+
+ private function freshLocalizations()
+ {
+ return GlobalVariables::whereSet($this->handle())->keyBy->locale();
  }
 
  public function editUrl()

src/Globals/Variables.php

@@ -7,6 +7,7 @@
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Data\Augmented;
 use Statamic\Contracts\Data\Localization;
+use Statamic\Contracts\Globals\GlobalSet;
 use Statamic\Contracts\Globals\Variables as Contract;
 use Statamic\Contracts\GraphQL\ResolvesValues as ResolvesValuesContract;
 use Statamic\Data\ContainsData;
@@ -15,6 +16,10 @@
 use Statamic\Data\HasOrigin;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\GlobalVariablesBlueprintFound;
+use Statamic\Events\GlobalVariablesCreated;
+use Statamic\Events\GlobalVariablesDeleted;
+use Statamic\Events\GlobalVariablesSaved;
+use Statamic\Events\GlobalVariablesSaving;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Site;
@@ -28,6 +33,8 @@ class Variables implements Contract, Localization, Augmentable, ResolvesValuesCo
 
  protected $set;
  protected $locale;
+ protected $afterSaveCallbacks = [];
+ protected $withEvents = true;
 
  public function __construct()
  {
@@ -37,7 +44,11 @@ public function __construct()
 
  public function globalSet($set = null)
  {
- return $this->fluentlyGetOrSet('set')->args(func_get_args());
+ return $this->fluentlyGetOrSet('set')
+ ->getter(function ($set) {
+ return $set instanceof GlobalSet ? $set : Facades\GlobalSet::find($set);
+ })
+ ->args(func_get_args());
  }
 
  public function locale($locale = null)
@@ -47,12 +58,12 @@ public function locale($locale = null)
 
  public function id()
  {
- return $this->globalSet()->id();
+ return $this->handle().($this->locale ? '::'.$this->locale : '');
  }
 
  public function handle()
  {
- return $this->globalSet()->handle();
+ return $this->set instanceof GlobalSet ? $this->set->handle() : $this->set;
  }
 
  public function title()
@@ -91,16 +102,62 @@ protected function cpUrl($route)
  return cp_route($route, $params);
  }
 
+ public function afterSave($callback)
+ {
+ $this->afterSaveCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ public function saveQuietly()
+ {
+ $this->withEvents = false;
+
+ return $this->save();
+ }
+
  public function save()
  {
- $this
- ->globalSet()
- ->addLocalization($this)
- ->save();
+ $isNew = is_null(Facades\GlobalVariables::find($this->id()));
+
+ $withEvents = $this->withEvents;
+ $this->withEvents = true;
+
+ $afterSaveCallbacks = $this->afterSaveCallbacks;
+ $this->afterSaveCallbacks = [];
+
+ if ($withEvents) {
+ if (GlobalVariablesSaving::dispatch($this) === false) {
+ return false;
+ }
+ }
+
+ Facades\GlobalVariables::save($this);
+
+ foreach ($afterSaveCallbacks as $callback) {
+ $callback($this);
+ }
+
+ if ($withEvents) {
+ if ($isNew) {
+ GlobalVariablesCreated::dispatch($this);
+ }
+
+ GlobalVariablesSaved::dispatch($this);
+ }
 
  return $this;
  }
 
+ public function delete()
+ {
+ Facades\GlobalVariables::delete($this);
+
+ GlobalVariablesDeleted::dispatch($this);
+
+ return true;
+ }
+
  public function site()
  {
  return Site::get($this->locale());
@@ -184,6 +241,6 @@ protected function defaultAugmentedRelations()
 
  public function fresh()
  {
- return Facades\GlobalSet::find($this->id())->in($this->locale);
+ return Facades\GlobalSet::find($this->handle())->in($this->locale);
  }
 }

src/Globals/VariablesCollection.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Statamic\Globals;
+
+use Statamic\Data\DataCollection;
+
+class VariablesCollection extends DataCollection
+{
+}

src/Providers/AppServiceProvider.php

@@ -104,6 +104,7 @@ public function register()
  \Statamic\Contracts\Taxonomies\TaxonomyRepository::class => \Statamic\Stache\Repositories\TaxonomyRepository::class,
  \Statamic\Contracts\Entries\CollectionRepository::class => \Statamic\Stache\Repositories\CollectionRepository::class,
  \Statamic\Contracts\Globals\GlobalRepository::class => \Statamic\Stache\Repositories\GlobalRepository::class,
+ \Statamic\Contracts\Globals\GlobalVariablesRepository::class => \Statamic\Stache\Repositories\GlobalVariablesRepository::class,
  \Statamic\Contracts\Assets\AssetContainerRepository::class => \Statamic\Stache\Repositories\AssetContainerRepository::class,
  \Statamic\Contracts\Structures\StructureRepository::class => \Statamic\Structures\StructureRepository::class,
  \Statamic\Contracts\Structures\CollectionTreeRepository::class => \Statamic\Stache\Repositories\CollectionTreeRepository::class,

config/stache.php

@@ -70,6 +70,11 @@
  'directory' => base_path('content/globals'),
  ],
 
+ 'global-variables' => [
+ 'class' => Stores\GlobalVariablesStore::class,
+ 'directory' => base_path('content/globals'),
+ ],
+
  'asset-containers' => [
  'class' => Stores\AssetContainersStore::class,
  'directory' => base_path('content/assets'),

src/Contracts/Globals/GlobalVariablesRepository.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Statamic\Contracts\Globals;
+
+use Statamic\Globals\VariablesCollection;
+
+interface GlobalVariablesRepository
+{
+ public function all(): VariablesCollection;
+
+ public function find($id): ?Variables;
+
+ public function whereSet($handle): VariablesCollection;
+
+ public function save($variable);
+
+ public function delete($variable);
+}

src/Contracts/Globals/Variables.php

@@ -4,4 +4,5 @@
 
 interface Variables
 {
+ //
 }

src/Events/GlobalVariablesCreated.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesCreated extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesDeleted.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesDeleted extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaved.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaved extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaving.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaving extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+
+ /**
+ * Dispatch the event with the given arguments, and halt on first non-null listener response.
+ *
+ * @return mixed
+ */
+ public static function dispatch()
+ {
+ return event(new static(...func_get_args()), [], true);
+ }
+}

src/Facades/GlobalVariables.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Statamic\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use Statamic\Contracts\Globals\GlobalVariablesRepository;
+
+/**
+ * @method static \Statamic\Globals\VariablesCollection all()
+ * @method static null|\Statamic\Globals\Variables find($id)
+ * @method static \Statamic\Globals\VariablesCollection whereSet($set)
+ * @method static void save($variable);
+ *
+ * @see \Statamic\Globals\VariablesCollection
+ */
+class GlobalVariables extends Facade
+{
+ protected static function getFacadeAccessor()
+ {
+ return GlobalVariablesRepository::class;
+ }
+}

src/Globals/GlobalSet.php

@@ -3,13 +3,16 @@
 namespace Statamic\Globals;
 
 use Statamic\Contracts\Globals\GlobalSet as Contract;
+use Statamic\Contracts\Globals\Variables;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Events\GlobalSetCreated;
 use Statamic\Events\GlobalSetDeleted;
 use Statamic\Events\GlobalSetSaved;
 use Statamic\Events\GlobalSetSaving;
 use Statamic\Facades;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Blueprint;
+use Statamic\Facades\GlobalVariables;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Support\Arr;
@@ -21,7 +24,6 @@ class GlobalSet implements Contract
 
  protected $title;
  protected $handle;
- protected $localizations;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
 
@@ -91,6 +93,8 @@ public function save()
 
  Facades\GlobalSet::save($this);
 
+ $this->saveOrDeleteLocalizations();
+
  foreach ($afterSaveCallbacks as $callback) {
  $callback($this);
  }
@@ -106,8 +110,21 @@ public function save()
  return $this;
  }
 
+ protected function saveOrDeleteLocalizations()
+ {
+ $localizations = $this->localizations();
+
+ $localizations->each->save();
+
+ $this->freshLocalizations()
+ ->diffKeys($localizations)
+ ->each->delete();
+ }
+
  public function delete()
  {
+ $this->localizations()->each->delete();
+
  Facades\GlobalSet::delete($this);
 
  GlobalSetDeleted::dispatch($this);
@@ -121,9 +138,9 @@ public function fileData()
  'title' => $this->title(),
  ];
 
- if (! Site::hasMultiple()) {
+ if (! Site::hasMultiple() && ($variables = $this->in(Site::default()->handle()))) {
  $data['data'] = Arr::removeNullValues(
- $this->in(Site::default()->handle())->data()->all()
+ $variables->data()->all()
  );
  }
 
@@ -132,7 +149,7 @@ public function fileData()
 
  public function makeLocalization($site)
  {
- return (new Variables)
+ return app(Variables::class)
  ->globalSet($this)
  ->locale($site);
  }
@@ -141,21 +158,21 @@ public function addLocalization($localization)
  {
  $localization->globalSet($this);
 
- $this->localizations[$localization->locale()] = $localization;
+ $this->localizations()[$localization->locale()] = $localization;
 
  return $this;
  }
 
  public function removeLocalization($localization)
  {
-unset($this->localizations[$localization->locale()]);
+ $this->localizations()->forget($localization->locale());
 
  return $this;
  }
 
  public function in($locale)
  {
- return $this->localizations[$locale] ?? null;
+ return $this->localizations()->get($locale);
  }
 
  public function inSelectedSite()
@@ -180,7 +197,14 @@ public function existsIn($locale)
 
  public function localizations()
  {
- return collect($this->localizations);
+ return Blink::once('global-set-localizations-'.$this->id(), function () {
+ return $this->freshLocalizations();
+ });
+ }
+
+ private function freshLocalizations()
+ {
+ return GlobalVariables::whereSet($this->handle())->keyBy->locale();
  }
 
  public function editUrl()

src/Globals/Variables.php

@@ -7,6 +7,7 @@
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Data\Augmented;
 use Statamic\Contracts\Data\Localization;
+use Statamic\Contracts\Globals\GlobalSet;
 use Statamic\Contracts\Globals\Variables as Contract;
 use Statamic\Contracts\GraphQL\ResolvesValues as ResolvesValuesContract;
 use Statamic\Data\ContainsData;
@@ -15,6 +16,10 @@
 use Statamic\Data\HasOrigin;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\GlobalVariablesBlueprintFound;
+use Statamic\Events\GlobalVariablesCreated;
+use Statamic\Events\GlobalVariablesDeleted;
+use Statamic\Events\GlobalVariablesSaved;
+use Statamic\Events\GlobalVariablesSaving;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Site;
@@ -28,6 +33,8 @@ class Variables implements Contract, Localization, Augmentable, ResolvesValuesCo
 
  protected $set;
  protected $locale;
+ protected $afterSaveCallbacks = [];
+ protected $withEvents = true;
 
  public function __construct()
  {
@@ -37,7 +44,11 @@ public function __construct()
 
  public function globalSet($set = null)
  {
- return $this->fluentlyGetOrSet('set')->args(func_get_args());
+ return $this->fluentlyGetOrSet('set')
+ ->getter(function ($set) {
+ return $set instanceof GlobalSet ? $set : Facades\GlobalSet::find($set);
+ })
+ ->args(func_get_args());
  }
 
  public function locale($locale = null)
@@ -47,12 +58,12 @@ public function locale($locale = null)
 
  public function id()
  {
- return $this->globalSet()->id();
+ return $this->handle().($this->locale ? '::'.$this->locale : '');
  }
 
  public function handle()
  {
- return $this->globalSet()->handle();
+ return $this->set instanceof GlobalSet ? $this->set->handle() : $this->set;
  }
 
  public function title()
@@ -91,16 +102,62 @@ protected function cpUrl($route)
  return cp_route($route, $params);
  }
 
+ public function afterSave($callback)
+ {
+ $this->afterSaveCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ public function saveQuietly()
+ {
+ $this->withEvents = false;
+
+ return $this->save();
+ }
+
  public function save()
  {
- $this
- ->globalSet()
- ->addLocalization($this)
- ->save();
+ $isNew = is_null(Facades\GlobalVariables::find($this->id()));
+
+ $withEvents = $this->withEvents;
+ $this->withEvents = true;
+
+ $afterSaveCallbacks = $this->afterSaveCallbacks;
+ $this->afterSaveCallbacks = [];
+
+ if ($withEvents) {
+ if (GlobalVariablesSaving::dispatch($this) === false) {
+ return false;
+ }
+ }
+
+ Facades\GlobalVariables::save($this);
+
+ foreach ($afterSaveCallbacks as $callback) {
+ $callback($this);
+ }
+
+ if ($withEvents) {
+ if ($isNew) {
+ GlobalVariablesCreated::dispatch($this);
+ }
+
+ GlobalVariablesSaved::dispatch($this);
+ }
 
  return $this;
  }
 
+ public function delete()
+ {
+ Facades\GlobalVariables::delete($this);
+
+ GlobalVariablesDeleted::dispatch($this);
+
+ return true;
+ }
+
  public function site()
  {
  return Site::get($this->locale());
@@ -184,6 +241,6 @@ protected function defaultAugmentedRelations()
 
  public function fresh()
  {
- return Facades\GlobalSet::find($this->id())->in($this->locale);
+ return Facades\GlobalSet::find($this->handle())->in($this->locale);
  }
 }

src/Globals/VariablesCollection.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Statamic\Globals;
+
+use Statamic\Data\DataCollection;
+
+class VariablesCollection extends DataCollection
+{
+}

src/Providers/AppServiceProvider.php

@@ -104,6 +104,7 @@ public function register()
  \Statamic\Contracts\Taxonomies\TaxonomyRepository::class => \Statamic\Stache\Repositories\TaxonomyRepository::class,
  \Statamic\Contracts\Entries\CollectionRepository::class => \Statamic\Stache\Repositories\CollectionRepository::class,
  \Statamic\Contracts\Globals\GlobalRepository::class => \Statamic\Stache\Repositories\GlobalRepository::class,
+ \Statamic\Contracts\Globals\GlobalVariablesRepository::class => \Statamic\Stache\Repositories\GlobalVariablesRepository::class,
  \Statamic\Contracts\Assets\AssetContainerRepository::class => \Statamic\Stache\Repositories\AssetContainerRepository::class,
  \Statamic\Contracts\Structures\StructureRepository::class => \Statamic\Structures\StructureRepository::class,
  \Statamic\Contracts\Structures\CollectionTreeRepository::class => \Statamic\Stache\Repositories\CollectionTreeRepository::class,

config/stache.php

@@ -70,6 +70,11 @@
  'directory' => base_path('content/globals'),
  ],
 
+ 'global-variables' => [
+ 'class' => Stores\GlobalVariablesStore::class,
+ 'directory' => base_path('content/globals'),
+ ],
+
  'asset-containers' => [
  'class' => Stores\AssetContainersStore::class,
  'directory' => base_path('content/assets'),

src/Contracts/Globals/GlobalVariablesRepository.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Statamic\Contracts\Globals;
+
+use Statamic\Globals\VariablesCollection;
+
+interface GlobalVariablesRepository
+{
+ public function all(): VariablesCollection;
+
+ public function find($id): ?Variables;
+
+ public function whereSet($handle): VariablesCollection;
+
+ public function save($variable);
+
+ public function delete($variable);
+}

src/Contracts/Globals/Variables.php

@@ -4,4 +4,5 @@
 
 interface Variables
 {
+ //
 }

src/Events/GlobalVariablesCreated.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesCreated extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesDeleted.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesDeleted extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaved.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaved extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaving.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaving extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+
+ /**
+ * Dispatch the event with the given arguments, and halt on first non-null listener response.
+ *
+ * @return mixed
+ */
+ public static function dispatch()
+ {
+ return event(new static(...func_get_args()), [], true);
+ }
+}

src/Facades/GlobalVariables.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Statamic\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use Statamic\Contracts\Globals\GlobalVariablesRepository;
+
+/**
+ * @method static \Statamic\Globals\VariablesCollection all()
+ * @method static null|\Statamic\Globals\Variables find($id)
+ * @method static \Statamic\Globals\VariablesCollection whereSet($set)
+ * @method static void save($variable);
+ *
+ * @see \Statamic\Globals\VariablesCollection
+ */
+class GlobalVariables extends Facade
+{
+ protected static function getFacadeAccessor()
+ {
+ return GlobalVariablesRepository::class;
+ }
+}

src/Globals/GlobalSet.php

@@ -3,13 +3,16 @@
 namespace Statamic\Globals;
 
 use Statamic\Contracts\Globals\GlobalSet as Contract;
+use Statamic\Contracts\Globals\Variables;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Events\GlobalSetCreated;
 use Statamic\Events\GlobalSetDeleted;
 use Statamic\Events\GlobalSetSaved;
 use Statamic\Events\GlobalSetSaving;
 use Statamic\Facades;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Blueprint;
+use Statamic\Facades\GlobalVariables;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Support\Arr;
@@ -21,7 +24,6 @@ class GlobalSet implements Contract
 
  protected $title;
  protected $handle;
- protected $localizations;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
 
@@ -91,6 +93,8 @@ public function save()
 
  Facades\GlobalSet::save($this);
 
+ $this->saveOrDeleteLocalizations();
+
  foreach ($afterSaveCallbacks as $callback) {
  $callback($this);
  }
@@ -106,8 +110,21 @@ public function save()
  return $this;
  }
 
+ protected function saveOrDeleteLocalizations()
+ {
+ $localizations = $this->localizations();
+
+ $localizations->each->save();
+
+ $this->freshLocalizations()
+ ->diffKeys($localizations)
+ ->each->delete();
+ }
+
  public function delete()
  {
+ $this->localizations()->each->delete();
+
  Facades\GlobalSet::delete($this);
 
  GlobalSetDeleted::dispatch($this);
@@ -121,9 +138,9 @@ public function fileData()
  'title' => $this->title(),
  ];
 
- if (! Site::hasMultiple()) {
+ if (! Site::hasMultiple() && ($variables = $this->in(Site::default()->handle()))) {
  $data['data'] = Arr::removeNullValues(
- $this->in(Site::default()->handle())->data()->all()
+ $variables->data()->all()
  );
  }
 
@@ -132,7 +149,7 @@ public function fileData()
 
  public function makeLocalization($site)
  {
- return (new Variables)
+ return app(Variables::class)
  ->globalSet($this)
  ->locale($site);
  }
@@ -141,21 +158,21 @@ public function addLocalization($localization)
  {
  $localization->globalSet($this);
 
- $this->localizations[$localization->locale()] = $localization;
+ $this->localizations()[$localization->locale()] = $localization;
 
  return $this;
  }
 
  public function removeLocalization($localization)
  {
-unset($this->localizations[$localization->locale()]);
+ $this->localizations()->forget($localization->locale());
 
  return $this;
  }
 
  public function in($locale)
  {
- return $this->localizations[$locale] ?? null;
+ return $this->localizations()->get($locale);
  }
 
  public function inSelectedSite()
@@ -180,7 +197,14 @@ public function existsIn($locale)
 
  public function localizations()
  {
- return collect($this->localizations);
+ return Blink::once('global-set-localizations-'.$this->id(), function () {
+ return $this->freshLocalizations();
+ });
+ }
+
+ private function freshLocalizations()
+ {
+ return GlobalVariables::whereSet($this->handle())->keyBy->locale();
  }
 
  public function editUrl()

src/Globals/Variables.php

@@ -7,6 +7,7 @@
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Data\Augmented;
 use Statamic\Contracts\Data\Localization;
+use Statamic\Contracts\Globals\GlobalSet;
 use Statamic\Contracts\Globals\Variables as Contract;
 use Statamic\Contracts\GraphQL\ResolvesValues as ResolvesValuesContract;
 use Statamic\Data\ContainsData;
@@ -15,6 +16,10 @@
 use Statamic\Data\HasOrigin;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\GlobalVariablesBlueprintFound;
+use Statamic\Events\GlobalVariablesCreated;
+use Statamic\Events\GlobalVariablesDeleted;
+use Statamic\Events\GlobalVariablesSaved;
+use Statamic\Events\GlobalVariablesSaving;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Site;
@@ -28,6 +33,8 @@ class Variables implements Contract, Localization, Augmentable, ResolvesValuesCo
 
  protected $set;
  protected $locale;
+ protected $afterSaveCallbacks = [];
+ protected $withEvents = true;
 
  public function __construct()
  {
@@ -37,7 +44,11 @@ public function __construct()
 
  public function globalSet($set = null)
  {
- return $this->fluentlyGetOrSet('set')->args(func_get_args());
+ return $this->fluentlyGetOrSet('set')
+ ->getter(function ($set) {
+ return $set instanceof GlobalSet ? $set : Facades\GlobalSet::find($set);
+ })
+ ->args(func_get_args());
  }
 
  public function locale($locale = null)
@@ -47,12 +58,12 @@ public function locale($locale = null)
 
  public function id()
  {
- return $this->globalSet()->id();
+ return $this->handle().($this->locale ? '::'.$this->locale : '');
  }
 
  public function handle()
  {
- return $this->globalSet()->handle();
+ return $this->set instanceof GlobalSet ? $this->set->handle() : $this->set;
  }
 
  public function title()
@@ -91,16 +102,62 @@ protected function cpUrl($route)
  return cp_route($route, $params);
  }
 
+ public function afterSave($callback)
+ {
+ $this->afterSaveCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ public function saveQuietly()
+ {
+ $this->withEvents = false;
+
+ return $this->save();
+ }
+
  public function save()
  {
- $this
- ->globalSet()
- ->addLocalization($this)
- ->save();
+ $isNew = is_null(Facades\GlobalVariables::find($this->id()));
+
+ $withEvents = $this->withEvents;
+ $this->withEvents = true;
+
+ $afterSaveCallbacks = $this->afterSaveCallbacks;
+ $this->afterSaveCallbacks = [];
+
+ if ($withEvents) {
+ if (GlobalVariablesSaving::dispatch($this) === false) {
+ return false;
+ }
+ }
+
+ Facades\GlobalVariables::save($this);
+
+ foreach ($afterSaveCallbacks as $callback) {
+ $callback($this);
+ }
+
+ if ($withEvents) {
+ if ($isNew) {
+ GlobalVariablesCreated::dispatch($this);
+ }
+
+ GlobalVariablesSaved::dispatch($this);
+ }
 
  return $this;
  }
 
+ public function delete()
+ {
+ Facades\GlobalVariables::delete($this);
+
+ GlobalVariablesDeleted::dispatch($this);
+
+ return true;
+ }
+
  public function site()
  {
  return Site::get($this->locale());
@@ -184,6 +241,6 @@ protected function defaultAugmentedRelations()
 
  public function fresh()
  {
- return Facades\GlobalSet::find($this->id())->in($this->locale);
+ return Facades\GlobalSet::find($this->handle())->in($this->locale);
  }
 }

src/Globals/VariablesCollection.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Statamic\Globals;
+
+use Statamic\Data\DataCollection;
+
+class VariablesCollection extends DataCollection
+{
+}

src/Providers/AppServiceProvider.php

@@ -104,6 +104,7 @@ public function register()
  \Statamic\Contracts\Taxonomies\TaxonomyRepository::class => \Statamic\Stache\Repositories\TaxonomyRepository::class,
  \Statamic\Contracts\Entries\CollectionRepository::class => \Statamic\Stache\Repositories\CollectionRepository::class,
  \Statamic\Contracts\Globals\GlobalRepository::class => \Statamic\Stache\Repositories\GlobalRepository::class,
+ \Statamic\Contracts\Globals\GlobalVariablesRepository::class => \Statamic\Stache\Repositories\GlobalVariablesRepository::class,
  \Statamic\Contracts\Assets\AssetContainerRepository::class => \Statamic\Stache\Repositories\AssetContainerRepository::class,
  \Statamic\Contracts\Structures\StructureRepository::class => \Statamic\Structures\StructureRepository::class,
  \Statamic\Contracts\Structures\CollectionTreeRepository::class => \Statamic\Stache\Repositories\CollectionTreeRepository::class,

config/stache.php

@@ -70,6 +70,11 @@
  'directory' => base_path('content/globals'),
  ],
 
+ 'global-variables' => [
+ 'class' => Stores\GlobalVariablesStore::class,
+ 'directory' => base_path('content/globals'),
+ ],
+
  'asset-containers' => [
  'class' => Stores\AssetContainersStore::class,
  'directory' => base_path('content/assets'),

src/Contracts/Globals/GlobalVariablesRepository.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Statamic\Contracts\Globals;
+
+use Statamic\Globals\VariablesCollection;
+
+interface GlobalVariablesRepository
+{
+ public function all(): VariablesCollection;
+
+ public function find($id): ?Variables;
+
+ public function whereSet($handle): VariablesCollection;
+
+ public function save($variable);
+
+ public function delete($variable);
+}

src/Contracts/Globals/Variables.php

@@ -4,4 +4,5 @@
 
 interface Variables
 {
+ //
 }

src/Events/GlobalVariablesCreated.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesCreated extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesDeleted.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesDeleted extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaved.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaved extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaving.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaving extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+
+ /**
+ * Dispatch the event with the given arguments, and halt on first non-null listener response.
+ *
+ * @return mixed
+ */
+ public static function dispatch()
+ {
+ return event(new static(...func_get_args()), [], true);
+ }
+}

src/Facades/GlobalVariables.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Statamic\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use Statamic\Contracts\Globals\GlobalVariablesRepository;
+
+/**
+ * @method static \Statamic\Globals\VariablesCollection all()
+ * @method static null|\Statamic\Globals\Variables find($id)
+ * @method static \Statamic\Globals\VariablesCollection whereSet($set)
+ * @method static void save($variable);
+ *
+ * @see \Statamic\Globals\VariablesCollection
+ */
+class GlobalVariables extends Facade
+{
+ protected static function getFacadeAccessor()
+ {
+ return GlobalVariablesRepository::class;
+ }
+}

src/Globals/GlobalSet.php

@@ -3,13 +3,16 @@
 namespace Statamic\Globals;
 
 use Statamic\Contracts\Globals\GlobalSet as Contract;
+use Statamic\Contracts\Globals\Variables;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Events\GlobalSetCreated;
 use Statamic\Events\GlobalSetDeleted;
 use Statamic\Events\GlobalSetSaved;
 use Statamic\Events\GlobalSetSaving;
 use Statamic\Facades;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Blueprint;
+use Statamic\Facades\GlobalVariables;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Support\Arr;
@@ -21,7 +24,6 @@ class GlobalSet implements Contract
 
  protected $title;
  protected $handle;
- protected $localizations;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
 
@@ -91,6 +93,8 @@ public function save()
 
  Facades\GlobalSet::save($this);
 
+ $this->saveOrDeleteLocalizations();
+
  foreach ($afterSaveCallbacks as $callback) {
  $callback($this);
  }
@@ -106,8 +110,21 @@ public function save()
  return $this;
  }
 
+ protected function saveOrDeleteLocalizations()
+ {
+ $localizations = $this->localizations();
+
+ $localizations->each->save();
+
+ $this->freshLocalizations()
+ ->diffKeys($localizations)
+ ->each->delete();
+ }
+
  public function delete()
  {
+ $this->localizations()->each->delete();
+
  Facades\GlobalSet::delete($this);
 
  GlobalSetDeleted::dispatch($this);
@@ -121,9 +138,9 @@ public function fileData()
  'title' => $this->title(),
  ];
 
- if (! Site::hasMultiple()) {
+ if (! Site::hasMultiple() && ($variables = $this->in(Site::default()->handle()))) {
  $data['data'] = Arr::removeNullValues(
- $this->in(Site::default()->handle())->data()->all()
+ $variables->data()->all()
  );
  }
 
@@ -132,7 +149,7 @@ public function fileData()
 
  public function makeLocalization($site)
  {
- return (new Variables)
+ return app(Variables::class)
  ->globalSet($this)
  ->locale($site);
  }
@@ -141,21 +158,21 @@ public function addLocalization($localization)
  {
  $localization->globalSet($this);
 
- $this->localizations[$localization->locale()] = $localization;
+ $this->localizations()[$localization->locale()] = $localization;
 
  return $this;
  }
 
  public function removeLocalization($localization)
  {
-unset($this->localizations[$localization->locale()]);
+ $this->localizations()->forget($localization->locale());
 
  return $this;
  }
 
  public function in($locale)
  {
- return $this->localizations[$locale] ?? null;
+ return $this->localizations()->get($locale);
  }
 
  public function inSelectedSite()
@@ -180,7 +197,14 @@ public function existsIn($locale)
 
  public function localizations()
  {
- return collect($this->localizations);
+ return Blink::once('global-set-localizations-'.$this->id(), function () {
+ return $this->freshLocalizations();
+ });
+ }
+
+ private function freshLocalizations()
+ {
+ return GlobalVariables::whereSet($this->handle())->keyBy->locale();
  }
 
  public function editUrl()

src/Globals/Variables.php

@@ -7,6 +7,7 @@
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Data\Augmented;
 use Statamic\Contracts\Data\Localization;
+use Statamic\Contracts\Globals\GlobalSet;
 use Statamic\Contracts\Globals\Variables as Contract;
 use Statamic\Contracts\GraphQL\ResolvesValues as ResolvesValuesContract;
 use Statamic\Data\ContainsData;
@@ -15,6 +16,10 @@
 use Statamic\Data\HasOrigin;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\GlobalVariablesBlueprintFound;
+use Statamic\Events\GlobalVariablesCreated;
+use Statamic\Events\GlobalVariablesDeleted;
+use Statamic\Events\GlobalVariablesSaved;
+use Statamic\Events\GlobalVariablesSaving;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Site;
@@ -28,6 +33,8 @@ class Variables implements Contract, Localization, Augmentable, ResolvesValuesCo
 
  protected $set;
  protected $locale;
+ protected $afterSaveCallbacks = [];
+ protected $withEvents = true;
 
  public function __construct()
  {
@@ -37,7 +44,11 @@ public function __construct()
 
  public function globalSet($set = null)
  {
- return $this->fluentlyGetOrSet('set')->args(func_get_args());
+ return $this->fluentlyGetOrSet('set')
+ ->getter(function ($set) {
+ return $set instanceof GlobalSet ? $set : Facades\GlobalSet::find($set);
+ })
+ ->args(func_get_args());
  }
 
  public function locale($locale = null)
@@ -47,12 +58,12 @@ public function locale($locale = null)
 
  public function id()
  {
- return $this->globalSet()->id();
+ return $this->handle().($this->locale ? '::'.$this->locale : '');
  }
 
  public function handle()
  {
- return $this->globalSet()->handle();
+ return $this->set instanceof GlobalSet ? $this->set->handle() : $this->set;
  }
 
  public function title()
@@ -91,16 +102,62 @@ protected function cpUrl($route)
  return cp_route($route, $params);
  }
 
+ public function afterSave($callback)
+ {
+ $this->afterSaveCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ public function saveQuietly()
+ {
+ $this->withEvents = false;
+
+ return $this->save();
+ }
+
  public function save()
  {
- $this
- ->globalSet()
- ->addLocalization($this)
- ->save();
+ $isNew = is_null(Facades\GlobalVariables::find($this->id()));
+
+ $withEvents = $this->withEvents;
+ $this->withEvents = true;
+
+ $afterSaveCallbacks = $this->afterSaveCallbacks;
+ $this->afterSaveCallbacks = [];
+
+ if ($withEvents) {
+ if (GlobalVariablesSaving::dispatch($this) === false) {
+ return false;
+ }
+ }
+
+ Facades\GlobalVariables::save($this);
+
+ foreach ($afterSaveCallbacks as $callback) {
+ $callback($this);
+ }
+
+ if ($withEvents) {
+ if ($isNew) {
+ GlobalVariablesCreated::dispatch($this);
+ }
+
+ GlobalVariablesSaved::dispatch($this);
+ }
 
  return $this;
  }
 
+ public function delete()
+ {
+ Facades\GlobalVariables::delete($this);
+
+ GlobalVariablesDeleted::dispatch($this);
+
+ return true;
+ }
+
  public function site()
  {
  return Site::get($this->locale());
@@ -184,6 +241,6 @@ protected function defaultAugmentedRelations()
 
  public function fresh()
  {
- return Facades\GlobalSet::find($this->id())->in($this->locale);
+ return Facades\GlobalSet::find($this->handle())->in($this->locale);
  }
 }

src/Globals/VariablesCollection.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Statamic\Globals;
+
+use Statamic\Data\DataCollection;
+
+class VariablesCollection extends DataCollection
+{
+}

src/Providers/AppServiceProvider.php

@@ -104,6 +104,7 @@ public function register()
  \Statamic\Contracts\Taxonomies\TaxonomyRepository::class => \Statamic\Stache\Repositories\TaxonomyRepository::class,
  \Statamic\Contracts\Entries\CollectionRepository::class => \Statamic\Stache\Repositories\CollectionRepository::class,
  \Statamic\Contracts\Globals\GlobalRepository::class => \Statamic\Stache\Repositories\GlobalRepository::class,
+ \Statamic\Contracts\Globals\GlobalVariablesRepository::class => \Statamic\Stache\Repositories\GlobalVariablesRepository::class,
  \Statamic\Contracts\Assets\AssetContainerRepository::class => \Statamic\Stache\Repositories\AssetContainerRepository::class,
  \Statamic\Contracts\Structures\StructureRepository::class => \Statamic\Structures\StructureRepository::class,
  \Statamic\Contracts\Structures\CollectionTreeRepository::class => \Statamic\Stache\Repositories\CollectionTreeRepository::class,

config/stache.php

@@ -70,6 +70,11 @@
  'directory' => base_path('content/globals'),
  ],
 
+ 'global-variables' => [
+ 'class' => Stores\GlobalVariablesStore::class,
+ 'directory' => base_path('content/globals'),
+ ],
+
  'asset-containers' => [
  'class' => Stores\AssetContainersStore::class,
  'directory' => base_path('content/assets'),

src/Contracts/Globals/GlobalVariablesRepository.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Statamic\Contracts\Globals;
+
+use Statamic\Globals\VariablesCollection;
+
+interface GlobalVariablesRepository
+{
+ public function all(): VariablesCollection;
+
+ public function find($id): ?Variables;
+
+ public function whereSet($handle): VariablesCollection;
+
+ public function save($variable);
+
+ public function delete($variable);
+}

src/Contracts/Globals/Variables.php

@@ -4,4 +4,5 @@
 
 interface Variables
 {
+ //
 }

src/Events/GlobalVariablesCreated.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesCreated extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesDeleted.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesDeleted extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaved.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaved extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaving.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaving extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+
+ /**
+ * Dispatch the event with the given arguments, and halt on first non-null listener response.
+ *
+ * @return mixed
+ */
+ public static function dispatch()
+ {
+ return event(new static(...func_get_args()), [], true);
+ }
+}

src/Facades/GlobalVariables.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Statamic\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use Statamic\Contracts\Globals\GlobalVariablesRepository;
+
+/**
+ * @method static \Statamic\Globals\VariablesCollection all()
+ * @method static null|\Statamic\Globals\Variables find($id)
+ * @method static \Statamic\Globals\VariablesCollection whereSet($set)
+ * @method static void save($variable);
+ *
+ * @see \Statamic\Globals\VariablesCollection
+ */
+class GlobalVariables extends Facade
+{
+ protected static function getFacadeAccessor()
+ {
+ return GlobalVariablesRepository::class;
+ }
+}

src/Globals/GlobalSet.php

@@ -3,13 +3,16 @@
 namespace Statamic\Globals;
 
 use Statamic\Contracts\Globals\GlobalSet as Contract;
+use Statamic\Contracts\Globals\Variables;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Events\GlobalSetCreated;
 use Statamic\Events\GlobalSetDeleted;
 use Statamic\Events\GlobalSetSaved;
 use Statamic\Events\GlobalSetSaving;
 use Statamic\Facades;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Blueprint;
+use Statamic\Facades\GlobalVariables;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Support\Arr;
@@ -21,7 +24,6 @@ class GlobalSet implements Contract
 
  protected $title;
  protected $handle;
- protected $localizations;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
 
@@ -91,6 +93,8 @@ public function save()
 
  Facades\GlobalSet::save($this);
 
+ $this->saveOrDeleteLocalizations();
+
  foreach ($afterSaveCallbacks as $callback) {
  $callback($this);
  }
@@ -106,8 +110,21 @@ public function save()
  return $this;
  }
 
+ protected function saveOrDeleteLocalizations()
+ {
+ $localizations = $this->localizations();
+
+ $localizations->each->save();
+
+ $this->freshLocalizations()
+ ->diffKeys($localizations)
+ ->each->delete();
+ }
+
  public function delete()
  {
+ $this->localizations()->each->delete();
+
  Facades\GlobalSet::delete($this);
 
  GlobalSetDeleted::dispatch($this);
@@ -121,9 +138,9 @@ public function fileData()
  'title' => $this->title(),
  ];
 
- if (! Site::hasMultiple()) {
+ if (! Site::hasMultiple() && ($variables = $this->in(Site::default()->handle()))) {
  $data['data'] = Arr::removeNullValues(
- $this->in(Site::default()->handle())->data()->all()
+ $variables->data()->all()
  );
  }
 
@@ -132,7 +149,7 @@ public function fileData()
 
  public function makeLocalization($site)
  {
- return (new Variables)
+ return app(Variables::class)
  ->globalSet($this)
  ->locale($site);
  }
@@ -141,21 +158,21 @@ public function addLocalization($localization)
  {
  $localization->globalSet($this);
 
- $this->localizations[$localization->locale()] = $localization;
+ $this->localizations()[$localization->locale()] = $localization;
 
  return $this;
  }
 
  public function removeLocalization($localization)
  {
-unset($this->localizations[$localization->locale()]);
+ $this->localizations()->forget($localization->locale());
 
  return $this;
  }
 
  public function in($locale)
  {
- return $this->localizations[$locale] ?? null;
+ return $this->localizations()->get($locale);
  }
 
  public function inSelectedSite()
@@ -180,7 +197,14 @@ public function existsIn($locale)
 
  public function localizations()
  {
- return collect($this->localizations);
+ return Blink::once('global-set-localizations-'.$this->id(), function () {
+ return $this->freshLocalizations();
+ });
+ }
+
+ private function freshLocalizations()
+ {
+ return GlobalVariables::whereSet($this->handle())->keyBy->locale();
  }
 
  public function editUrl()

src/Globals/Variables.php

@@ -7,6 +7,7 @@
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Data\Augmented;
 use Statamic\Contracts\Data\Localization;
+use Statamic\Contracts\Globals\GlobalSet;
 use Statamic\Contracts\Globals\Variables as Contract;
 use Statamic\Contracts\GraphQL\ResolvesValues as ResolvesValuesContract;
 use Statamic\Data\ContainsData;
@@ -15,6 +16,10 @@
 use Statamic\Data\HasOrigin;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\GlobalVariablesBlueprintFound;
+use Statamic\Events\GlobalVariablesCreated;
+use Statamic\Events\GlobalVariablesDeleted;
+use Statamic\Events\GlobalVariablesSaved;
+use Statamic\Events\GlobalVariablesSaving;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Site;
@@ -28,6 +33,8 @@ class Variables implements Contract, Localization, Augmentable, ResolvesValuesCo
 
  protected $set;
  protected $locale;
+ protected $afterSaveCallbacks = [];
+ protected $withEvents = true;
 
  public function __construct()
  {
@@ -37,7 +44,11 @@ public function __construct()
 
  public function globalSet($set = null)
  {
- return $this->fluentlyGetOrSet('set')->args(func_get_args());
+ return $this->fluentlyGetOrSet('set')
+ ->getter(function ($set) {
+ return $set instanceof GlobalSet ? $set : Facades\GlobalSet::find($set);
+ })
+ ->args(func_get_args());
  }
 
  public function locale($locale = null)
@@ -47,12 +58,12 @@ public function locale($locale = null)
 
  public function id()
  {
- return $this->globalSet()->id();
+ return $this->handle().($this->locale ? '::'.$this->locale : '');
  }
 
  public function handle()
  {
- return $this->globalSet()->handle();
+ return $this->set instanceof GlobalSet ? $this->set->handle() : $this->set;
  }
 
  public function title()
@@ -91,16 +102,62 @@ protected function cpUrl($route)
  return cp_route($route, $params);
  }
 
+ public function afterSave($callback)
+ {
+ $this->afterSaveCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ public function saveQuietly()
+ {
+ $this->withEvents = false;
+
+ return $this->save();
+ }
+
  public function save()
  {
- $this
- ->globalSet()
- ->addLocalization($this)
- ->save();
+ $isNew = is_null(Facades\GlobalVariables::find($this->id()));
+
+ $withEvents = $this->withEvents;
+ $this->withEvents = true;
+
+ $afterSaveCallbacks = $this->afterSaveCallbacks;
+ $this->afterSaveCallbacks = [];
+
+ if ($withEvents) {
+ if (GlobalVariablesSaving::dispatch($this) === false) {
+ return false;
+ }
+ }
+
+ Facades\GlobalVariables::save($this);
+
+ foreach ($afterSaveCallbacks as $callback) {
+ $callback($this);
+ }
+
+ if ($withEvents) {
+ if ($isNew) {
+ GlobalVariablesCreated::dispatch($this);
+ }
+
+ GlobalVariablesSaved::dispatch($this);
+ }
 
  return $this;
  }
 
+ public function delete()
+ {
+ Facades\GlobalVariables::delete($this);
+
+ GlobalVariablesDeleted::dispatch($this);
+
+ return true;
+ }
+
  public function site()
  {
  return Site::get($this->locale());
@@ -184,6 +241,6 @@ protected function defaultAugmentedRelations()
 
  public function fresh()
  {
- return Facades\GlobalSet::find($this->id())->in($this->locale);
+ return Facades\GlobalSet::find($this->handle())->in($this->locale);
  }
 }

src/Globals/VariablesCollection.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Statamic\Globals;
+
+use Statamic\Data\DataCollection;
+
+class VariablesCollection extends DataCollection
+{
+}

src/Providers/AppServiceProvider.php

@@ -104,6 +104,7 @@ public function register()
  \Statamic\Contracts\Taxonomies\TaxonomyRepository::class => \Statamic\Stache\Repositories\TaxonomyRepository::class,
  \Statamic\Contracts\Entries\CollectionRepository::class => \Statamic\Stache\Repositories\CollectionRepository::class,
  \Statamic\Contracts\Globals\GlobalRepository::class => \Statamic\Stache\Repositories\GlobalRepository::class,
+ \Statamic\Contracts\Globals\GlobalVariablesRepository::class => \Statamic\Stache\Repositories\GlobalVariablesRepository::class,
  \Statamic\Contracts\Assets\AssetContainerRepository::class => \Statamic\Stache\Repositories\AssetContainerRepository::class,
  \Statamic\Contracts\Structures\StructureRepository::class => \Statamic\Structures\StructureRepository::class,
  \Statamic\Contracts\Structures\CollectionTreeRepository::class => \Statamic\Stache\Repositories\CollectionTreeRepository::class,

config/stache.php

@@ -70,6 +70,11 @@
  'directory' => base_path('content/globals'),
  ],
 
+ 'global-variables' => [
+ 'class' => Stores\GlobalVariablesStore::class,
+ 'directory' => base_path('content/globals'),
+ ],
+
  'asset-containers' => [
  'class' => Stores\AssetContainersStore::class,
  'directory' => base_path('content/assets'),

src/Contracts/Globals/GlobalVariablesRepository.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Statamic\Contracts\Globals;
+
+use Statamic\Globals\VariablesCollection;
+
+interface GlobalVariablesRepository
+{
+ public function all(): VariablesCollection;
+
+ public function find($id): ?Variables;
+
+ public function whereSet($handle): VariablesCollection;
+
+ public function save($variable);
+
+ public function delete($variable);
+}

src/Contracts/Globals/Variables.php

@@ -4,4 +4,5 @@
 
 interface Variables
 {
+ //
 }

src/Events/GlobalVariablesCreated.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesCreated extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesDeleted.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesDeleted extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaved.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaved extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaving.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaving extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+
+ /**
+ * Dispatch the event with the given arguments, and halt on first non-null listener response.
+ *
+ * @return mixed
+ */
+ public static function dispatch()
+ {
+ return event(new static(...func_get_args()), [], true);
+ }
+}

src/Facades/GlobalVariables.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Statamic\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use Statamic\Contracts\Globals\GlobalVariablesRepository;
+
+/**
+ * @method static \Statamic\Globals\VariablesCollection all()
+ * @method static null|\Statamic\Globals\Variables find($id)
+ * @method static \Statamic\Globals\VariablesCollection whereSet($set)
+ * @method static void save($variable);
+ *
+ * @see \Statamic\Globals\VariablesCollection
+ */
+class GlobalVariables extends Facade
+{
+ protected static function getFacadeAccessor()
+ {
+ return GlobalVariablesRepository::class;
+ }
+}

src/Globals/GlobalSet.php

@@ -3,13 +3,16 @@
 namespace Statamic\Globals;
 
 use Statamic\Contracts\Globals\GlobalSet as Contract;
+use Statamic\Contracts\Globals\Variables;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Events\GlobalSetCreated;
 use Statamic\Events\GlobalSetDeleted;
 use Statamic\Events\GlobalSetSaved;
 use Statamic\Events\GlobalSetSaving;
 use Statamic\Facades;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Blueprint;
+use Statamic\Facades\GlobalVariables;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Support\Arr;
@@ -21,7 +24,6 @@ class GlobalSet implements Contract
 
  protected $title;
  protected $handle;
- protected $localizations;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
 
@@ -91,6 +93,8 @@ public function save()
 
  Facades\GlobalSet::save($this);
 
+ $this->saveOrDeleteLocalizations();
+
  foreach ($afterSaveCallbacks as $callback) {
  $callback($this);
  }
@@ -106,8 +110,21 @@ public function save()
  return $this;
  }
 
+ protected function saveOrDeleteLocalizations()
+ {
+ $localizations = $this->localizations();
+
+ $localizations->each->save();
+
+ $this->freshLocalizations()
+ ->diffKeys($localizations)
+ ->each->delete();
+ }
+
  public function delete()
  {
+ $this->localizations()->each->delete();
+
  Facades\GlobalSet::delete($this);
 
  GlobalSetDeleted::dispatch($this);
@@ -121,9 +138,9 @@ public function fileData()
  'title' => $this->title(),
  ];
 
- if (! Site::hasMultiple()) {
+ if (! Site::hasMultiple() && ($variables = $this->in(Site::default()->handle()))) {
  $data['data'] = Arr::removeNullValues(
- $this->in(Site::default()->handle())->data()->all()
+ $variables->data()->all()
  );
  }
 
@@ -132,7 +149,7 @@ public function fileData()
 
  public function makeLocalization($site)
  {
- return (new Variables)
+ return app(Variables::class)
  ->globalSet($this)
  ->locale($site);
  }
@@ -141,21 +158,21 @@ public function addLocalization($localization)
  {
  $localization->globalSet($this);
 
- $this->localizations[$localization->locale()] = $localization;
+ $this->localizations()[$localization->locale()] = $localization;
 
  return $this;
  }
 
  public function removeLocalization($localization)
  {
-unset($this->localizations[$localization->locale()]);
+ $this->localizations()->forget($localization->locale());
 
  return $this;
  }
 
  public function in($locale)
  {
- return $this->localizations[$locale] ?? null;
+ return $this->localizations()->get($locale);
  }
 
  public function inSelectedSite()
@@ -180,7 +197,14 @@ public function existsIn($locale)
 
  public function localizations()
  {
- return collect($this->localizations);
+ return Blink::once('global-set-localizations-'.$this->id(), function () {
+ return $this->freshLocalizations();
+ });
+ }
+
+ private function freshLocalizations()
+ {
+ return GlobalVariables::whereSet($this->handle())->keyBy->locale();
  }
 
  public function editUrl()

src/Globals/Variables.php

@@ -7,6 +7,7 @@
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Data\Augmented;
 use Statamic\Contracts\Data\Localization;
+use Statamic\Contracts\Globals\GlobalSet;
 use Statamic\Contracts\Globals\Variables as Contract;
 use Statamic\Contracts\GraphQL\ResolvesValues as ResolvesValuesContract;
 use Statamic\Data\ContainsData;
@@ -15,6 +16,10 @@
 use Statamic\Data\HasOrigin;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\GlobalVariablesBlueprintFound;
+use Statamic\Events\GlobalVariablesCreated;
+use Statamic\Events\GlobalVariablesDeleted;
+use Statamic\Events\GlobalVariablesSaved;
+use Statamic\Events\GlobalVariablesSaving;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Site;
@@ -28,6 +33,8 @@ class Variables implements Contract, Localization, Augmentable, ResolvesValuesCo
 
  protected $set;
  protected $locale;
+ protected $afterSaveCallbacks = [];
+ protected $withEvents = true;
 
  public function __construct()
  {
@@ -37,7 +44,11 @@ public function __construct()
 
  public function globalSet($set = null)
  {
- return $this->fluentlyGetOrSet('set')->args(func_get_args());
+ return $this->fluentlyGetOrSet('set')
+ ->getter(function ($set) {
+ return $set instanceof GlobalSet ? $set : Facades\GlobalSet::find($set);
+ })
+ ->args(func_get_args());
  }
 
  public function locale($locale = null)
@@ -47,12 +58,12 @@ public function locale($locale = null)
 
  public function id()
  {
- return $this->globalSet()->id();
+ return $this->handle().($this->locale ? '::'.$this->locale : '');
  }
 
  public function handle()
  {
- return $this->globalSet()->handle();
+ return $this->set instanceof GlobalSet ? $this->set->handle() : $this->set;
  }
 
  public function title()
@@ -91,16 +102,62 @@ protected function cpUrl($route)
  return cp_route($route, $params);
  }
 
+ public function afterSave($callback)
+ {
+ $this->afterSaveCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ public function saveQuietly()
+ {
+ $this->withEvents = false;
+
+ return $this->save();
+ }
+
  public function save()
  {
- $this
- ->globalSet()
- ->addLocalization($this)
- ->save();
+ $isNew = is_null(Facades\GlobalVariables::find($this->id()));
+
+ $withEvents = $this->withEvents;
+ $this->withEvents = true;
+
+ $afterSaveCallbacks = $this->afterSaveCallbacks;
+ $this->afterSaveCallbacks = [];
+
+ if ($withEvents) {
+ if (GlobalVariablesSaving::dispatch($this) === false) {
+ return false;
+ }
+ }
+
+ Facades\GlobalVariables::save($this);
+
+ foreach ($afterSaveCallbacks as $callback) {
+ $callback($this);
+ }
+
+ if ($withEvents) {
+ if ($isNew) {
+ GlobalVariablesCreated::dispatch($this);
+ }
+
+ GlobalVariablesSaved::dispatch($this);
+ }
 
  return $this;
  }
 
+ public function delete()
+ {
+ Facades\GlobalVariables::delete($this);
+
+ GlobalVariablesDeleted::dispatch($this);
+
+ return true;
+ }
+
  public function site()
  {
  return Site::get($this->locale());
@@ -184,6 +241,6 @@ protected function defaultAugmentedRelations()
 
  public function fresh()
  {
- return Facades\GlobalSet::find($this->id())->in($this->locale);
+ return Facades\GlobalSet::find($this->handle())->in($this->locale);
  }
 }

src/Globals/VariablesCollection.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Statamic\Globals;
+
+use Statamic\Data\DataCollection;
+
+class VariablesCollection extends DataCollection
+{
+}

src/Providers/AppServiceProvider.php

@@ -104,6 +104,7 @@ public function register()
  \Statamic\Contracts\Taxonomies\TaxonomyRepository::class => \Statamic\Stache\Repositories\TaxonomyRepository::class,
  \Statamic\Contracts\Entries\CollectionRepository::class => \Statamic\Stache\Repositories\CollectionRepository::class,
  \Statamic\Contracts\Globals\GlobalRepository::class => \Statamic\Stache\Repositories\GlobalRepository::class,
+ \Statamic\Contracts\Globals\GlobalVariablesRepository::class => \Statamic\Stache\Repositories\GlobalVariablesRepository::class,
  \Statamic\Contracts\Assets\AssetContainerRepository::class => \Statamic\Stache\Repositories\AssetContainerRepository::class,
  \Statamic\Contracts\Structures\StructureRepository::class => \Statamic\Structures\StructureRepository::class,
  \Statamic\Contracts\Structures\CollectionTreeRepository::class => \Statamic\Stache\Repositories\CollectionTreeRepository::class,

config/stache.php

@@ -70,6 +70,11 @@
  'directory' => base_path('content/globals'),
  ],
 
+ 'global-variables' => [
+ 'class' => Stores\GlobalVariablesStore::class,
+ 'directory' => base_path('content/globals'),
+ ],
+
  'asset-containers' => [
  'class' => Stores\AssetContainersStore::class,
  'directory' => base_path('content/assets'),

src/Contracts/Globals/GlobalVariablesRepository.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Statamic\Contracts\Globals;
+
+use Statamic\Globals\VariablesCollection;
+
+interface GlobalVariablesRepository
+{
+ public function all(): VariablesCollection;
+
+ public function find($id): ?Variables;
+
+ public function whereSet($handle): VariablesCollection;
+
+ public function save($variable);
+
+ public function delete($variable);
+}

src/Contracts/Globals/Variables.php

@@ -4,4 +4,5 @@
 
 interface Variables
 {
+ //
 }

src/Events/GlobalVariablesCreated.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesCreated extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesDeleted.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesDeleted extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaved.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaved extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaving.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaving extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+
+ /**
+ * Dispatch the event with the given arguments, and halt on first non-null listener response.
+ *
+ * @return mixed
+ */
+ public static function dispatch()
+ {
+ return event(new static(...func_get_args()), [], true);
+ }
+}

src/Facades/GlobalVariables.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Statamic\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use Statamic\Contracts\Globals\GlobalVariablesRepository;
+
+/**
+ * @method static \Statamic\Globals\VariablesCollection all()
+ * @method static null|\Statamic\Globals\Variables find($id)
+ * @method static \Statamic\Globals\VariablesCollection whereSet($set)
+ * @method static void save($variable);
+ *
+ * @see \Statamic\Globals\VariablesCollection
+ */
+class GlobalVariables extends Facade
+{
+ protected static function getFacadeAccessor()
+ {
+ return GlobalVariablesRepository::class;
+ }
+}

src/Globals/GlobalSet.php

@@ -3,13 +3,16 @@
 namespace Statamic\Globals;
 
 use Statamic\Contracts\Globals\GlobalSet as Contract;
+use Statamic\Contracts\Globals\Variables;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Events\GlobalSetCreated;
 use Statamic\Events\GlobalSetDeleted;
 use Statamic\Events\GlobalSetSaved;
 use Statamic\Events\GlobalSetSaving;
 use Statamic\Facades;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Blueprint;
+use Statamic\Facades\GlobalVariables;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Support\Arr;
@@ -21,7 +24,6 @@ class GlobalSet implements Contract
 
  protected $title;
  protected $handle;
- protected $localizations;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
 
@@ -91,6 +93,8 @@ public function save()
 
  Facades\GlobalSet::save($this);
 
+ $this->saveOrDeleteLocalizations();
+
  foreach ($afterSaveCallbacks as $callback) {
  $callback($this);
  }
@@ -106,8 +110,21 @@ public function save()
  return $this;
  }
 
+ protected function saveOrDeleteLocalizations()
+ {
+ $localizations = $this->localizations();
+
+ $localizations->each->save();
+
+ $this->freshLocalizations()
+ ->diffKeys($localizations)
+ ->each->delete();
+ }
+
  public function delete()
  {
+ $this->localizations()->each->delete();
+
  Facades\GlobalSet::delete($this);
 
  GlobalSetDeleted::dispatch($this);
@@ -121,9 +138,9 @@ public function fileData()
  'title' => $this->title(),
  ];
 
- if (! Site::hasMultiple()) {
+ if (! Site::hasMultiple() && ($variables = $this->in(Site::default()->handle()))) {
  $data['data'] = Arr::removeNullValues(
- $this->in(Site::default()->handle())->data()->all()
+ $variables->data()->all()
  );
  }
 
@@ -132,7 +149,7 @@ public function fileData()
 
  public function makeLocalization($site)
  {
- return (new Variables)
+ return app(Variables::class)
  ->globalSet($this)
  ->locale($site);
  }
@@ -141,21 +158,21 @@ public function addLocalization($localization)
  {
  $localization->globalSet($this);
 
- $this->localizations[$localization->locale()] = $localization;
+ $this->localizations()[$localization->locale()] = $localization;
 
  return $this;
  }
 
  public function removeLocalization($localization)
  {
-unset($this->localizations[$localization->locale()]);
+ $this->localizations()->forget($localization->locale());
 
  return $this;
  }
 
  public function in($locale)
  {
- return $this->localizations[$locale] ?? null;
+ return $this->localizations()->get($locale);
  }
 
  public function inSelectedSite()
@@ -180,7 +197,14 @@ public function existsIn($locale)
 
  public function localizations()
  {
- return collect($this->localizations);
+ return Blink::once('global-set-localizations-'.$this->id(), function () {
+ return $this->freshLocalizations();
+ });
+ }
+
+ private function freshLocalizations()
+ {
+ return GlobalVariables::whereSet($this->handle())->keyBy->locale();
  }
 
  public function editUrl()

src/Globals/Variables.php

@@ -7,6 +7,7 @@
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Data\Augmented;
 use Statamic\Contracts\Data\Localization;
+use Statamic\Contracts\Globals\GlobalSet;
 use Statamic\Contracts\Globals\Variables as Contract;
 use Statamic\Contracts\GraphQL\ResolvesValues as ResolvesValuesContract;
 use Statamic\Data\ContainsData;
@@ -15,6 +16,10 @@
 use Statamic\Data\HasOrigin;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\GlobalVariablesBlueprintFound;
+use Statamic\Events\GlobalVariablesCreated;
+use Statamic\Events\GlobalVariablesDeleted;
+use Statamic\Events\GlobalVariablesSaved;
+use Statamic\Events\GlobalVariablesSaving;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Site;
@@ -28,6 +33,8 @@ class Variables implements Contract, Localization, Augmentable, ResolvesValuesCo
 
  protected $set;
  protected $locale;
+ protected $afterSaveCallbacks = [];
+ protected $withEvents = true;
 
  public function __construct()
  {
@@ -37,7 +44,11 @@ public function __construct()
 
  public function globalSet($set = null)
  {
- return $this->fluentlyGetOrSet('set')->args(func_get_args());
+ return $this->fluentlyGetOrSet('set')
+ ->getter(function ($set) {
+ return $set instanceof GlobalSet ? $set : Facades\GlobalSet::find($set);
+ })
+ ->args(func_get_args());
  }
 
  public function locale($locale = null)
@@ -47,12 +58,12 @@ public function locale($locale = null)
 
  public function id()
  {
- return $this->globalSet()->id();
+ return $this->handle().($this->locale ? '::'.$this->locale : '');
  }
 
  public function handle()
  {
- return $this->globalSet()->handle();
+ return $this->set instanceof GlobalSet ? $this->set->handle() : $this->set;
  }
 
  public function title()
@@ -91,16 +102,62 @@ protected function cpUrl($route)
  return cp_route($route, $params);
  }
 
+ public function afterSave($callback)
+ {
+ $this->afterSaveCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ public function saveQuietly()
+ {
+ $this->withEvents = false;
+
+ return $this->save();
+ }
+
  public function save()
  {
- $this
- ->globalSet()
- ->addLocalization($this)
- ->save();
+ $isNew = is_null(Facades\GlobalVariables::find($this->id()));
+
+ $withEvents = $this->withEvents;
+ $this->withEvents = true;
+
+ $afterSaveCallbacks = $this->afterSaveCallbacks;
+ $this->afterSaveCallbacks = [];
+
+ if ($withEvents) {
+ if (GlobalVariablesSaving::dispatch($this) === false) {
+ return false;
+ }
+ }
+
+ Facades\GlobalVariables::save($this);
+
+ foreach ($afterSaveCallbacks as $callback) {
+ $callback($this);
+ }
+
+ if ($withEvents) {
+ if ($isNew) {
+ GlobalVariablesCreated::dispatch($this);
+ }
+
+ GlobalVariablesSaved::dispatch($this);
+ }
 
  return $this;
  }
 
+ public function delete()
+ {
+ Facades\GlobalVariables::delete($this);
+
+ GlobalVariablesDeleted::dispatch($this);
+
+ return true;
+ }
+
  public function site()
  {
  return Site::get($this->locale());
@@ -184,6 +241,6 @@ protected function defaultAugmentedRelations()
 
  public function fresh()
  {
- return Facades\GlobalSet::find($this->id())->in($this->locale);
+ return Facades\GlobalSet::find($this->handle())->in($this->locale);
  }
 }

src/Globals/VariablesCollection.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Statamic\Globals;
+
+use Statamic\Data\DataCollection;
+
+class VariablesCollection extends DataCollection
+{
+}

src/Providers/AppServiceProvider.php

@@ -104,6 +104,7 @@ public function register()
  \Statamic\Contracts\Taxonomies\TaxonomyRepository::class => \Statamic\Stache\Repositories\TaxonomyRepository::class,
  \Statamic\Contracts\Entries\CollectionRepository::class => \Statamic\Stache\Repositories\CollectionRepository::class,
  \Statamic\Contracts\Globals\GlobalRepository::class => \Statamic\Stache\Repositories\GlobalRepository::class,
+ \Statamic\Contracts\Globals\GlobalVariablesRepository::class => \Statamic\Stache\Repositories\GlobalVariablesRepository::class,
  \Statamic\Contracts\Assets\AssetContainerRepository::class => \Statamic\Stache\Repositories\AssetContainerRepository::class,
  \Statamic\Contracts\Structures\StructureRepository::class => \Statamic\Structures\StructureRepository::class,
  \Statamic\Contracts\Structures\CollectionTreeRepository::class => \Statamic\Stache\Repositories\CollectionTreeRepository::class,

config/stache.php

@@ -70,6 +70,11 @@
  'directory' => base_path('content/globals'),
  ],
 
+ 'global-variables' => [
+ 'class' => Stores\GlobalVariablesStore::class,
+ 'directory' => base_path('content/globals'),
+ ],
+
  'asset-containers' => [
  'class' => Stores\AssetContainersStore::class,
  'directory' => base_path('content/assets'),

src/Contracts/Globals/GlobalVariablesRepository.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Statamic\Contracts\Globals;
+
+use Statamic\Globals\VariablesCollection;
+
+interface GlobalVariablesRepository
+{
+ public function all(): VariablesCollection;
+
+ public function find($id): ?Variables;
+
+ public function whereSet($handle): VariablesCollection;
+
+ public function save($variable);
+
+ public function delete($variable);
+}

src/Contracts/Globals/Variables.php

@@ -4,4 +4,5 @@
 
 interface Variables
 {
+ //
 }

src/Events/GlobalVariablesCreated.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesCreated extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesDeleted.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesDeleted extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaved.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaved extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+}

src/Events/GlobalVariablesSaving.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Statamic\Events;
+
+class GlobalVariablesSaving extends Event
+{
+ public $variables;
+
+ public function __construct($variables)
+ {
+ $this->variables = $variables;
+ }
+
+ /**
+ * Dispatch the event with the given arguments, and halt on first non-null listener response.
+ *
+ * @return mixed
+ */
+ public static function dispatch()
+ {
+ return event(new static(...func_get_args()), [], true);
+ }
+}

src/Facades/GlobalVariables.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Statamic\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use Statamic\Contracts\Globals\GlobalVariablesRepository;
+
+/**
+ * @method static \Statamic\Globals\VariablesCollection all()
+ * @method static null|\Statamic\Globals\Variables find($id)
+ * @method static \Statamic\Globals\VariablesCollection whereSet($set)
+ * @method static void save($variable);
+ *
+ * @see \Statamic\Globals\VariablesCollection
+ */
+class GlobalVariables extends Facade
+{
+ protected static function getFacadeAccessor()
+ {
+ return GlobalVariablesRepository::class;
+ }
+}

src/Globals/GlobalSet.php

@@ -3,13 +3,16 @@
 namespace Statamic\Globals;
 
 use Statamic\Contracts\Globals\GlobalSet as Contract;
+use Statamic\Contracts\Globals\Variables;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Events\GlobalSetCreated;
 use Statamic\Events\GlobalSetDeleted;
 use Statamic\Events\GlobalSetSaved;
 use Statamic\Events\GlobalSetSaving;
 use Statamic\Facades;
+use Statamic\Facades\Blink;
 use Statamic\Facades\Blueprint;
+use Statamic\Facades\GlobalVariables;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
 use Statamic\Support\Arr;
@@ -21,7 +24,6 @@ class GlobalSet implements Contract
 
  protected $title;
  protected $handle;
- protected $localizations;
  protected $afterSaveCallbacks = [];
  protected $withEvents = true;
 
@@ -91,6 +93,8 @@ public function save()
 
  Facades\GlobalSet::save($this);
 
+ $this->saveOrDeleteLocalizations();
+
  foreach ($afterSaveCallbacks as $callback) {
  $callback($this);
  }
@@ -106,8 +110,21 @@ public function save()
  return $this;
  }
 
+ protected function saveOrDeleteLocalizations()
+ {
+ $localizations = $this->localizations();
+
+ $localizations->each->save();
+
+ $this->freshLocalizations()
+ ->diffKeys($localizations)
+ ->each->delete();
+ }
+
  public function delete()
  {
+ $this->localizations()->each->delete();
+
  Facades\GlobalSet::delete($this);
 
  GlobalSetDeleted::dispatch($this);
@@ -121,9 +138,9 @@ public function fileData()
  'title' => $this->title(),
  ];
 
- if (! Site::hasMultiple()) {
+ if (! Site::hasMultiple() && ($variables = $this->in(Site::default()->handle()))) {
  $data['data'] = Arr::removeNullValues(
- $this->in(Site::default()->handle())->data()->all()
+ $variables->data()->all()
  );
  }
 
@@ -132,7 +149,7 @@ public function fileData()
 
  public function makeLocalization($site)
  {
- return (new Variables)
+ return app(Variables::class)
  ->globalSet($this)
  ->locale($site);
  }
@@ -141,21 +158,21 @@ public function addLocalization($localization)
  {
  $localization->globalSet($this);
 
- $this->localizations[$localization->locale()] = $localization;
+ $this->localizations()[$localization->locale()] = $localization;
 
  return $this;
  }
 
  public function removeLocalization($localization)
  {
-unset($this->localizations[$localization->locale()]);
+ $this->localizations()->forget($localization->locale());
 
  return $this;
  }
 
  public function in($locale)
  {
- return $this->localizations[$locale] ?? null;
+ return $this->localizations()->get($locale);
  }
 
  public function inSelectedSite()
@@ -180,7 +197,14 @@ public function existsIn($locale)
 
  public function localizations()
  {
- return collect($this->localizations);
+ return Blink::once('global-set-localizations-'.$this->id(), function () {
+ return $this->freshLocalizations();
+ });
+ }
+
+ private function freshLocalizations()
+ {
+ return GlobalVariables::whereSet($this->handle())->keyBy->locale();
  }
 
  public function editUrl()

src/Globals/Variables.php

@@ -7,6 +7,7 @@
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Data\Augmented;
 use Statamic\Contracts\Data\Localization;
+use Statamic\Contracts\Globals\GlobalSet;
 use Statamic\Contracts\Globals\Variables as Contract;
 use Statamic\Contracts\GraphQL\ResolvesValues as ResolvesValuesContract;
 use Statamic\Data\ContainsData;
@@ -15,6 +16,10 @@
 use Statamic\Data\HasOrigin;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\GlobalVariablesBlueprintFound;
+use Statamic\Events\GlobalVariablesCreated;
+use Statamic\Events\GlobalVariablesDeleted;
+use Statamic\Events\GlobalVariablesSaved;
+use Statamic\Events\GlobalVariablesSaving;
 use Statamic\Facades;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Site;
@@ -28,6 +33,8 @@ class Variables implements Contract, Localization, Augmentable, ResolvesValuesCo
 
  protected $set;
  protected $locale;
+ protected $afterSaveCallbacks = [];
+ protected $withEvents = true;
 
  public function __construct()
  {
@@ -37,7 +44,11 @@ public function __construct()
 
  public function globalSet($set = null)
  {
- return $this->fluentlyGetOrSet('set')->args(func_get_args());
+ return $this->fluentlyGetOrSet('set')
+ ->getter(function ($set) {
+ return $set instanceof GlobalSet ? $set : Facades\GlobalSet::find($set);
+ })
+ ->args(func_get_args());
  }
 
  public function locale($locale = null)
@@ -47,12 +58,12 @@ public function locale($locale = null)
 
  public function id()
  {
- return $this->globalSet()->id();
+ return $this->handle().($this->locale ? '::'.$this->locale : '');
  }
 
  public function handle()
  {
- return $this->globalSet()->handle();
+ return $this->set instanceof GlobalSet ? $this->set->handle() : $this->set;
  }
 
  public function title()
@@ -91,16 +102,62 @@ protected function cpUrl($route)
  return cp_route($route, $params);
  }
 
+ public function afterSave($callback)
+ {
+ $this->afterSaveCallbacks[] = $callback;
+
+ return $this;
+ }
+
+ public function saveQuietly()
+ {
+ $this->withEvents = false;
+
+ return $this->save();
+ }
+
  public function save()
  {
- $this
- ->globalSet()
- ->addLocalization($this)
- ->save();
+ $isNew = is_null(Facades\GlobalVariables::find($this->id()));
+
+ $withEvents = $this->withEvents;
+ $this->withEvents = true;
+
+ $afterSaveCallbacks = $this->afterSaveCallbacks;
+ $this->afterSaveCallbacks = [];
+
+ if ($withEvents) {
+ if (GlobalVariablesSaving::dispatch($this) === false) {
+ return false;
+ }
+ }
+
+ Facades\GlobalVariables::save($this);
+
+ foreach ($afterSaveCallbacks as $callback) {
+ $callback($this);
+ }
+
+ if ($withEvents) {
+ if ($isNew) {
+ GlobalVariablesCreated::dispatch($this);
+ }
+
+ GlobalVariablesSaved::dispatch($this);
+ }
 
  return $this;
  }
 
+ public function delete()
+ {
+ Facades\GlobalVariables::delete($this);
+
+ GlobalVariablesDeleted::dispatch($this);
+
+ return true;
+ }
+
  public function site()
  {
  return Site::get($this->locale());
@@ -184,6 +241,6 @@ protected function defaultAugmentedRelations()
 
  public function fresh()
  {
- return Facades\GlobalSet::find($this->id())->in($this->locale);
+ return Facades\GlobalSet::find($this->handle())->in($this->locale);
  }
 }

src/Globals/VariablesCollection.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Statamic\Globals;
+
+use Statamic\Data\DataCollection;
+
+class VariablesCollection extends DataCollection
+{
+}

src/Providers/AppServiceProvider.php

@@ -104,6 +104,7 @@ public function register()
  \Statamic\Contracts\Taxonomies\TaxonomyRepository::class => \Statamic\Stache\Repositories\TaxonomyRepository::class,
  \Statamic\Contracts\Entries\CollectionRepository::class => \Statamic\Stache\Repositories\CollectionRepository::class,
  \Statamic\Contracts\Globals\GlobalRepository::class => \Statamic\Stache\Repositories\GlobalRepository::class,
+ \Statamic\Contracts\Globals\GlobalVariablesRepository::class => \Statamic\Stache\Repositories\GlobalVariablesRepository::class,
  \Statamic\Contracts\Assets\AssetContainerRepository::class => \Statamic\Stache\Repositories\AssetContainerRepository::class,
  \Statamic\Contracts\Structures\StructureRepository::class => \Statamic\Structures\StructureRepository::class,
  \Statamic\Contracts\Structures\CollectionTreeRepository::class => \Statamic\Stache\Repositories\CollectionTreeRepository::class,