refactor analyze results, work out cyclic dependencies

deptrac.php

@@ -17,7 +17,10 @@ return static function (DeptracConfig $config): void {
             $analyzePublic = Layer::withName('AnalyzePublic')
                 ->collectors(
                     ClassLikeConfig::create('Kartierung\\Analyze\\Exception\\.+'),
-                    ClassLikeConfig::create('Kartierung\\Analyze\\Result\\.+')
+                    ClassLikeConfig::create('Kartierung\\Analyze\\Result\\.+'),
+                    ClassLikeConfig::create('Kartierung\\Analyze\\RepositoryAnalyzer'),
+                    ClassLikeConfig::create('Kartierung\\Analyze\\EntityAnalyzer'),
+                    ClassLikeConfig::create('Kartierung\\Analyze\\RecursionCheck')
                 ),
             $analyze = Layer::withName('Analyze')
                 ->collectors(
@@ -30,12 +33,20 @@ return static function (DeptracConfig $config): void {
                 ),
             $attribute = Layer::withName('Attribute')
                 ->collectors(
-                    ClassLikeConfig::create('Kartierung\\Attribute\\.*'),
+                    ClassLikeConfig::create('Kartierung\\Attribute\\.+'),
                 ),
+            $repository = Layer::withName('Repository')
+                ->collectors(
+                    ClassLikeConfig::create('Kartierung\\Repository\\.+')
+                )
         )
         ->rulesets(
             Ruleset::forLayer($analyze)
+                ->accesses($attribute),
+            Ruleset::forLayer($analyzePublic)
                 ->accesses($attribute)
-                ->accesses($analyzePublic),
+                ->accesses($analyze),
+            Ruleset::forLayer($repository)
+                ->accesses($analyzePublic)
         );
 };

src/Analyze/RepositoryAnalyzer.php

@@ -11,7 +11,6 @@ use Kartierung\Analyze\Result\RepositoryMethodParameter;
 use Kartierung\Analyze\Result\RepositoryResult;
 use Kartierung\Attribute\ListOf;
 use Kartierung\Attribute\Query;
-use Kartierung\Repository\ResolutionStrategy\ResolutionStrategyFactory;
 use ReflectionClass;
 use ReflectionIntersectionType;
 use ReflectionMethod;
@@ -23,11 +22,6 @@ use ReflectionUnionType;
  */
 readonly class RepositoryAnalyzer
 {
-
-    public function __construct(
-        private ResolutionStrategyFactory $methodValidator
-    ) {}
-
     /**
      * @param class-string<R> $repositoryClass
      * @noinspection PhpDocMissingThrowsInspection
@@ -40,6 +34,7 @@ readonly class RepositoryAnalyzer
         $refClass = new ReflectionClass($repositoryClass);
 
         return new RepositoryResult(
+            repoFqcn: $repositoryClass,
             methods: $this->methods($refClass)
         );
     }
@@ -60,15 +55,6 @@ readonly class RepositoryAnalyzer
             $params = $this->parameters($refMethod);
 
             $name = $refMethod->name;
-            $resolutionStrategy = $this->methodValidator->forRepositoryMethod(
-                repName: $refClass->name,
-                methodName: $name,
-                query: $query,
-                returnType: $returnType,
-                returnsNullable: $returnsNullable,
-                listType: $listType,
-                params: $params
-            );
 
             $methods[$refMethod->name] = new RepositoryMethod(
                 query: $query,
@@ -77,7 +63,6 @@ readonly class RepositoryAnalyzer
                 returnListType: $listType,
                 name: $name,
                 parameters: $params,
-                resolutionStrategy: $resolutionStrategy
             );
         }
 

src/Analyze/Result/RepositoryMethod.php

@@ -19,15 +19,6 @@ readonly class RepositoryMethod
         public bool $returnsNullable,
         public ?string $returnListType,
         public string $name,
-        public array $parameters,
+        public array $parameters
-        public ResolutionStrategy $resolutionStrategy
     ) {}
-
-    /**
-     * @param array<string, mixed> $parameters
-     */
-    public function createQuery(array $parameters): LazyQuery
-    {
-        return $this->resolutionStrategy->createQuery($this, $parameters);
-    }
 }

src/Analyze/Result/RepositoryResult.php

@@ -7,9 +7,11 @@ namespace Kartierung\Analyze\Result;
 readonly class RepositoryResult
 {
     /**
+     * @param class-string<object> $repoFqcn
      * @param array<string, RepositoryMethod> $methods
      */
     public function __construct(
+        public string $repoFqcn,
         public array $methods
     ) {}
 }

src/Repository/Repository.php

@@ -23,8 +23,7 @@ readonly class Repository
      */
     public function ofType(string $clazz): object
     {
-        $resolutionStrategyFactory = new ResolutionStrategyFactory();
+        $repoResult = (new RepositoryAnalyzer())->analyze($clazz);
-        $repoResult = (new RepositoryAnalyzer($resolutionStrategyFactory))->analyze($clazz);
 
         /**
          * @var R $proxy
@@ -46,7 +45,11 @@ readonly class Repository
                 $repoMethod = $this->repoResult->methods[$methodName];
                 $queryArgs = $this->callArgsToQueryArgs($repoMethod, $arguments);
 
-                $query = $repoMethod->createQuery($queryArgs);
+                $strategy = (new ResolutionStrategyFactory())->forRepositoryMethod(
+                    $this->repoResult,
+                    $repoMethod
+                );
+                $query = $strategy->createQuery($repoMethod, $queryArgs);
 
                 return $query->execute($this->pdo);
             }

src/Repository/ResolutionStrategy/ResolutionStrategyFactory.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace Kartierung\Repository\ResolutionStrategy;
 
 use Kartierung\Analyze\Exception\InvalidRepository;
+use Kartierung\Analyze\Result\RepositoryMethod;
+use Kartierung\Analyze\Result\RepositoryResult;
 
 class ResolutionStrategyFactory
 {
@@ -13,17 +15,20 @@ class ResolutionStrategyFactory
      * @param class-string|null $listType
      */
     public function forRepositoryMethod(
-        string $repName,
+        RepositoryResult $repositoryResult,
-        string $methodName,
+        RepositoryMethod $method,
-        ?string $query,
-        string $returnType,
-        bool $returnsNullable,
-        ?string $listType,
-        array $params
     ): ResolutionStrategy
     {
+        $params = $method->parameters;
         $oneParam = count($params) === 1;
 
+        $query = $method->query;
+        $methodName = $method->name;
+        $returnType = $method->returnType;
+        $returnsNullable = $method->returnsNullable;
+        $listType = $method->returnListType;
+        $repName = $repositoryResult->repoFqcn;
+
         return match (true) {
             $query !== null => new UserDefinedQuery(),
 

tests/Repository/ResolutionStrategy/FindAllTest.php

@@ -37,10 +37,9 @@ class FindAllTest extends SqliteBaseCase
             returnsNullable: true,
             returnListType: SimpleEntity::class,
             name: '',
-            parameters: [],
+            parameters: []
-            resolutionStrategy: new FindAll()
         );
-        $query = $method->createQuery([]);
+        $query = (new FindAll())->createQuery($method, []);
 
         // When
         $result = $query->execute($this->getPdo());

tests/Repository/ResolutionStrategy/FindByIdTest.php

@@ -39,9 +39,8 @@ class FindByIdTest extends SqliteBaseCase
             returnListType: '',
             name: '',
             parameters: [],
-            resolutionStrategy: $findBy
         );
-        $query = $method->createQuery([1]);
+        $query = $findBy->createQuery($method, [1]);
 
         // When
         $result = $query->execute($this->getPdo());
@@ -65,9 +64,8 @@ class FindByIdTest extends SqliteBaseCase
             returnListType: '',
             name: '',
             parameters: [],
-            resolutionStrategy: $findBy
         );
-        $query = $method->createQuery([3]);
+        $query = $findBy->createQuery($method, [3]);
 
         // When
         $result = $query->execute($this->getPdo());
@@ -91,9 +89,8 @@ class FindByIdTest extends SqliteBaseCase
             returnListType: '',
             name: '',
             parameters: [],
-            resolutionStrategy: $findBy
         );
-        $query = $method->createQuery([4]);
+        $query = $findBy->createQuery($method, [4]);
 
         // When
         $result = $query->execute($this->getPdo());

tests/Repository/ResolutionStrategy/ResolutionStrategyFactoryTest.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Kartierung\Repository\ResolutionStrategy;
 
+use Kartierung\Analyze\Result\RepositoryMethod;
+use Kartierung\Analyze\Result\RepositoryResult;
 use Kartierung\FullEntity;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
@@ -33,15 +35,24 @@ class ResolutionStrategyFactoryTest extends TestCase
         string $strategyClass
     ): void
     {
-        // When
+        // Given
-        $function = (new ResolutionStrategyFactory())->forRepositoryMethod(
+        $method = new RepositoryMethod(
-            repName: $repName,
-            methodName: $name,
             query: $query,
             returnType: $returnType,
             returnsNullable: $returnsNullable,
-            listType: $listType,
+            returnListType: $listType,
-            params: $params
+            name: $name,
+            parameters: $params
+        );
+        $repositoryResult = new RepositoryResult(
+            '',
+            [$method]
+        );
+
+        // When
+        $function = (new ResolutionStrategyFactory())->forRepositoryMethod(
+            $repositoryResult,
+            $method
         );
 
         // Then
@@ -69,15 +80,24 @@ class ResolutionStrategyFactoryTest extends TestCase
         string $strategyClass
     ): void
     {
-        // When
+        // Given
-        $function = (new ResolutionStrategyFactory())->forRepositoryMethod(
+        $method = new RepositoryMethod(
-            repName: $repName,
-            methodName: $name,
             query: $query,
             returnType: $returnType,
-            returnsNullable: false,
+            returnsNullable: true,
-            listType: $listType,
+            returnListType: $listType,
-            params: $params
+            name: $name,
+            parameters: $params
+        );
+        $repositoryResult = new RepositoryResult(
+            '',
+            [$method]
+        );
+
+        // When
+        $function = (new ResolutionStrategyFactory())->forRepositoryMethod(
+            $repositoryResult,
+            $method
         );
 
         // Then

tests/Repository/ResolutionStrategy/SaveEntityTest.php

@@ -47,10 +47,9 @@ class SaveEntityTest extends SqliteBaseCase
                     function: ParameterFunction::STATEMENT_PARAMETER
                 )
             ],
-            resolutionStrategy: $strategy
         );
         $entity = new SimpleEntity(null, 'foobar');
-        $query = $method->createQuery([$entity]);
+        $query = $strategy->createQuery($method, [$entity]);
 
         // When
         $result = $query->execute($this->getPdo());
@@ -83,10 +82,9 @@ class SaveEntityTest extends SqliteBaseCase
                     function: ParameterFunction::STATEMENT_PARAMETER
                 )
             ],
-            resolutionStrategy: $strategy
         );
         $entity = new SimpleEntity(1, 'foobar');
-        $query = $method->createQuery([$entity]);
+        $query = $strategy->createQuery($method, [$entity]);
 
         // When
         $result = $query->execute($this->getPdo());