Better phpstan typing

Author: jack-worman

phpstan-baseline.neon

@@ -451,7 +451,7 @@ parameters:
 			path: src/JsonSchema/Constraints/StringConstraint.php
 
 		-
-			message: "#^Parameter \\#2 \\$encoding of function mb_strlen expects string, string\\|false given\\.$#"
+			message: "#^Parameter \\#2 \\$encoding of function mb_strlen expects string\\|null, string\\|false given\\.$#"
 			count: 1
 			path: src/JsonSchema/Constraints/StringConstraint.php
 
@@ -971,7 +971,7 @@ parameters:
 			path: src/JsonSchema/Uri/Retrievers/FileGetContents.php
 
 		-
-			message: "#^Parameter \\#1 \\$callback of function set_error_handler expects \\(callable\\(int, string, string, int, array\\)\\: bool\\)\\|null, Closure\\(mixed, mixed\\)\\: void given\\.$#"
+			message: "#^Parameter \\#1 \\$callback of function set_error_handler expects \\(callable\\(int, string, string, int\\)\\: bool\\)\\|null, Closure\\(mixed, mixed\\)\\: void given\\.$#"
 			count: 1
 			path: src/JsonSchema/Uri/Retrievers/FileGetContents.php
 

src/JsonSchema/Constraints/BaseConstraint.php

@@ -30,6 +30,7 @@ class BaseConstraint
 
     /**
      * @var int All error types which have occurred
+     * @phpstan-var int-mask-of<Validator::ERROR_*>
      */
     protected $errorMask = Validator::ERROR_NONE;
 
@@ -129,6 +130,7 @@ public function reset()
      * Get the error mask
      *
      * @return int
+     * @phpstan-return int-mask-of<Validator::ERROR_*>
      */
     public function getErrorMask()
     {

src/JsonSchema/Validator.php

@@ -44,7 +44,8 @@ class Validator extends BaseConstraint
      *
      * @return int
      *
-     * @phpstan-param Constraint::CHECK_MODE_* $checkMode
+     * @phpstan-param int-mask-of<Constraint::CHECK_MODE_*> $checkMode
+     * @phpstan-return int-mask-of<Validator::ERROR_*>
      */
     public function validate(&$value, $schema = null, $checkMode = null)
     {