Switch from log to diff for $BRANCH_FILES

To not include files that where added and removed during
branch development, the switch to diff-tree was made.

Fixes issue #274

Author: sebastianfeldmann

src/Runner/Action/Cli/Command/Placeholder/BranchFiles.php

@@ -46,7 +46,7 @@ public function replacement(array $options): string
             $this->io->write('could not find branch start');
             return '';
         }
-        $files = $this->repository->getLogOperator()->getChangedFilesSince($start, ['A', 'C', 'M', 'R']);
+        $files = $this->repository->getDiffOperator()->getChangedFiles($start, $branch, ['A', 'C', 'M', 'R']);
 
         return implode(($options['separated-by'] ?? ' '), FileList::filter($files, $options));
     }

tests/unit/Runner/Action/Cli/Command/Placeholder/BranchFilesTest.php

@@ -40,10 +40,8 @@ public function testFindStarByReflogWithCustomSeparator(): void
         $repo   = $this->createRepositoryMock();
         $info   = $this->createGitInfoOperator();
         $log    = $this->createGitLogOperator();
+        $diff   = $this->createGitDiffOperator(['file1.php', 'file2.php', 'README.md']);
 
-        $log->expects($this->once())
-            ->method('getChangedFilesSince')
-            ->willReturn(['file1.php', 'file2.php', 'README.md']);
         $log->expects($this->once())
             ->method('getBranchRevFromRefLog')
             ->willReturn('main');
@@ -52,6 +50,7 @@ public function testFindStarByReflogWithCustomSeparator(): void
              ->willReturn('foo');
 
         $repo->expects($this->atLeastOnce())->method('getLogOperator')->willReturn($log);
+        $repo->expects($this->atLeastOnce())->method('getDiffOperator')->willReturn($diff);
         $repo->expects($this->atLeastOnce())->method('getInfoOperator')->willReturn($info);
 
         $placeholder = new BranchFiles($io, $config, $repo);
@@ -96,16 +95,13 @@ public function testCompareToOfType(): void
         $config = $this->createConfigMock();
         $repo   = $this->createRepositoryMock();
         $info   = $this->createGitInfoOperator();
-        $log    = $this->createGitLogOperator();
+        $diff   = $this->createGitDiffOperator(['file1.php', 'file2.php', 'README.md', 'foo.txt']);
 
-        $log->expects($this->once())
-            ->method('getChangedFilesSince')
-            ->willReturn(['file1.php', 'file2.php', 'README.md', 'foo.txt']);
         $info->expects($this->once())
              ->method('getCurrentBranch')
              ->willReturn('foo');
 
-        $repo->expects($this->atLeastOnce())->method('getLogOperator')->willReturn($log);
+        $repo->expects($this->atLeastOnce())->method('getDiffOperator')->willReturn($diff);
         $repo->expects($this->atLeastOnce())->method('getInfoOperator')->willReturn($info);
 
         $placeholder = new BranchFiles($io, $config, $repo);
@@ -123,16 +119,13 @@ public function testFilterByDirectory(): void
         $config = $this->createConfigMock();
         $repo   = $this->createRepositoryMock();
         $info   = $this->createGitInfoOperator();
-        $log    = $this->createGitLogOperator();
+        $diff   = $this->createGitDiffOperator(['foo/file1.php', 'foo/file2.php', 'README.md', 'foo.txt']);
 
-        $log->expects($this->once())
-            ->method('getChangedFilesSince')
-            ->willReturn(['foo/file1.php', 'foo/file2.php', 'README.md']);
         $info->expects($this->once())
              ->method('getCurrentBranch')
              ->willReturn('foo');
 
-        $repo->expects($this->atLeastOnce())->method('getLogOperator')->willReturn($log);
+        $repo->expects($this->atLeastOnce())->method('getDiffOperator')->willReturn($diff);
         $repo->expects($this->atLeastOnce())->method('getInfoOperator')->willReturn($info);
 
         $placeholder = new BranchFiles($io, $config, $repo);
@@ -150,16 +143,13 @@ public function testReplaceWith(): void
         $config = $this->createConfigMock();
         $repo   = $this->createRepositoryMock();
         $info   = $this->createGitInfoOperator();
-        $log    = $this->createGitLogOperator();
+        $diff   = $this->createGitDiffOperator(['foo/file1.php', 'foo/file2.php', 'README.md']);
 
-        $log->expects($this->once())
-            ->method('getChangedFilesSince')
-            ->willReturn(['foo/file1.php', 'foo/file2.php', 'README.md']);
         $info->expects($this->once())
             ->method('getCurrentBranch')
             ->willReturn('foo');
 
-        $repo->expects($this->atLeastOnce())->method('getLogOperator')->willReturn($log);
+        $repo->expects($this->atLeastOnce())->method('getDiffOperator')->willReturn($diff);
         $repo->expects($this->atLeastOnce())->method('getInfoOperator')->willReturn($info);
 
         $placeholder = new BranchFiles($io, $config, $repo);