Improve type coverage

Author: sebastianfeldmann

src/Config/Options.php

@@ -41,14 +41,14 @@ public function __construct(array $options)
     /**
      * Return a option value
      *
-     * @template T
-     * @param  string $name
-     * @param  T      $default
-     * @return T|null
+     * @template ProvidedDefault
+     * @param  string          $name
+     * @param  ProvidedDefault $default
+     * @return ProvidedDefault|mixed
      */
     public function get(string $name, $default = null)
     {
-        return isset($this->options[$name]) ? $this->options[$name] : $default;
+        return $this->options[$name] ?? $default;
     }
 
     /**

src/Hook/PHP/Action/TestCoverage.php

@@ -35,21 +35,21 @@ class TestCoverage implements Action
      *
      * @var string
      */
-    private $cloverXmlFile;
+    private string $cloverXmlFile;
 
     /**
      * Path to PHPUnit
      *
      * @var string
      */
-    private $phpUnit;
+    private string $phpUnit;
 
     /**
      * Minimum coverage in percent
      *
      * @var int
      */
-    private $minCoverage;
+    private int $minCoverage;
 
     /**
      * Executes the action.

src/Runner/Hook/PrepareCommitMsg.php

@@ -36,9 +36,9 @@ class PrepareCommitMsg extends Hook
     protected $hook = Hooks::PREPARE_COMMIT_MSG;
 
     /**
-     * @var string|null
+     * @var string
      */
-    private ?string $commentChar;
+    private string $commentChar;
 
     /**
      * Path to commit message file

tests/unit/Mockery.php

@@ -15,6 +15,7 @@
 use PHPUnit\Framework\MockObject\MockBuilder;
 use SebastianFeldmann\Git\Operator\Diff;
 use SebastianFeldmann\Git\Operator\Index;
+use SebastianFeldmann\Git\Operator\Config;
 use SebastianFeldmann\Git\Operator\Info;
 use SebastianFeldmann\Git\Operator\Log;
 use SebastianFeldmann\Git\Repository;
@@ -98,7 +99,6 @@ public function createGitDiffOperator(array $changedFiles = []): Diff
     /**
      * Create log operator mock
      *
-     * @param  array $changedFiles
      * @return \SebastianFeldmann\Git\Operator\Log&\PHPUnit\Framework\MockObject\MockObject
      */
     public function createGitLogOperator(): Log
@@ -127,6 +127,16 @@ public function createGitIndexOperator(array $stagedFiles = []): Index
         return $operator;
     }
 
+    /**
+     * Create config operator mock
+     *
+     * @return \SebastianFeldmann\Git\Operator\Config&\PHPUnit\Framework\MockObject\MockObject
+     */
+    public function createGitConfigOperator(): Config
+    {
+        return $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock();
+    }
+
     /**
      * @param  $type
      * @return \PHPUnit\Framework\MockObject\MockBuilder

tests/unit/Runner/Hook/PrepareCommitMsgTest.php

@@ -73,9 +73,13 @@ public function testRunHookNoMessageException(): void
     {
         $this->expectException(Exception::class);
 
+        $repo     = $this->createRepositoryMock();
+        $configOp = $this->createGitConfigOperator();
+        $configOp->method('getSafely')->willReturn('#');
+        $repo->method('getConfigOperator')->willReturn($configOp);
+
         $io           = $this->createIOMock();
         $config       = $this->createConfigMock();
-        $repo         = $this->createRepositoryMock();
         $hookConfig   = $this->createHookConfigMock();
         $actionConfig = $this->createActionConfigMock();
         $actionConfig->method('getAction')->willReturn(Prepare::class);