ModelResolver as a service

MIGRATION.md

@@ -10,6 +10,7 @@ None
 
 - Added a `ConfigBuild`, to follow ICanBoogie/Config changes.
 - Added the console commands `activerecord:connections:list` and `activerecord:models:list`, with aliases `activerecord:connections` and `activerecord:models` respectively.
+- Configures `StaticModelResolver`.
 
 ### Backward Incompatible Changes
 

config/services.yml

@@ -12,10 +12,16 @@ services:
     factory: [ ICanBoogie\Binding\ActiveRecord\Factory, build_connections ]
     public: true # required by $app->connections
 
-  ICanBoogie\ActiveRecord\ModelProvider:
-    class: ICanBoogie\ActiveRecord\ModelCollection
+  ICanBoogie\ActiveRecord\ModelCollection:
     factory: [ ICanBoogie\Binding\ActiveRecord\Factory, build_models ]
-    public: true # required by $app->models
+
+  ICanBoogie\ActiveRecord\ModelProvider:
+    alias: ICanBoogie\ActiveRecord\ModelCollection
+    public: true # required by StaticModelProvider
+
+  ICanBoogie\ActiveRecord\ModelResolver:
+    alias: ICanBoogie\ActiveRecord\ModelCollection
+    public: true # required by StaticModelResolver
 
   # Console
 

lib/Hooks.php

@@ -15,6 +15,8 @@
 use ICanBoogie\ActiveRecord\ActiveRecordCache\RuntimeActiveRecordCache;
 use ICanBoogie\ActiveRecord\Model;
 use ICanBoogie\ActiveRecord\ModelProvider;
+use ICanBoogie\ActiveRecord\ModelResolver;
+use ICanBoogie\ActiveRecord\StaticModelResolver;
 use ICanBoogie\Application;
 use ICanBoogie\Validate\ValidationErrors;
 
@@ -40,6 +42,14 @@ public static function on_app_boot(Application\BootEvent $event): void
 
             return $models->model_for_id($id);
         });
+
+        StaticModelResolver::define(
+            static function () use ($app): ModelResolver {
+                static $resolver;
+
+                return $resolver ??= $app->service_for_class(ModelResolver::class);
+            }
+        );
     }
 
     /*

tests/lib/ActiveRecordTest.php

@@ -11,19 +11,36 @@
 
 namespace Test\ICanBoogie\Binding\ActiveRecord;
 
+use ICanBoogie\ActiveRecord\Model;
 use ICanBoogie\Validate\ValidationErrors;
 use PHPUnit\Framework\TestCase;
+use Test\ICanBoogie\Binding\ActiveRecord\Acme\Article;
 use Test\ICanBoogie\Binding\ActiveRecord\Acme\SampleRecord;
 
 /**
  * @small
  */
-class ActiveRecordTest extends TestCase
+final class ActiveRecordTest extends TestCase
 {
-    public function test_validate()
+    public function test_validate(): void
     {
         $record = new SampleRecord();
 
         $this->assertInstanceOf(ValidationErrors::class, $record->validate());
     }
+
+    public function test_model_id(): void
+    {
+        $record = Article::from();
+
+        $this->assertEquals('articles', $record->model_id);
+    }
+
+    public function test_model(): void
+    {
+        $record = Article::from();
+
+        $this->assertInstanceOf(Model::class, $record->model);
+        $this->assertEquals('articles', $record->model->id);
+    }
 }