fixed unit tests

Author: butschster

src/Source/GitDiff/Fetcher/Source/AbstractGitSource.php

@@ -15,7 +15,7 @@
 abstract readonly class AbstractGitSource implements GitSourceInterface
 {
     public function __construct(
-        protected CommandsExecutorInterface $git,
+        protected CommandsExecutorInterface $commandsExecutor,
         private FilesInterface $files,
         protected ?LoggerInterface $logger = null,
     ) {}
@@ -112,7 +112,7 @@ protected function executeGitCommand(string $repository, string $command): array
     protected function executeGitCommandString(string $repository, string $command): string
     {
         try {
-            return $this->git->executeString(new Command(repository: $repository, command: $command));
+            return $this->commandsExecutor->executeString(new Command(repository: $repository, command: $command));
         } catch (GitCommandException $e) {
             $this->logger?->warning('Git command failed, returning empty result', [
                 'command' => $command,

tests/src/Source/GitDiff/Fetcher/Source/AbstractGitSourceTest.php

@@ -7,6 +7,7 @@
 use Butschster\ContextGenerator\Source\GitDiff\Fetcher\Source\CommitGitSource;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Test;
+use Spiral\Files\Files;
 
 #[CoversClass(CommitGitSource::class)]
 final class CommitGitSourceTest extends GitSourceTestCase
@@ -44,7 +45,7 @@ public function it_should_not_support_other_formats(): void
     public function it_should_get_changed_files_in_commit_range(): void
     {
         // Mock the git command for getting changed files
-        $expectedCommand = 'git diff --name-only \'HEAD~1..HEAD\'';
+        $expectedCommand = 'diff --name-only HEAD~1..HEAD';
         $expectedFiles = ['test2.txt'];
         $this->mockChangedFiles($expectedCommand, $expectedFiles);
 
@@ -60,7 +61,7 @@ public function it_should_get_changed_files_in_commit_range(): void
     public function it_should_get_file_diff_for_specific_file(): void
     {
         // Mock the git command for getting file diff
-        $expectedCommand = 'git diff \'HEAD~1..HEAD\' -- \'test.txt\'';
+        $expectedCommand = 'diff HEAD~1..HEAD -- test.txt';
         $expectedDiff = "diff --git a/test.txt b/test.txt\nindex 1234567..abcdef 100644\n--- a/test.txt\n+++ b/test.txt\n@@ -1 +1 @@\n-Original content\n+Modified content\n";
         $this->mockFileDiff($expectedCommand, $expectedDiff);
 
@@ -105,7 +106,7 @@ public function it_should_get_changes_for_specific_commit_hash(): void
         $commitHash = 'abc1234567890abcdef1234567890abcdef123456';
 
         // Mock the git command for getting changed files
-        $expectedCommand = "git diff --name-only '{$commitHash}~1..{$commitHash}'";
+        $expectedCommand = "diff --name-only {$commitHash}~1..{$commitHash}";
         $expectedFiles = ['specific.txt'];
         $this->mockChangedFiles($expectedCommand, $expectedFiles);
 
@@ -124,6 +125,6 @@ public function it_should_get_changes_for_specific_commit_hash(): void
     protected function setUp(): void
     {
         parent::setUp();
-        $this->commitGitSource = new CommitGitSource($this->gitClientMock, $this->logger);
+        $this->commitGitSource = new CommitGitSource($this->commandExecutorMock, new Files(), $this->logger);
     }
 }

tests/src/Source/GitDiff/Fetcher/Source/CommitGitSourceTest.php

@@ -7,6 +7,7 @@
 use Butschster\ContextGenerator\Source\GitDiff\Fetcher\Source\FileAtCommitGitSource;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Test;
+use Spiral\Files\Files;
 
 #[CoversClass(FileAtCommitGitSource::class)]
 final class FileAtCommitGitSourceTest extends GitSourceTestCase
@@ -39,7 +40,7 @@ public function it_should_get_file_at_specific_commit(): void
         $commitHash = 'abc1234567890abcdef1234567890abcdef123456';
 
         // Mock the git command for getting files at commit with path filter
-        $expectedCommand = "git show --name-only '{$commitHash}' -- 'src/'";
+        $expectedCommand = "show --name-only {$commitHash} -- src/";
         $expectedFiles = ['src/test1.php'];
         $this->mockChangedFiles($expectedCommand, $expectedFiles);
 
@@ -59,7 +60,7 @@ public function it_should_get_multiple_files_matching_pattern(): void
         $commitHash = 'abc1234567890abcdef1234567890abcdef123456';
 
         // Mock the git command for getting multiple files matching pattern
-        $expectedCommand = "git show --name-only '{$commitHash}' -- 'src/models/'";
+        $expectedCommand = "show --name-only {$commitHash} -- src/models/";
         $expectedFiles = [
             'src/models/User.php',
             'src/models/Post.php',
@@ -84,7 +85,7 @@ public function it_should_get_file_content_at_commit(): void
         $commitHash = 'abc1234567890abcdef1234567890abcdef123456';
 
         // Mock the git command for getting file content at commit
-        $expectedCommand = "git show '{$commitHash}':'test.php'";
+        $expectedCommand = "show {$commitHash}:test.php";
         $expectedContent = '<?php echo "Original";';
         $this->mockFileDiff($expectedCommand, $expectedContent);
 
@@ -125,6 +126,6 @@ public function it_should_format_reference_for_display(): void
     protected function setUp(): void
     {
         parent::setUp();
-        $this->fileAtCommitGitSource = new FileAtCommitGitSource($this->gitClientMock, $this->logger);
+        $this->fileAtCommitGitSource = new FileAtCommitGitSource($this->commandExecutorMock, new Files(), $this->logger);
     }
 }

tests/src/Source/GitDiff/Fetcher/Source/FileAtCommitGitSourceTest.php

@@ -4,7 +4,8 @@
 
 namespace Tests\Source\GitDiff\Fetcher\Source;
 
-use Butschster\ContextGenerator\Lib\Git\GitClientInterface;
+use Butschster\ContextGenerator\Lib\Git\Command;
+use Butschster\ContextGenerator\Lib\Git\CommandsExecutorInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -17,21 +18,21 @@
 abstract class GitSourceTestCase extends TestCase
 {
     protected string $repoDir = '/mocked/repo/path';
-    protected MockObject&GitClientInterface $gitClientMock;
+    protected MockObject&CommandsExecutorInterface $commandExecutorMock;
     protected LoggerInterface $logger;
 
     protected function setUp(): void
     {
         parent::setUp();
 
         // Create a mock for GitClientInterface
-        $this->gitClientMock = $this->createMock(GitClientInterface::class);
+        $this->commandExecutorMock = $this->createMock(CommandsExecutorInterface::class);
 
         // Create a logger instance
         $this->logger = new NullLogger();
 
         // Set default mock behavior for isValidRepository
-        $this->gitClientMock
+        $this->commandExecutorMock
             ->method('isValidRepository')
             ->with($this->repoDir)
             ->willReturn(true);
@@ -45,11 +46,11 @@ protected function setUp(): void
      */
     protected function mockChangedFiles(string $command, array $files): void
     {
-        $this->gitClientMock
+        $this->commandExecutorMock
             ->expects($this->atLeastOnce())
-            ->method('execute')
-            ->with($this->repoDir, $command)
-            ->willReturn($files);
+            ->method('executeString')
+            ->with(new Command($this->repoDir, $command))
+            ->willReturn(\implode("\n", $files));
     }
 
     /**
@@ -60,10 +61,10 @@ protected function mockChangedFiles(string $command, array $files): void
      */
     protected function mockFileDiff(string $command, string $diff): void
     {
-        $this->gitClientMock
+        $this->commandExecutorMock
             ->expects($this->atLeastOnce())
             ->method('executeString')
-            ->with($this->repoDir, $command)
+            ->with(new Command($this->repoDir, $command))
             ->willReturn($diff);
     }
 
@@ -74,9 +75,9 @@ protected function mockFileDiff(string $command, string $diff): void
      */
     protected function mockCommitHash(string $hash): string
     {
-        $this->gitClientMock
+        $this->commandExecutorMock
             ->method('executeString')
-            ->with($this->repoDir, 'git rev-parse HEAD')
+            ->with(new Command($this->repoDir, 'git rev-parse HEAD'))
             ->willReturn($hash);
 
         return $hash;
@@ -91,9 +92,9 @@ protected function mockCommitHash(string $hash): string
      */
     protected function mockGitCommand(string $repository, string $command, array $result): void
     {
-        $this->gitClientMock
-            ->method('execute')
-            ->with($repository, $command)
+        $this->commandExecutorMock
+            ->method('executeString')
+            ->with(new Command($this->repoDir, $command))
             ->willReturn($result);
     }
 }