Merge pull request #15 from Saritasa/feature/use-container-resolver-in-factory

Use container resolver for all built repositories in default factory

Author: populov

src/Contracts/IRepositoryFactory.php

@@ -2,6 +2,7 @@
 
 namespace Saritasa\LaravelRepositories\Contracts;
 
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Saritasa\LaravelRepositories\Exceptions\RepositoryException;
 use Saritasa\LaravelRepositories\Exceptions\RepositoryRegisterException;
 
@@ -18,6 +19,7 @@ interface IRepositoryFactory
      * @return IRepository
      *
      * @throws RepositoryException
+     * @throws BindingResolutionException
      */
     public function getRepository(string $modelClass): IRepository;
 

src/Repositories/RepositoryFactory.php

@@ -2,10 +2,11 @@
 
 namespace Saritasa\LaravelRepositories\Repositories;
 
+use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Contracts\Container\Container;
 use Illuminate\Database\Eloquent\Model;
 use Saritasa\LaravelRepositories\Contracts\IRepository;
 use Saritasa\LaravelRepositories\Contracts\IRepositoryFactory;
-use Saritasa\LaravelRepositories\Exceptions\RepositoryException;
 use Saritasa\LaravelRepositories\Exceptions\RepositoryRegisterException;
 
 /**
@@ -27,6 +28,24 @@ class RepositoryFactory implements IRepositoryFactory
      */
     protected $sharedInstances = [];
 
+    /**
+     * DI container instance.
+     *
+     * @var Container
+     */
+    protected $container;
+
+    /**
+     * Builds repositories for managing models.
+     *
+     * @param Container $container DI container instance
+     */
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
+
+
     /** {@inheritdoc} */
     public function getRepository(string $modelClass): IRepository
     {
@@ -44,15 +63,20 @@ public function getRepository(string $modelClass): IRepository
      *
      * @return IRepository
      *
-     * @throws RepositoryException
+     * @throws BindingResolutionException
      */
     protected function build(string $modelClass): IRepository
     {
-        if (isset($this->registeredRepositories[$modelClass])) {
-            return new $this->registeredRepositories[$modelClass]($modelClass);
+        $repositoryClass = $this->registeredRepositories[$modelClass] ?? Repository::class;
+
+        $parameters = [];
+
+        if ($repositoryClass === Repository::class || is_subclass_of($repositoryClass, Repository::class)
+        ) {
+            $parameters = ['modelClass' => $modelClass];
         }
 
-        return new Repository($modelClass);
+        return $this->container->make($repositoryClass, $parameters);
     }
 
     /** {@inheritdoc} */

tests/RepositoryFactoryTest.php

@@ -2,8 +2,13 @@
 
 namespace Saritasa\LaravelRepositories\Tests;
 
+use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Contracts\Container\Container;
 use Illuminate\Database\Eloquent\Model;
+use Mockery;
+use Mockery\MockInterface;
 use PHPUnit\Framework\TestCase;
+use Saritasa\LaravelRepositories\Contracts\IRepository;
 use Saritasa\LaravelRepositories\Exceptions\RepositoryException;
 use Saritasa\LaravelRepositories\Exceptions\RepositoryRegisterException;
 use Saritasa\LaravelRepositories\Repositories\Repository;
@@ -15,6 +20,24 @@
  */
 class RepositoryFactoryTest extends TestCase
 {
+    /**
+     * Connection instance mock.
+     *
+     * @var Container|MockInterface
+     */
+    protected $container;
+
+    /**
+     * Setup tests setting.
+     *
+     * @return void
+     */
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->container = Mockery::mock(Container::class);
+    }
+
     /**
      * Test register custom repositories for model with different cases.
      *
@@ -29,10 +52,11 @@ class RepositoryFactoryTest extends TestCase
      * @throws RepositoryRegisterException
      * @throws RepositoryException
      * @throws InvalidArgumentException
+     * @throws BindingResolutionException
      */
     public function testRegisterCustomRepositories(string $model, string $repository, bool $expectException): void
     {
-        $repositoryFactory = new RepositoryFactory();
+        $repositoryFactory = new RepositoryFactory($this->container);
 
         if ($expectException) {
             $this->expectException(RepositoryRegisterException::class);
@@ -41,8 +65,10 @@ public function testRegisterCustomRepositories(string $model, string $repository
         $repositoryFactory->register($model, $repository);
 
         if (!$expectException) {
+            $expectedSRepository = Mockery::mock($repository);
+            $this->container->shouldReceive('make')->andReturn($expectedSRepository);
             $actualRepositoryInstance = $repositoryFactory->getRepository($model);
-            $this->assertEquals($repository, get_class($actualRepositoryInstance));
+            $this->assertSame($expectedSRepository, $actualRepositoryInstance);
         }
     }
 
@@ -73,13 +99,15 @@ public function registerRepositoriesData(): array
      * @throws RepositoryRegisterException
      * @throws RepositoryException
      * @throws InvalidArgumentException
+     * @throws BindingResolutionException
      */
     public function testThatEachTimeReturnsTheSameInstance(): void
     {
-        $repositoryFactory = new RepositoryFactory();
+        $repositoryFactory = new RepositoryFactory($this->container);
         $modelObject = new class extends Model {
         };
         $modelClass = get_class($modelObject);
+        $this->container->shouldReceive('make')->andReturn(Mockery::mock(IRepository::class));
         $repositoryFactory->register($modelClass, Repository::class);
         $firstInstance = $repositoryFactory->getRepository($modelClass);
         $secondInstance = $repositoryFactory->getRepository($modelClass);