Require gitlib 1.7 and fix its deprecations

composer.json

@@ -20,7 +20,7 @@
         "amphp/amp": "^3.0",
         "amphp/parallel": "^2.1",
         "doctrine/collections": "^1.6.8 || ^2.0 || ^3.0",
-        "gitonomy/gitlib": "^1.6",
+        "gitonomy/gitlib": "^1.7",
         "laravel/serializable-closure": "^2.0",
         "monolog/monolog": "^2.0 || ^3.0",
         "ondram/ci-detector": "^4.0",

resources/config/services.yml

@@ -31,9 +31,11 @@ services:
     GrumPHP\Git\GitRepository:
         arguments:
             - '@GrumPHP\Locator\GitRepositoryLocator'
-            -
-                logger: '@grumphp.logger'
-                inherit_environment_variables: true
+            - '@Gitonomy\Git\Driver\Cli\CliDriver'
+
+    Gitonomy\Git\Driver\Cli\CliDriver:
+        arguments:
+            $logger: '@grumphp.logger'
 
     GrumPHP\IO\IOFactory:
         arguments:

spec/Git/GitRepositorySpec.php

@@ -4,6 +4,7 @@
 
 use Gitonomy\Git\Diff\Diff;
 use Gitonomy\Git\Diff\File;
+use Gitonomy\Git\Driver\Cli\CliDriver;
 use Gitonomy\Git\Exception\ProcessException;
 use Gitonomy\Git\Repository;
 use Gitonomy\Git\WorkingCopy;
@@ -17,8 +18,9 @@ class GitRepositorySpec extends ObjectBehavior
 {
     public function let(GitRepositoryLocator $locator, Repository $repository): void
     {
-        $this->beConstructedWith($locator, []);
-        $locator->locate([])->willReturn($repository);
+        $driver = new CliDriver();
+        $this->beConstructedWith($locator, $driver);
+        $locator->locate($driver)->willReturn($repository);
     }
 
     function it_is_initializable()
@@ -32,7 +34,7 @@ public function it_is_lazy(GitRepositoryLocator $locator, Repository $repository
         $this->run('command', []);
         $this->run('command', []);
 
-        $locator->locate([])->shouldBeCalledTimes(1);
+        $locator->locate(Argument::type(CliDriver::class))->shouldBeCalledTimes(1);
     }
 
     public function it_can_run_commands(Repository $repository): void

src/Git/GitRepository.php

@@ -5,6 +5,7 @@
 namespace GrumPHP\Git;
 
 use Gitonomy\Git\Diff\Diff;
+use Gitonomy\Git\Driver\Cli\CliDriver;
 use Gitonomy\Git\Exception\ProcessException;
 use Gitonomy\Git\Repository;
 use Gitonomy\Git\WorkingCopy;
@@ -23,19 +24,19 @@ class GitRepository
     private $repositoryLocator;
 
     /**
-     * @var array
+     * @var CliDriver
      */
-    private $repositoryOptions;
+    private $driver;
 
     /**
      * @var ?Repository
      */
     private $repository;
 
-    public function __construct(GitRepositoryLocator $repositoryLocator, array $repositoryOptions)
+    public function __construct(GitRepositoryLocator $repositoryLocator, CliDriver $driver)
     {
         $this->repositoryLocator = $repositoryLocator;
-        $this->repositoryOptions = $repositoryOptions;
+        $this->driver = $driver;
     }
 
     public function getWorkingCopy(): WorkingCopy
@@ -49,7 +50,7 @@ public function run(string $command, array $args): ?string
     }
 
     /**
-     * The gitonomy run method handles errors differently based on debug (throw) or non-debug (return null) mode.
+     * The gitonomy run method throws a ProcessException when the git command fails.
      * This method makes it possible to run a git command but fallback to a default string if the command fails.
      * It can be used to e.g. fetch git configurations.
      */
@@ -66,10 +67,7 @@ public function tryToRunWithFallback(callable $run, string $fallback): string
 
     public function createRawDiff(string $rawDiff): Diff
     {
-        $diff = Diff::parse($rawDiff);
-        $diff->setRepository($this->getRepository());
-
-        return $diff;
+        return Diff::parse($rawDiff, $this->getRepository());
     }
 
     /**
@@ -80,7 +78,7 @@ public function createRawDiff(string $rawDiff): Diff
     private function getRepository(): Repository
     {
         if (!$this->repository) {
-            $this->repository = $this->repositoryLocator->locate($this->repositoryOptions);
+            $this->repository = $this->repositoryLocator->locate($this->driver);
         }
 
         return $this->repository;

src/Locator/GitRepositoryLocator.php

@@ -4,6 +4,7 @@
 
 namespace GrumPHP\Locator;
 
+use Gitonomy\Git\Driver\Cli\CliDriver;
 use Gitonomy\Git\Repository;
 use GrumPHP\Util\Paths;
 
@@ -19,16 +20,12 @@ public function __construct(Paths $paths)
         $this->paths = $paths;
     }
 
-    public function locate(array $options): Repository
+    public function locate(CliDriver $driver): Repository
     {
         return new Repository(
             $this->paths->getGitWorktreeDir(),
-            array_merge(
-                [
-                    'working_dir' => $this->paths->getGitWorkingDir(),
-                ],
-                $options
-            )
+            $this->paths->getGitWorkingDir(),
+            $driver
         );
     }
 }