ericsizemore · mariusjp · Feb 12, 2026 · Feb 26, 2026 · Feb 26, 2026 · Feb 26, 2026
diff --git a/composer.json b/composer.json
@@ -105,7 +105,6 @@
             "@code-coverage",
             "@phpstan",
             "@psalm",
-            "@psalm:security",
             "@psalm:shepherd"
         ],
         "clear-build": "rm -rf ./build/*",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,31 +1,37 @@
 parameters:
-	ignoreErrors:
-		-
-			rawMessage: 'Method Esi\CoverageCheck\CoverageCheck::loadMetrics() never returns false so it can be removed from the return type.'
-			identifier: return.unusedType
-			count: 1
-			path: src/CoverageCheck.php
+    ignoreErrors:
+        -
+            rawMessage: 'Method Esi\CoverageCheck\CoverageCheck::loadMetrics() never returns false so it can be removed from the return type.'
+            identifier: return.unusedType
+            count: 1
+            path: src/CoverageCheck.php
 
-		-
-			rawMessage: 'Method Esi\CoverageCheck\Style\CoverageCheckStyle::error() has parameter $message with no value type specified in iterable type array.'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/Style/CoverageCheckStyle.php
+        -
+            rawMessage: 'Method Esi\CoverageCheck\Style\CoverageCheckStyle::error() has parameter $message with no value type specified in iterable type array.'
+            identifier: missingType.iterableValue
+            count: 1
+            path: src/Style/CoverageCheckStyle.php
 
-		-
-			rawMessage: 'Method Esi\CoverageCheck\Style\CoverageCheckStyle::success() has parameter $message with no value type specified in iterable type array.'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/Style/CoverageCheckStyle.php
+        -
+            rawMessage: 'Method Esi\CoverageCheck\Style\CoverageCheckStyle::success() has parameter $message with no value type specified in iterable type array.'
+            identifier: missingType.iterableValue
+            count: 1
+            path: src/Style/CoverageCheckStyle.php
 
-		-
-			rawMessage: 'Method Esi\CoverageCheck\Style\CoverageCheckStyle::table() has parameter $headers with no value type specified in iterable type array.'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/Style/CoverageCheckStyle.php
+        -
+            rawMessage: 'Method Esi\CoverageCheck\Style\CoverageCheckStyle::table() has parameter $headers with no value type specified in iterable type array.'
+            identifier: missingType.iterableValue
+            count: 1
+            path: src/Style/CoverageCheckStyle.php
 
-		-
-			rawMessage: 'Method Esi\CoverageCheck\Style\CoverageCheckStyle::table() has parameter $rows with no value type specified in iterable type array.'
-			identifier: missingType.iterableValue
-			count: 1
-			path: src/Style/CoverageCheckStyle.php
+        -
+            rawMessage: 'Method Esi\CoverageCheck\Style\CoverageCheckStyle::table() has parameter $rows with no value type specified in iterable type array.'
+            identifier: missingType.iterableValue
+            count: 1
+            path: src/Style/CoverageCheckStyle.php
+
+        -
+            rawMessage: 'Readonly property Esi\CoverageCheck\Data\Threshold::$value is assigned outside of its declaring class.'
+            identifier: property.readOnlyAssignOutOfClass
+            count: 1
+            path: tests/src/Data/ThresholdTest.php
diff --git a/src/Command/CoverageCheckCommand.php b/src/Command/CoverageCheckCommand.php
@@ -17,6 +17,7 @@
 
 use Esi\CoverageCheck\Application;
 use Esi\CoverageCheck\CoverageCheck;
+use Esi\CoverageCheck\Data\Threshold;
 use Esi\CoverageCheck\Style\CoverageCheckStyle;
 use Esi\CoverageCheck\Utils;
 use Symfony\Component\Console\Attribute\Argument;
@@ -71,7 +72,7 @@
      *
      * @since 3.0.0
      */
-    public const string ERROR_COVERAGE_BELOW_THRESHOLD = 'Total code coverage is %s which is below the accepted %d%%';
+    public const string ERROR_COVERAGE_BELOW_THRESHOLD = 'Total code coverage is %s which is below the accepted %s';
 
     /**
      * Matches CoverageCheck::ERROR_INSUFFICIENT_DATA, except for '[ERROR]' prefix.
@@ -143,7 +144,7 @@
         #[Argument(description: self::INPUT_ARGUMENT_CLOVERFILE)]
         string $cloverfile,
         #[Argument(description: self::INPUT_ARGUMENT_THRESHOLD)]
-        int $threshold,
+        string $threshold,
         #[Option(description: self::INPUT_ARGUMENT_TABLEWIDTH, name: 'table-width', shortcut: 'W')]
         int $tablewidth = 70,
         #[Option(description: self::INPUT_OPTION_ONLY_PERCENTAGE, name: 'only-percentage', shortcut: 'O')]
@@ -157,8 +158,9 @@
 
         $this->coverageCheckStyle = new CoverageCheckStyle($input, $output, $tablewidth);
 
-        $this->coverageCheck->setCloverFile($cloverfile)
-            ->setThreshold($threshold)
+        $this->coverageCheck
+            ->setCloverFile($cloverfile)
+            ->setThreshold(Threshold::from($threshold))
             ->setOnlyPercentage($onlypercentage);
 
         try {
@@ -193,10 +195,11 @@
      */
     private function getFileTable(array $result): int
     {
-        $threshold     = $this->coverageCheck->getThreshold();
-        $tableRows     = [];
+        $threshold = $this->coverageCheck->getThreshold();
+        $tableRows = [];
+        // @todo: Convert to ValueObject?
         $totalElements = ['coveredMetrics' => 0, 'totalMetrics' => 0];
-        $metrics       = $result['fileMetrics'];
+        $metrics = $result['fileMetrics'];
         $totalCoverage = $result['totalCoverage'];
 
         unset($result);
@@ -210,15 +213,15 @@
                     [
                         'style' => new TableCellStyle(
                             [
-                                'cellFormat' => ($file['percentage'] < $threshold) ? '<error>%s</error>' : '<info>%s</info>',
+                                'cellFormat' => ($file['percentage'] < $threshold->value) ? '<error>%s</error>' : '<info>%s</info>',
                             ]
                         ),
                     ]
                 ),
             ];
 
             $totalElements['coveredMetrics'] += $file['coveredMetrics'];
-            $totalElements['totalMetrics']   += $file['totalMetrics'];
+            $totalElements['totalMetrics'] += $file['totalMetrics'];
         }
 
         unset($metrics);
@@ -229,7 +232,7 @@
             \sprintf('%d/%d', $totalElements['coveredMetrics'], $totalElements['totalMetrics']),
             new TableCell(
                 Utils::formatCoverage($totalCoverage),
-                ['style' => new TableCellStyle(['cellFormat' => ($totalCoverage < $threshold) ? '<error>%s</error>' : '<info>%s</info>', ])]
+                ['style' => new TableCellStyle(['cellFormat' => ($totalCoverage < $threshold->value) ? '<error>%s</error>' : '<info>%s</info>',])]
             ),
         ];
 
@@ -240,7 +243,7 @@
 
         unset($tableRows);
 
-        if ($totalCoverage < $threshold) {
+        if ($totalCoverage < $threshold->value) {
             return Command::FAILURE;
         }
 
@@ -249,10 +252,10 @@
 
     private function getResultOutput(float $result): int
     {
-        $threshold         = $this->coverageCheck->getThreshold();
-        $onlyPercentage    = $this->coverageCheck->getOnlyPercentage();
+        $threshold = $this->coverageCheck->getThreshold();
+        $onlyPercentage = $this->coverageCheck->getOnlyPercentage();
         $formattedCoverage = Utils::formatCoverage($result);
-        $belowThreshold    = $result < $threshold;
+        $belowThreshold = $result < $threshold->value;
 
         // Only display the percentage?
         if ($onlyPercentage) {

diff --git a/src/CoverageCheck.php b/src/CoverageCheck.php
@@ -15,10 +15,10 @@
 
 namespace Esi\CoverageCheck;
 
+use Esi\CoverageCheck\Data\Threshold;
 use Esi\CoverageCheck\Exceptions\FailedToGetFileContentsException;
 use Esi\CoverageCheck\Exceptions\InvalidInputFileException;
 use Esi\CoverageCheck\Exceptions\NotAValidCloverFileException;
-use Esi\CoverageCheck\Exceptions\ThresholdOutOfBoundsException;
 use InvalidArgumentException;
 use RuntimeException;
 use SimpleXMLElement;
@@ -40,7 +40,7 @@
      * @see Command\CoverageCheckCommand::ERROR_COVERAGE_BELOW_THRESHOLD
      * @since 3.0.0
      */
-    public const string ERROR_COVERAGE_BELOW_THRESHOLD = '[ERROR] Total code coverage is %s%% which is below the accepted %d%%';
+    public const string ERROR_COVERAGE_BELOW_THRESHOLD = '[ERROR] Total code coverage is %s which is below the accepted %s';
 
     /**
      * Message returned if there is not enough data to calculate coverage.
@@ -85,7 +85,12 @@
 
     private bool $onlyPercentage = false;
 
-    private int $threshold = 100;
+    private Threshold $threshold;
+
+    public function __construct()
+    {
+        $this->threshold = Threshold::from(100);
+    }
 
     /**
      * Simple getters.
@@ -101,7 +106,7 @@
         return $this->onlyPercentage;
     }
 
-    public function getThreshold(): int
+    public function getThreshold(): Threshold
     {
         return $this->threshold;
     }
@@ -115,8 +120,12 @@
      * @throws InvalidArgumentException If the clover file does not exist, or the threshold is not within
      *                                  defined range (>= 1 <= 100).
      */
-    public function nonConsoleCall(string $cloverFile, int $threshold = 100, bool $onlyPercentage = false): string
+    public function nonConsoleCall(string $cloverFile, float|Threshold $threshold = 100, bool $onlyPercentage = false): string
     {
+        if (\is_float($threshold)) {
+            $threshold = Threshold::from($threshold);
+        }
+
         $this->setCloverFile($cloverFile)
             ->setThreshold($threshold)
             ->setOnlyPercentage($onlyPercentage);
@@ -127,11 +136,11 @@
             return self::ERROR_INSUFFICIENT_DATA;
         }
 
-        if ($results < $threshold && !$onlyPercentage) {
+        if ($results < $threshold->value && !$onlyPercentage) {
             return \sprintf(
                 self::ERROR_COVERAGE_BELOW_THRESHOLD,
                 Utils::formatCoverage($results),
-                $threshold
+                (string) $threshold,
             );
         }
 
@@ -177,7 +186,7 @@
         unset($rawMetrics);
 
         $coveredMetrics = $metrics['coveredconditionals'] + $metrics['coveredstatements'] + $metrics['coveredmethods'];
-        $totalMetrics   = $metrics['conditionals'] + $metrics['statements'] + $metrics['methods'];
+        $totalMetrics = $metrics['conditionals'] + $metrics['statements'] + $metrics['methods'];
 
         unset($metrics);
 
@@ -191,22 +200,22 @@
     /**
      * Parses the clover xml file for coverage metrics by file.
      *
-     * @see self::process()
+     * @return array{
+     *     fileMetrics: array<string, array{coveredMetrics: int, totalMetrics: int, percentage: float|int}>,
+     *     totalCoverage: float|int
+     * }|false
      * @see self::loadMetrics()
      * @see https://confluence.atlassian.com/pages/viewpage.action?pageId=79986990
      * @see https://ocramius.github.io/blog/automated-code-coverage-check-for-github-pull-requests-with-travis/
      * @since 2.0.0
      *
-     * @return array{
-     *     fileMetrics: array<string, array{coveredMetrics: int, totalMetrics: int, percentage: float|int}>,
-     *     totalCoverage: float|int
-     * }|false
+     * @see self::process()
      */
     public function processByFile(): array|false
     {
-        $fileMetrics          = [];
+        $fileMetrics = [];
         $totalElementsCovered = 0;
-        $totalElements        = 0;
+        $totalElements = 0;
 
         $rawMetrics = $this->loadMetrics(self::XPATH_FILES) ?? false;
 
@@ -227,15 +236,15 @@
             $metrics = array_map(\intval(...), $metrics);
 
             $coveredMetrics = ($metrics['coveredconditionals'] + $metrics['coveredstatements'] + $metrics['coveredmethods']);
-            $totalMetrics   = ($metrics['conditionals'] + $metrics['statements'] + $metrics['methods']);
+            $totalMetrics = ($metrics['conditionals'] + $metrics['statements'] + $metrics['methods']);
 
             if ($totalMetrics === 0) {
                 continue;
             }
 
             $coveragePercentage = (float) ($coveredMetrics / $totalMetrics) * 100.0;
             $totalElementsCovered += $coveredMetrics;
-            $totalElements        += $totalMetrics;
+            $totalElements += $totalMetrics;
 
             // As far as we are concerned, path will only be set in the openclover output of PHPUnit.
             // We like having the full path, so in this case, set name to path.
@@ -245,8 +254,8 @@
 
             $fileMetrics[(string) $rawMetric['name']] = [
                 'coveredMetrics' => $coveredMetrics,
-                'totalMetrics'   => $totalMetrics,
-                'percentage'     => $coveragePercentage,
+                'totalMetrics' => $totalMetrics,
+                'percentage' => $coveragePercentage,
             ];
         }
 
@@ -259,7 +268,7 @@
         $totalCoverage = (float) ($totalElementsCovered / $totalElements) * 100.0;
 
         return [
-            'fileMetrics'   => $fileMetrics,
+            'fileMetrics' => $fileMetrics,
             'totalCoverage' => $totalCoverage,
         ];
     }
@@ -289,15 +298,8 @@
         return $this;
     }
 
-    /**
-     * @throws ThresholdOutOfBoundsException If the threshold is less than 1 or greater than 100.
-     */
-    public function setThreshold(int $threshold): CoverageCheck
+    public function setThreshold(Threshold $threshold): CoverageCheck
     {
-        if (!Utils::validateThreshold($threshold)) {
-            throw ThresholdOutOfBoundsException::create($threshold);
-        }
-
         $this->threshold = $threshold;
 
         return $this;
@@ -306,14 +308,14 @@
     /**
      * Loads the clover xml data and runs an XML Xpath query.
      *
-     * @internal
-     *
      * @param self::XPATH_* $xpath
      *
+     * @return null|array<SimpleXMLElement>|false
      * @throws RuntimeException If file_get_contents fails or if XML data cannot be parsed, or
      *                          if the given file does not appear to be a valid clover file.
      *
-     * @return null|array<SimpleXMLElement>|false
+     * @internal
+     *
      */
     private function loadMetrics(string $xpath = self::XPATH_METRICS): null|array|false
     {