refactor: Tidy up repository creation code

Author: ollieread

src/Concise.php

@@ -18,6 +18,11 @@ final class Concise
      */
     private Application $app;
 
+    /**
+     * @var \Illuminate\Database\DatabaseManager
+     */
+    private DatabaseManager $databases;
+
     /**
      * @var \Articulate\Concise\IdentityMap
      */
@@ -42,10 +47,11 @@ final class Concise
      */
     private array $repositories = [];
 
-    public function __construct(Application $app)
+    public function __construct(Application $app, DatabaseManager $databases)
     {
         $this->app        = $app;
         $this->identities = new IdentityMap();
+        $this->databases  = $databases;
     }
 
     /**
@@ -231,10 +237,17 @@ public function repository(string $class): Repository
 
         $repositoryClass = $mapper->repository();
 
-        return $this->repositories[$class] = new $repositoryClass(
-            $this,
-            $mapper,
-            $this->app->make(DatabaseManager::class)->connection($mapper->connection())
-        );
+        /**
+         * This has to be here because Application::make() expects a 'string',
+         * not a 'class-string', which is...well, yeah, you know exactly what it
+         * is.
+         *
+         * @phpstan-ignore argument.type
+         */
+        return $this->repositories[$class] = $this->app->make($repositoryClass, [
+            'concise'    => $this,
+            'mapper'     => $mapper,
+            'connection' => $this->databases->connection($mapper->connection()),
+        ]);
     }
 }

src/ConciseServiceProvider.php

@@ -3,6 +3,7 @@
 
 namespace Articulate\Concise;
 
+use Illuminate\Database\DatabaseManager;
 use Illuminate\Support\ServiceProvider;
 
 class ConciseServiceProvider extends ServiceProvider
@@ -11,7 +12,10 @@ public function register(): void
     {
         // Register the Concise class
         $this->app->singleton(Concise::class, function () {
-            return new Concise($this->app);
+            return new Concise(
+                $this->app,
+                $this->app->make(DatabaseManager::class),
+            );
         });
 
         // Register the mappers' repositories