Better migration for new verbs_snapshot table (#153)

* Better migration for new verbs_snapshot table

* Fix styling

database/migrations/2024_04_16_115559_create_verb_events_table.php

@@ -10,7 +10,7 @@ public function up()
     {
         // If they've already migrated under the previous migration name, just skip
         if (Schema::hasTable($this->tableName())) {
-            throw new RuntimeException('The create_verbs_* migrations have been renamed. See <https://verbs.thunk.dev/docs/reference/upgrading>');
+            return;
         }
 
         Schema::create($this->tableName(), function (Blueprint $table) {

database/migrations/2024_04_16_115559_create_verb_snapshots_table.php

@@ -1,19 +1,23 @@
 <?php
 
+use Glhd\Bits\Contracts\MakesSnowflakes;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Date;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Thunk\Verbs\Facades\Id;
 
 return new class extends Migration
 {
     public function up()
     {
-        // If they've already migrated under the previous migration name, just skip
-        if (Schema::hasTable($this->tableName())) {
-            throw new RuntimeException('The create_verbs_* migrations have been renamed. See <https://verbs.thunk.dev/docs/reference/upgrading>');
+        // If we migrated before Verbs 0.5.0 we need to do a little extra work
+        $migrating = Schema::hasTable($this->tableName());
 
-            return;
+        if ($migrating) {
+            Schema::rename($this->tableName(), '__verbs_snapshots_pre_050');
         }
 
         Schema::create($this->tableName(), function (Blueprint $table) {
@@ -33,11 +37,37 @@ public function up()
 
             $table->index(['state_id', 'type']);
         });
+
+        if ($migrating) {
+            DB::table('__verbs_snapshots_pre_050')
+                ->select('*')
+                ->chunkById(100, $this->migrateChunk(...));
+        }
     }
 
     public function down()
     {
         Schema::dropIfExists($this->tableName());
+
+        if (Schema::hasTable('__verbs_snapshots_pre_050')) {
+            Schema::rename('__verbs_snapshots_pre_050', $this->tableName());
+        }
+    }
+
+    protected function migrateChunk(Collection $chunk): void
+    {
+        $rows = $chunk->map(fn ($row) => [
+            'id' => app(MakesSnowflakes::class)->makeFromTimestamp(Date::parse($row->created_at))->id(),
+            'type' => $row->type,
+            'state_id' => $row->id,
+            'data' => $row->data,
+            'last_event_id' => $row->last_event_id,
+            'expires_at' => null,
+            'created_at' => $row->created_at,
+            'updated_at' => $row->updated_at,
+        ]);
+
+        DB::table($this->tableName())->insert($rows->toArray());
     }
 
     protected function tableName(): string

database/migrations/2024_04_16_115559_create_verb_state_events_table.php

@@ -11,7 +11,7 @@ public function up()
     {
         // If they've already migrated under the previous migration name, just skip
         if (Schema::hasTable($this->tableName())) {
-            throw new RuntimeException('The create_verbs_* migrations have been renamed. See <https://verbs.thunk.dev/docs/reference/upgrading>');
+            return;
         }
 
         Schema::create($this->tableName(), function (Blueprint $table) {

examples/Monopoly/src/Events/Setup/GameStarted.php

@@ -25,7 +25,7 @@ public function applyToGame(GameState $game)
         $game->started = true;
         $game->started_at = now()->toImmutable();
         $game->player_ids = [];
-        $game->board = new Board();
-        $game->bank = new Bank();
+        $game->board = new Board;
+        $game->bank = new Bank;
     }
 }

examples/Monopoly/src/Game/Spaces/Space.php

@@ -18,7 +18,7 @@ abstract class Space implements SerializedByVerbs
 
     public static function instance(): static
     {
-        return self::$instances[static::class] ?? new static();
+        return self::$instances[static::class] ?? new static;
     }
 
     public function __construct()

examples/Monopoly/tests/MonopolyTest.php

@@ -32,7 +32,7 @@
     $player1_id = snowflake_id();
     $player2_id = snowflake_id();
 
-    $game_state = verb(new GameStarted())->state(GameState::class);
+    $game_state = verb(new GameStarted)->state(GameState::class);
 
     expect($game_state->started)->toBeTrue()
         ->and($game_state->board->spaces->count())->toBe(40)

src/Event.php

@@ -43,7 +43,7 @@ public function states(): StateCollection
     {
         // TODO: This is a bit hacky, but is probably OK right now
 
-        static $map = new WeakMap();
+        static $map = new WeakMap;
 
         return $map[$this] ??= app(EventStateRegistry::class)->getStates($this);
     }

src/Lifecycle/EventStore.php

@@ -70,7 +70,7 @@ protected function readEvents(
     /** @param  Event[]  $events */
     protected function guardAgainstConcurrentWrites(array $events): void
     {
-        $max_event_ids = new Collection();
+        $max_event_ids = new Collection;
 
         $query = VerbStateEvent::query()->toBase();
 

src/Lifecycle/Guards.php

@@ -36,12 +36,12 @@ public function authorize(): static
             $this->event->failedAuthorization($this->state);
         }
 
-        throw new AuthorizationException();
+        throw new AuthorizationException;
     }
 
     public function validate(): static
     {
-        $exception = new EventNotValidForCurrentState();
+        $exception = new EventNotValidForCurrentState;
 
         try {
             if ($this->passesValidation()) {

src/Lifecycle/Hook.php

@@ -48,7 +48,7 @@ public function __construct(
         public Closure $callback,
         public array $events = [],
         public array $states = [],
-        public SplObjectStorage $phases = new SplObjectStorage(),
+        public SplObjectStorage $phases = new SplObjectStorage,
         public ?string $name = null,
     ) {}
 

src/Lifecycle/MetadataManager.php

@@ -21,8 +21,8 @@ class MetadataManager
 
     public function __construct()
     {
-        $this->ephemeral = new WeakMap();
-        $this->persistent = new WeakMap();
+        $this->ephemeral = new WeakMap;
+        $this->persistent = new WeakMap;
     }
 
     public function createMetadataUsing(?callable $callback = null): void
@@ -41,12 +41,12 @@ public function setLastResults(Event $event, Collection $results): static
 
     public function getLastResults(Event $event): Collection
     {
-        return $this->getEphemeral($event, '_last_results', new Collection());
+        return $this->getEphemeral($event, '_last_results', new Collection);
     }
 
     public function getEphemeral(Event|State $target, ?string $key = null, mixed $default = null): mixed
     {
-        $ephemeral = data_get($this->ephemeral[$target] ?? [], $key, $not_found = new stdClass());
+        $ephemeral = data_get($this->ephemeral[$target] ?? [], $key, $not_found = new stdClass);
 
         if ($ephemeral === $not_found) {
             $this->setEphemeral($target, $key, $default);
@@ -88,7 +88,7 @@ public function initialize(Event $event): Metadata
 
     protected function makeMetadata(Event $event): Metadata
     {
-        $metadata = new Metadata();
+        $metadata = new Metadata;
 
         foreach ($this->callbacks as $callback) {
             $result = $callback($metadata, $event);

src/Metadata.php

@@ -11,7 +11,7 @@ class Metadata implements ArrayAccess
 
     public function __construct(array $data = [])
     {
-        $this->extra = new Collection();
+        $this->extra = new Collection;
 
         $this->merge($data);
     }

src/StateFactory.php

@@ -39,13 +39,13 @@ public static function new(string $state_class, array $data = []): static
     /** @param  class-string<TStateType>  $state_class */
     public function __construct(
         protected string $state_class,
-        protected Collection $transformations = new Collection(),
+        protected Collection $transformations = new Collection,
         protected ?int $count = null,
         protected int|string|null $id = null,
         protected bool $singleton = false,
         protected ?Generator $faker = null,
-        protected Collection $makeCallbacks = new Collection(),
-        protected Collection $createCallbacks = new Collection(),
+        protected Collection $makeCallbacks = new Collection,
+        protected Collection $createCallbacks = new Collection,
     ) {}
 
     public function definition(): array
@@ -114,7 +114,7 @@ public function create(array $data = [], Bits|UuidInterface|AbstractUid|int|stri
         }
 
         if ($this->count < 1) {
-            return new StateCollection();
+            return new StateCollection;
         }
 
         if ($this->count === 1) {

src/Support/EventStateRegistry.php

@@ -23,8 +23,8 @@ public function __construct(
 
     public function getStates(Event $event): StateCollection
     {
-        $discovered = new StateCollection();
-        $deferred = new StateCollection();
+        $discovered = new StateCollection;
+        $deferred = new StateCollection;
 
         foreach ($this->getAttributes($event) as $attribute) {
             // If there are state dependencies that the attribute relies on that we haven't already

src/Support/Normalization/CollectionNormalizer.php

@@ -27,7 +27,7 @@ public function denormalize(mixed $data, string $type, ?string $format = null, a
         $isAssoc = data_get($data, 'associative', false);
 
         if ($items === []) {
-            return new $fqcn();
+            return new $fqcn;
         }
 
         $subtype = data_get($data, 'type');
@@ -100,7 +100,7 @@ class_basename($collection),
     protected function getCollectionMetadata(Collection $collection): array
     {
         $only_objects = true;
-        $types = new Collection();
+        $types = new Collection;
 
         foreach ($collection as $value) {
             $only_objects = $only_objects && is_object($value);
@@ -121,6 +121,6 @@ protected function getSharedAncestorTypes(Collection $types)
                 ->unique();
 
             return $common->isEmpty() ? $parents : $parents->intersect($common);
-        }, new Collection());
+        }, new Collection);
     }
 }

src/Support/Reflector.php

@@ -70,7 +70,7 @@ public static function getParametersOfType(string $type, ReflectionFunctionAbstr
         $method = static::reflectFunction($method);
 
         if (empty($parameters = $method->getParameters())) {
-            return new Collection();
+            return new Collection;
         }
 
         return collect($parameters)

src/Support/Wormhole.php

@@ -33,12 +33,12 @@ public function realNow(): CarbonInterface
 
     public function realMutableNow(): Carbon
     {
-        return $this->mutable_now?->copy() ?? Carbon::instance(new DateTime());
+        return $this->mutable_now?->copy() ?? Carbon::instance(new DateTime);
     }
 
     public function realImmutableNow(): CarbonImmutable
     {
-        return $this->immutable_now ?? CarbonImmutable::instance(new DateTime());
+        return $this->immutable_now ?? CarbonImmutable::instance(new DateTime);
     }
 
     public function warp(Event $event, Closure $callback)

src/Testing/EventStoreFake.php

@@ -26,7 +26,7 @@ class EventStoreFake implements StoresEvents
     public function __construct(
         protected MetadataManager $metadata,
     ) {
-        $this->events = new Collection();
+        $this->events = new Collection;
     }
 
     public function read(
@@ -50,7 +50,7 @@ public function read(
     public function write(array $events): bool
     {
         foreach ($events as $event) {
-            $this->events[$event::class] ??= new Collection();
+            $this->events[$event::class] ??= new Collection;
             $this->events[$event::class]->push($event);
         }
 
@@ -61,7 +61,7 @@ public function write(array $events): bool
     public function committed(string $class_name, ?Closure $filter = null): Collection
     {
         if (! $this->hasCommitted($class_name)) {
-            return new Collection();
+            return new Collection;
         }
 
         return $this->events[$class_name]

src/Testing/SnapshotStoreFake.php

@@ -23,13 +23,13 @@ class SnapshotStoreFake implements StoresSnapshots
 
     public function __construct()
     {
-        $this->states = new Collection();
+        $this->states = new Collection;
     }
 
     public function write(array $states): bool
     {
         foreach ($states as $state) {
-            $this->states[$state::class] ??= new Collection();
+            $this->states[$state::class] ??= new Collection;
             $this->states[$state::class]->put(Id::from($state->id), $state);
         }
 
@@ -48,7 +48,7 @@ public function loadSingleton(string $type): ?State
 
     public function reset(): bool
     {
-        $this->states = new Collection();
+        $this->states = new Collection;
 
         return true;
     }
@@ -88,7 +88,7 @@ protected function assertWrittenTimes(string $class_name, int $times = 1): stati
     public function written(string $class_name, ?Closure $filter = null): Collection
     {
         if (! $this->hasWritten($class_name)) {
-            return new Collection();
+            return new Collection;
         }
 
         return $this->states[$class_name]

src/VerbsServiceProvider.php

@@ -103,11 +103,11 @@ public function packageRegistered()
 
         $this->app->singleton(PropertyNormalizer::class, function () {
             $loader = class_exists(AttributeLoader::class)
-                ? new AttributeLoader()
-                : new AnnotationLoader();
+                ? new AttributeLoader
+                : new AnnotationLoader;
 
             return new PropertyNormalizer(
-                propertyTypeExtractor: new ReflectionExtractor(),
+                propertyTypeExtractor: new ReflectionExtractor,
                 classDiscriminatorResolver: new ClassDiscriminatorFromClassMetadata(new ClassMetadataFactory($loader)),
             );
         });
@@ -120,7 +120,7 @@ classDiscriminatorResolver: new ClassDiscriminatorFromClassMetadata(new ClassMet
                     ->map(fn ($class_name) => app($class_name))
                     ->values()
                     ->all(),
-                encoders: [new JsonEncoder()],
+                encoders: [new JsonEncoder],
             );
         });
 

tests/Feature/SerializationTest.php

@@ -70,13 +70,13 @@
 it('allows us to store a serializable class as a property', function () {
     expect(function () {
         EventWithDto::fire(
-            dto: new DTO()
+            dto: new DTO
         );
     })->not->toThrow(TypeError::class);
 });
 
 it('honors configured context', function () {
-    $target = new class()
+    $target = new class
     {
         public $is_public = 'public';