fix+++++++++++

Author: github-ci

src/Analyzer/AnalysisVisitor.php

@@ -8,7 +8,7 @@
 use PhpPacker\Analyzer\Processor\IncludeProcessor;
 use PhpPacker\Analyzer\Processor\NodeClassificationProcessor;
 use PhpPacker\Analyzer\Processor\SymbolProcessor;
-use PhpPacker\Storage\SqliteStorage;
+use PhpPacker\Storage\StorageInterface;
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
 
@@ -27,7 +27,7 @@ class AnalysisVisitor extends NodeVisitorAbstract
     /**
      * @phpstan-ignore-next-line constructor.unusedParameter
      */
-    public function __construct(SqliteStorage $storage, int $fileId, ?string $namespace, string $filePath)
+    public function __construct(StorageInterface $storage, int $fileId, ?string $namespace, string $filePath)
     {
         $this->nodeClassifier = new NodeClassificationProcessor();
         $this->symbolProcessor = new SymbolProcessor($storage, $fileId, $namespace);

src/Analyzer/ClassFinder.php

@@ -4,12 +4,12 @@
 
 namespace PhpPacker\Analyzer;
 
-use PhpPacker\Storage\SqliteStorage;
+use PhpPacker\Storage\StorageInterface;
 use Psr\Log\LoggerInterface;
 
 class ClassFinder
 {
-    private SqliteStorage $storage;
+    private StorageInterface $storage;
 
     private LoggerInterface $logger;
 
@@ -20,7 +20,7 @@ class ClassFinder
     private FileVerifier $fileVerifier;
 
     public function __construct(
-        SqliteStorage $storage,
+        StorageInterface $storage,
         LoggerInterface $logger,
         AutoloadResolver $autoloadResolver,
         PathResolver $pathResolver,

src/Analyzer/Processor/DependencyFileProcessor.php

@@ -7,12 +7,12 @@
 use PhpPacker\Analyzer\FileAnalyzer;
 use PhpPacker\Analyzer\FileVerifier;
 use PhpPacker\Analyzer\PathResolver;
-use PhpPacker\Storage\SqliteStorage;
+use PhpPacker\Storage\StorageInterface;
 use Psr\Log\LoggerInterface;
 
 class DependencyFileProcessor
 {
-    private SqliteStorage $storage;
+    private StorageInterface $storage;
 
     private LoggerInterface $logger;
 
@@ -23,7 +23,7 @@ class DependencyFileProcessor
     private FileVerifier $fileVerifier;
 
     public function __construct(
-        SqliteStorage $storage,
+        StorageInterface $storage,
         LoggerInterface $logger,
         FileAnalyzer $fileAnalyzer,
         PathResolver $pathResolver,

src/Analyzer/Processor/DependencyProcessor.php

@@ -4,12 +4,12 @@
 
 namespace PhpPacker\Analyzer\Processor;
 
-use PhpPacker\Storage\SqliteStorage;
+use PhpPacker\Storage\StorageInterface;
 use PhpParser\Node;
 
 class DependencyProcessor
 {
-    private SqliteStorage $storage;
+    private StorageInterface $storage;
 
     private int $fileId;
 
@@ -25,7 +25,7 @@ class DependencyProcessor
     /** @var array<array{type: string, fqcn: string, line: int, conditional: bool}> */
     private array $allDependencies = [];
 
-    public function __construct(SqliteStorage $storage, int $fileId)
+    public function __construct(StorageInterface $storage, int $fileId)
     {
         $this->storage = $storage;
         $this->fileId = $fileId;
@@ -320,10 +320,12 @@ private function addDependency(string $type, string $fqcn, int $line): void
 
         $this->storage->addDependency(
             $this->fileId,
+            null,
             $type,
             $resolvedName,
             $line,
-            $this->inConditionalContext
+            $this->inConditionalContext,
+            null
         );
         ++$this->dependencyCount;
     }

src/Analyzer/Processor/IncludeProcessor.php

@@ -4,18 +4,18 @@
 
 namespace PhpPacker\Analyzer\Processor;
 
-use PhpPacker\Storage\SqliteStorage;
+use PhpPacker\Storage\StorageInterface;
 use PhpParser\Node;
 
 class IncludeProcessor
 {
-    private SqliteStorage $storage;
+    private StorageInterface $storage;
 
     private int $fileId;
 
     private int $dependencyCount = 0;
 
-    public function __construct(SqliteStorage $storage, int $fileId)
+    public function __construct(StorageInterface $storage, int $fileId)
     {
         $this->storage = $storage;
         $this->fileId = $fileId;
@@ -36,6 +36,7 @@ public function processInclude(Node\Expr\Include_ $node, bool $inConditionalCont
 
         $this->storage->addDependency(
             $this->fileId,
+            null,
             $type,
             null,
             $node->getStartLine(),

src/Analyzer/Processor/SymbolProcessor.php

@@ -4,20 +4,20 @@
 
 namespace PhpPacker\Analyzer\Processor;
 
-use PhpPacker\Storage\SqliteStorage;
+use PhpPacker\Storage\StorageInterface;
 use PhpParser\Node;
 
 class SymbolProcessor
 {
-    private SqliteStorage $storage;
+    private StorageInterface $storage;
 
     private int $fileId;
 
     private ?string $currentNamespace;
 
     private int $symbolCount = 0;
 
-    public function __construct(SqliteStorage $storage, int $fileId, ?string $namespace)
+    public function __construct(StorageInterface $storage, int $fileId, ?string $namespace)
     {
         $this->storage = $storage;
         $this->fileId = $fileId;

src/Analyzer/TopologicalSorter.php

@@ -5,16 +5,16 @@
 namespace PhpPacker\Analyzer;
 
 use PhpPacker\Exception\CircularDependencyException;
-use PhpPacker\Storage\SqliteStorage;
+use PhpPacker\Storage\StorageInterface;
 use Psr\Log\LoggerInterface;
 
 class TopologicalSorter
 {
-    private SqliteStorage $storage;
+    private StorageInterface $storage;
 
     private LoggerInterface $logger;
 
-    public function __construct(SqliteStorage $storage, LoggerInterface $logger)
+    public function __construct(StorageInterface $storage, LoggerInterface $logger)
     {
         $this->storage = $storage;
         $this->logger = $logger;

src/Storage/SqliteStorage.php

@@ -7,7 +7,7 @@
 use PhpParser\Node;
 use Psr\Log\LoggerInterface;
 
-class SqliteStorage
+class SqliteStorage implements StorageInterface
 {
     private \PDO $pdo;
 
@@ -261,17 +261,17 @@ private function insertNewFile(array $fileData, ?bool $isEntry): int
 
     public function addSymbol(
         int $fileId,
-        string $type,
-        string $name,
+        string $symbolType,
+        string $symbolName,
         string $fqn,
         ?string $namespace = null,
         ?string $visibility = null,
         bool $isAbstract = false,
-        bool $isFinal = false,
-    ): int {
+        bool $isFinal = false
+    ): void {
         $stmt = $this->pdo->prepare('
             INSERT OR REPLACE INTO symbols (
-                file_id, symbol_type, symbol_name, fqn, namespace, 
+                file_id, symbol_type, symbol_name, fqn, namespace,
                 visibility, is_abstract, is_final
             ) VALUES (
                 :file_id, :symbol_type, :symbol_name, :fqn, :namespace,
@@ -281,46 +281,44 @@ public function addSymbol(
 
         $stmt->execute([
             ':file_id' => $fileId,
-            ':symbol_type' => $type,
-            ':symbol_name' => $name,
+            ':symbol_type' => $symbolType,
+            ':symbol_name' => $symbolName,
             ':fqn' => $fqn,
             ':namespace' => $namespace,
             ':visibility' => $visibility,
             ':is_abstract' => $isAbstract ? 1 : 0,
             ':is_final' => $isFinal ? 1 : 0,
         ]);
-
-        return (int) $this->pdo->lastInsertId();
     }
 
     public function addDependency(
         int $sourceFileId,
-        string $type,
-        ?string $targetSymbol,
+        ?int $targetFileId,
+        string $dependencyType,
+        ?string $targetSymbol = null,
         ?int $lineNumber = null,
         bool $isConditional = false,
-        ?string $context = null,
-    ): int {
+        ?string $context = null
+    ): void {
         $stmt = $this->pdo->prepare('
             INSERT INTO dependencies (
-                source_file_id, dependency_type, target_symbol, 
+                source_file_id, target_file_id, dependency_type, target_symbol,
                 line_number, is_conditional, context
             ) VALUES (
-                :source_file_id, :dependency_type, :target_symbol,
+                :source_file_id, :target_file_id, :dependency_type, :target_symbol,
                 :line_number, :is_conditional, :context
             )
         ');
 
         $stmt->execute([
             ':source_file_id' => $sourceFileId,
-            ':dependency_type' => $type,
+            ':target_file_id' => $targetFileId,
+            ':dependency_type' => $dependencyType,
             ':target_symbol' => $targetSymbol,
             ':line_number' => $lineNumber,
             ':is_conditional' => $isConditional ? 1 : 0,
             ':context' => $context,
         ]);
-
-        return (int) $this->pdo->lastInsertId();
     }
 
     public function addAutoloadRule(string $type, string $path, ?string $prefix = null, int $priority = 100): void