Bugfixes for unpair command

Author: raphaelstolt

src/Commands/PairCommand.php

@@ -89,6 +89,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 $pair->add($persona);
             }
 
+            $this->repository->storePreviousUser();
+
             if ($this->repository->setUser($pair->factorUser())) {
                 foreach ($pair as $persona) {
                     /** @var Persona $persona */

src/Commands/UnpairCommand.php

@@ -2,9 +2,9 @@
 
 namespace Stolt\GitUserBend\Commands;
 
-use Stolt\GitUserBend\Exceptions\CommandFailed;
 use Stolt\GitUserBend\Exceptions\Exception;
 use Stolt\GitUserBend\Git\Repository;
+use Stolt\GitUserBend\Git\User;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -65,6 +65,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
             $formerPersona = $this->repository->getFormerPersonaFromConfiguration();
 
+            $this->repository->removeFormerPersonaFromConfiguration();
+
+            $this->repository->setUser(new User($formerPersona->getName(), $formerPersona->getEmail()));
+
             $outputContent = "<info>Reset user config to <comment>"
                 . "'{$formerPersona->getName()} <{$formerPersona->getEmail()}>'</comment>.</info>";
             $output->writeln($outputContent);

src/Git/Repository.php

@@ -180,6 +180,26 @@ public function getFormerPersonaFromConfiguration(): Persona
         throw new UnresolvablePersona('Unable to resolve former persona from Git configuration.');
     }
 
+    public function removeFormerPersonaFromConfiguration(): bool
+    {
+        chdir($this->directory);
+
+        $commands = [
+            'git config --unset user.former.email',
+            'git config --unset user.former.name',
+        ];
+
+        foreach ($commands as $command) {
+            exec($command, $output, $returnValue);
+
+            if ($returnValue !== 0) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * @return boolean
      */
@@ -226,8 +246,8 @@ public function storePreviousUser(): bool
         $persona = $this->getPersonaFromConfiguration();
 
         $storageCommands = [
-            "git config --local user.former.email {$persona->getEmail()}",
-            "git config --local user.former.name '{$persona->getName()}'",
+            "git config --local --replace-all user.former.email {$persona->getEmail()}",
+            "git config --local --replace-all user.former.name '{$persona->getName()}'",
         ];
 
         foreach ($storageCommands as $command) {
@@ -249,8 +269,6 @@ public function setUser(User $user): bool
     {
         chdir($this->directory);
 
-        $this->storePreviousUser();
-
         $commands = [
             "git config --local user.email \"{$user->getEmail()}\"",
             "git config --local user.name \"{$user->getName()}\"",

tests/Commands/PairCommandTest.php

@@ -18,12 +18,12 @@
 class PairCommandTest extends TestCase
 {
     /**
-     * @var \Symfony\Component\Console\Application
+     * @var Application
      */
     private $application;
 
     /**
-     * @return \Symfony\Component\Console\Application
+     * @return Application
      */
     protected function getApplication(): Application
     {
@@ -211,6 +211,7 @@ public function returnsExpectedWarningWhenSetPairPersonaFails(): void
 
         $repository->shouldReceive('setDirectory')->times(1);
         $repository->shouldReceive('setUser')->times(1)->andReturn(false);
+        $repository->shouldReceive('storePreviousUser')->times(1)->andReturn(true);
 
         $command = $application->find('pair');
         $commandTester = new CommandTester($command);

tests/Commands/UnpairCommandTest.php

@@ -6,9 +6,12 @@
 use PHPUnit\Framework\Attributes\Test;
 use Stolt\GitUserBend\Commands\PairCommand;
 use Stolt\GitUserBend\Commands\UnpairCommand;
+use Stolt\GitUserBend\Exceptions\InvalidPersona;
+use Stolt\GitUserBend\Exceptions\UnresolvablePersona;
 use Stolt\GitUserBend\Git\Repository;
 use Stolt\GitUserBend\Git\User;
 use Stolt\GitUserBend\Helpers\Str as OsHelper;
+use Stolt\GitUserBend\Persona;
 use Stolt\GitUserBend\Persona\Storage;
 use Stolt\GitUserBend\Tests\CommandTester;
 use Stolt\GitUserBend\Tests\TestCase;
@@ -119,6 +122,10 @@ public function returnsExpectedWarningWhenProvidedDirectoryIsNotAGitRepository()
         $this->assertTrue($commandTester->getStatusCode() == Command::FAILURE);
     }
 
+    /**
+     * @throws UnresolvablePersona
+     * @throws InvalidPersona
+     */
     #[Test]
     #[Group('integration')]
     public function resetsGitConfigToFormerUser(): void
@@ -161,5 +168,13 @@ public function resetsGitConfigToFormerUser(): void
 
         $this->assertSame($expectedDisplay, $commandTester->getDisplay());
         $commandTester->assertCommandIsSuccessful();
+
+        $repository = new Repository($this->temporaryDirectory);
+        $personaFromConfig = $repository->getPersonaFromConfiguration();
+        $this->assertSame('John Doe', $personaFromConfig->getName());
+        $this->assertSame('test@test.org', $personaFromConfig->getEmail());
+
+        $this->expectException(UnresolvablePersona::class);
+        $repository->getFormerPersonaFromConfiguration();
     }
 }