Narrow types

sebastianbergmann · sebastianbergmann · commit 82848be7178f · 2026-04-22T11:17:10.000+02:00
diff --git a/src/Framework/Attributes/After.php b/src/Framework/Attributes/After.php
@@ -19,13 +19,22 @@
 #[Attribute(Attribute::TARGET_METHOD)]
 final readonly class After
 {
+    /**
+     * @var non-negative-int
+     */
     private int $priority;
 
+    /**
+     * @param non-negative-int $priority
+     */
     public function __construct(int $priority = 0)
     {
         $this->priority = $priority;
     }
 
+    /**
+     * @return non-negative-int
+     */
     public function priority(): int
     {
         return $this->priority;
diff --git a/src/Framework/Attributes/AfterClass.php b/src/Framework/Attributes/AfterClass.php
@@ -19,13 +19,22 @@
 #[Attribute(Attribute::TARGET_METHOD)]
 final readonly class AfterClass
 {
+    /**
+     * @var non-negative-int
+     */
     private int $priority;
 
+    /**
+     * @param non-negative-int $priority
+     */
     public function __construct(int $priority = 0)
     {
         $this->priority = $priority;
     }
 
+    /**
+     * @return non-negative-int
+     */
     public function priority(): int
     {
         return $this->priority;
diff --git a/src/Framework/Attributes/Before.php b/src/Framework/Attributes/Before.php
@@ -19,13 +19,22 @@
 #[Attribute(Attribute::TARGET_METHOD)]
 final readonly class Before
 {
+    /**
+     * @var non-negative-int
+     */
     private int $priority;
 
+    /**
+     * @param non-negative-int $priority
+     */
     public function __construct(int $priority = 0)
     {
         $this->priority = $priority;
     }
 
+    /**
+     * @return non-negative-int
+     */
     public function priority(): int
     {
         return $this->priority;
diff --git a/src/Framework/Attributes/BeforeClass.php b/src/Framework/Attributes/BeforeClass.php
@@ -19,13 +19,22 @@
 #[Attribute(Attribute::TARGET_METHOD)]
 final readonly class BeforeClass
 {
+    /**
+     * @var non-negative-int
+     */
     private int $priority;
 
+    /**
+     * @param non-negative-int $priority
+     */
     public function __construct(int $priority = 0)
     {
         $this->priority = $priority;
     }
 
+    /**
+     * @return non-negative-int
+     */
     public function priority(): int
     {
         return $this->priority;
diff --git a/src/Framework/Attributes/PostCondition.php b/src/Framework/Attributes/PostCondition.php
@@ -19,13 +19,22 @@
 #[Attribute(Attribute::TARGET_METHOD)]
 final readonly class PostCondition
 {
+    /**
+     * @var non-negative-int
+     */
     private int $priority;
 
+    /**
+     * @param non-negative-int $priority
+     */
     public function __construct(int $priority = 0)
     {
         $this->priority = $priority;
     }
 
+    /**
+     * @return non-negative-int
+     */
     public function priority(): int
     {
         return $this->priority;
diff --git a/src/Framework/Attributes/PreCondition.php b/src/Framework/Attributes/PreCondition.php
@@ -19,13 +19,22 @@
 #[Attribute(Attribute::TARGET_METHOD)]
 final readonly class PreCondition
 {
+    /**
+     * @var non-negative-int
+     */
     private int $priority;
 
+    /**
+     * @param non-negative-int $priority
+     */
     public function __construct(int $priority = 0)
     {
         $this->priority = $priority;
     }
 
+    /**
+     * @return non-negative-int
+     */
     public function priority(): int
     {
         return $this->priority;
diff --git a/src/Framework/Attributes/RequiresEnvironmentVariable.php b/src/Framework/Attributes/RequiresEnvironmentVariable.php
@@ -19,20 +19,37 @@
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final readonly class RequiresEnvironmentVariable
 {
+    /**
+     * @var non-empty-string
+     */
     private string $environmentVariableName;
+
+    /**
+     * @var ?non-empty-string
+     */
     private null|string $value;
 
+    /**
+     * @param non-empty-string  $environmentVariableName
+     * @param ?non-empty-string $value
+     */
     public function __construct(string $environmentVariableName, null|string $value = null)
     {
         $this->environmentVariableName = $environmentVariableName;
         $this->value                   = $value;
     }
 
+    /**
+     * @return non-empty-string
+     */
     public function environmentVariableName(): string
     {
         return $this->environmentVariableName;
     }
 
+    /**
+     * @return ?non-empty-string
+     */
     public function value(): null|string
     {
         return $this->value;
diff --git a/src/Framework/Attributes/WithEnvironmentVariable.php b/src/Framework/Attributes/WithEnvironmentVariable.php
@@ -23,10 +23,15 @@
      * @var non-empty-string
      */
     private string $environmentVariableName;
+
+    /**
+     * @var ?non-empty-string
+     */
     private null|string $value;
 
     /**
-     * @param non-empty-string $environmentVariableName
+     * @param non-empty-string  $environmentVariableName
+     * @param ?non-empty-string $value
      */
     public function __construct(string $environmentVariableName, null|string $value = null)
     {
@@ -42,6 +47,9 @@ public function environmentVariableName(): string
         return $this->environmentVariableName;
     }
 
+    /**
+     * @return ?non-empty-string
+     */
     public function value(): null|string
     {
         return $this->value;
diff --git a/src/Metadata/After.php b/src/Metadata/After.php
@@ -16,8 +16,14 @@
  */
 final readonly class After extends Metadata
 {
+    /**
+     * @var non-negative-int
+     */
     private int $priority;
 
+    /**
+     * @param non-negative-int $priority
+     */
     protected function __construct(Level $level, int $priority)
     {
         parent::__construct($level);
@@ -30,6 +36,9 @@ public function isAfter(): true
         return true;
     }
 
+    /**
+     * @return non-negative-int
+     */
     public function priority(): int
     {
         return $this->priority;
diff --git a/src/Metadata/AfterClass.php b/src/Metadata/AfterClass.php
@@ -16,8 +16,14 @@
  */
 final readonly class AfterClass extends Metadata
 {
+    /**
+     * @var non-negative-int
+     */
     private int $priority;
 
+    /**
+     * @param non-negative-int $priority
+     */
     protected function __construct(Level $level, int $priority)
     {
         parent::__construct($level);
@@ -30,6 +36,9 @@ public function isAfterClass(): true
         return true;
     }
 
+    /**
+     * @return non-negative-int
+     */
     public function priority(): int
     {
         return $this->priority;
diff --git a/src/Metadata/Before.php b/src/Metadata/Before.php
@@ -16,8 +16,14 @@
  */
 final readonly class Before extends Metadata
 {
+    /**
+     * @var non-negative-int
+     */
     private int $priority;
 
+    /**
+     * @param non-negative-int $priority
+     */
     protected function __construct(Level $level, int $priority)
     {
         parent::__construct($level);
@@ -30,6 +36,9 @@ public function isBefore(): true
         return true;
     }
 
+    /**
+     * @return non-negative-int
+     */
     public function priority(): int
     {
         return $this->priority;
diff --git a/src/Metadata/BeforeClass.php b/src/Metadata/BeforeClass.php
@@ -16,8 +16,14 @@
  */
 final readonly class BeforeClass extends Metadata
 {
+    /**
+     * @var non-negative-int
+     */
     private int $priority;
 
+    /**
+     * @param non-negative-int $priority
+     */
     protected function __construct(Level $level, int $priority)
     {
         parent::__construct($level);
@@ -30,6 +36,9 @@ public function isBeforeClass(): true
         return true;
     }
 
+    /**
+     * @return non-negative-int
+     */
     public function priority(): int
     {
         return $this->priority;
diff --git a/src/Metadata/Metadata.php b/src/Metadata/Metadata.php
@@ -22,11 +22,17 @@
 {
     private Level $level;
 
+    /**
+     * @param non-negative-int $priority
+     */
     public static function after(int $priority): After
     {
         return new After(Level::METHOD_LEVEL, $priority);
     }
 
+    /**
+     * @param non-negative-int $priority
+     */
     public static function afterClass(int $priority): AfterClass
     {
         return new AfterClass(Level::METHOD_LEVEL, $priority);
@@ -62,11 +68,17 @@ public static function backupStaticPropertiesOnMethod(bool $enabled): BackupStat
         return new BackupStaticProperties(Level::METHOD_LEVEL, $enabled);
     }
 
+    /**
+     * @param non-negative-int $priority
+     */
     public static function before(int $priority): Before
     {
         return new Before(Level::METHOD_LEVEL, $priority);
     }
 
+    /**
+     * @param non-negative-int $priority
+     */
     public static function beforeClass(int $priority): BeforeClass
     {
         return new BeforeClass(Level::METHOD_LEVEL, $priority);
@@ -267,11 +279,17 @@ public static function ignorePhpunitDeprecationsOnMethod(): IgnorePhpunitDepreca
         return new IgnorePhpunitDeprecations(Level::METHOD_LEVEL);
     }
 
+    /**
+     * @param non-negative-int $priority
+     */
     public static function postCondition(int $priority): PostCondition
     {
         return new PostCondition(Level::METHOD_LEVEL, $priority);
     }
 
+    /**
+     * @param non-negative-int $priority
+     */
     public static function preCondition(int $priority): PreCondition
     {
         return new PreCondition(Level::METHOD_LEVEL, $priority);
@@ -405,26 +423,36 @@ public static function requiresPhpunitExtensionOnMethod(string $extensionClass):
         return new RequiresPhpunitExtension(Level::METHOD_LEVEL, $extensionClass);
     }
 
+    /**
+     * @param non-empty-string  $environmentVariableName
+     * @param ?non-empty-string $value
+     */
     public static function requiresEnvironmentVariableOnClass(string $environmentVariableName, null|string $value): RequiresEnvironmentVariable
     {
         return new RequiresEnvironmentVariable(Level::CLASS_LEVEL, $environmentVariableName, $value);
     }
 
+    /**
+     * @param non-empty-string  $environmentVariableName
+     * @param ?non-empty-string $value
+     */
     public static function requiresEnvironmentVariableOnMethod(string $environmentVariableName, null|string $value): RequiresEnvironmentVariable
     {
         return new RequiresEnvironmentVariable(Level::METHOD_LEVEL, $environmentVariableName, $value);
     }
 
     /**
-     * @param non-empty-string $environmentVariableName
+     * @param non-empty-string  $environmentVariableName
+     * @param ?non-empty-string $value
      */
     public static function withEnvironmentVariableOnClass(string $environmentVariableName, null|string $value): WithEnvironmentVariable
     {
         return new WithEnvironmentVariable(Level::CLASS_LEVEL, $environmentVariableName, $value);
     }
 
     /**
-     * @param non-empty-string $environmentVariableName
+     * @param non-empty-string  $environmentVariableName
+     * @param ?non-empty-string $value
      */
     public static function withEnvironmentVariableOnMethod(string $environmentVariableName, null|string $value): WithEnvironmentVariable
     {
diff --git a/src/Metadata/PostCondition.php b/src/Metadata/PostCondition.php
diff --git a/src/Metadata/PreCondition.php b/src/Metadata/PreCondition.php
diff --git a/src/Metadata/RequiresEnvironmentVariable.php b/src/Metadata/RequiresEnvironmentVariable.php
diff --git a/src/Metadata/WithEnvironmentVariable.php b/src/Metadata/WithEnvironmentVariable.php
diff --git a/src/Runner/HookMethod/HookMethod.php b/src/Runner/HookMethod/HookMethod.php

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,22 @@`
`19`	`19`	`#[Attribute(Attribute::TARGET_METHOD)]`
`20`	`20`	`final readonly class After`
`21`	`21`	`{`
	`22`	`+ /**`
	`23`	`+ * @var non-negative-int`
	`24`	`+ */`
`22`	`25`	`private int $priority;`
`23`	`26`
	`27`	`+ /**`
	`28`	`+ * @param non-negative-int $priority`
	`29`	`+ */`
`24`	`30`	`public function __construct(int $priority = 0)`
`25`	`31`	`{`
`26`	`32`	`$this->priority = $priority;`
`27`	`33`	`}`
`28`	`34`
	`35`	`+ /**`
	`36`	`+ * @return non-negative-int`
	`37`	`+ */`
`29`	`38`	`public function priority(): int`
`30`	`39`	`{`
`31`	`40`	`return $this->priority;`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,14 @@`
`16`	`16`	`*/`
`17`	`17`	`final readonly class After extends Metadata`
`18`	`18`	`{`
	`19`	`+ /**`
	`20`	`+ * @var non-negative-int`
	`21`	`+ */`
`19`	`22`	`private int $priority;`
`20`	`23`
	`24`	`+ /**`
	`25`	`+ * @param non-negative-int $priority`
	`26`	`+ */`
`21`	`27`	`protected function __construct(Level $level, int $priority)`
`22`	`28`	`{`
`23`	`29`	`parent::__construct($level);`
`@@ -30,6 +36,9 @@ public function isAfter(): true`
`30`	`36`	`return true;`
`31`	`37`	`}`
`32`	`38`
	`39`	`+ /**`
	`40`	`+ * @return non-negative-int`
	`41`	`+ */`
`33`	`42`	`public function priority(): int`
`34`	`43`	`{`
`35`	`44`	`return $this->priority;`