Skip to content
This repository was archived by the owner on Aug 27, 2024. It is now read-only.

Add resolving dependencies on factory side #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changes History

1.3.1
-----
- Resolving service dependency now happened on factory side in case if service inherit EntityService class
and don't has own constructor.

1.3.0
-----
- Remove direct dependency from dingo/api
Expand Down
18 changes: 12 additions & 6 deletions src/Services/EntityServiceFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,20 @@ public function build(string $modelClass): IEntityService
protected function buildEntityService(string $modelClass): IEntityService
{
try {
if (isset($this->registeredServices[$modelClass])) {
return $this->container->make($this->registeredServices[$modelClass]);
$entityServiceClass = $this->registeredServices[$modelClass] ?? EntityService::class;

$parameters = [];

if ($entityServiceClass === EntityService::class ||
is_subclass_of($entityServiceClass, EntityService::class)
) {
$parameters = [
'className' => $modelClass,
'repository' => $this->repositoryFactory->getRepository($modelClass),
];
}

return $this->container->make(EntityService::class, [
'className' => $modelClass,
'repository' => $this->repositoryFactory->getRepository($modelClass),
]);
return $this->container->make($entityServiceClass, $parameters);
} catch (RepositoryException $exception) {
throw new EntityServiceException($exception->getMessage(), $exception->getCode(), $exception);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/EntityServiceFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ public function testRegisterCustomRepositories(string $model, string $serviceCla
$this->repositoryFactory->shouldReceive('getRepository')
->withArgs([$model])
->andReturn(Mockery::mock(IRepository::class));
$this->container->shouldReceive('make')->withArgs([$serviceClass])->andReturn($expectedService);
$actualService= $entityServiceFactory->build($model);
$this->container->shouldReceive('make')->andReturn($expectedService);
$actualService = $entityServiceFactory->build($model);
$this->assertSame($expectedService, $actualService);
}
}
Expand Down