Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor FactoryResolver #299

Merged
merged 2 commits into from
Jul 9, 2023
Merged
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
13 changes: 4 additions & 9 deletions src/Console/Domain/AllAppModules/AppModuleCreator.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Gacela\Framework\ClassResolver\Config\ConfigResolver;
use Gacela\Framework\ClassResolver\DependencyProvider\DependencyProviderNotFoundException;
use Gacela\Framework\ClassResolver\DependencyProvider\DependencyProviderResolver;
use Gacela\Framework\ClassResolver\Factory\FactoryNotFoundException;
use Gacela\Framework\ClassResolver\Factory\FactoryResolver;
use ReflectionClass;

Expand Down Expand Up @@ -65,17 +64,13 @@ private function moduleName(string $facadeClass): string
*/
private function findFactory(string $facadeClass): ?string
{
try {
$resolver = $this->factoryResolver->resolve($facadeClass);

if ((new ReflectionClass($resolver))->isAnonymous()) {
throw new FactoryNotFoundException($facadeClass);
}
$resolver = $this->factoryResolver->resolve($facadeClass);

return $resolver::class;
} catch (FactoryNotFoundException $e) {
if ((new ReflectionClass($resolver))->isAnonymous()) {
return null;
}

return $resolver::class;
}

/**
Expand Down
15 changes: 5 additions & 10 deletions src/Framework/ClassResolver/AbstractClassResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,10 @@ private function getGacelaConfigFile(): GacelaConfigFileInterface

private function createDefaultGacelaClass(): ?object
{
switch ($this->getResolvableType()) {
case FactoryResolver::TYPE:
return new class() extends AbstractFactory {
};
case ConfigResolver::TYPE:
return new class() extends AbstractConfig {
};
default:
return null;
}
return match ($this->getResolvableType()) {
FactoryResolver::TYPE => new class() extends AbstractFactory {},
ConfigResolver::TYPE => new class() extends AbstractConfig {},
default => null,
};
}
}
21 changes: 0 additions & 21 deletions src/Framework/ClassResolver/Factory/FactoryNotFoundException.php

This file was deleted.

8 changes: 1 addition & 7 deletions src/Framework/ClassResolver/Factory/FactoryResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,12 @@ final class FactoryResolver extends AbstractClassResolver

/**
* @param object|class-string $caller
*
* @throws FactoryNotFoundException
*/
public function resolve(object|string $caller): AbstractFactory
{
/** @var ?AbstractFactory $resolved */
/** @var AbstractFactory $resolved */
$resolved = $this->doResolve($caller);

if ($resolved === null) {
throw new FactoryNotFoundException($caller);
}

return $resolved;
}

Expand Down
Loading