refactor: correct more PHPStan discoverd issues

Author: DannyvdSluijs

phpstan-baseline.neon

@@ -66,17 +66,12 @@ parameters:
 			path: src/JsonSchema/Constraints/Factory.php
 
 		-
-			message: "#^Method JsonSchema\\\\Constraints\\\\Factory\\:\\:getConfig\\(\\) should return int\\<0, 511\\> but returns int\\.$#"
+			message: "#^Method JsonSchema\\\\Constraints\\\\Factory\\:\\:getConfig\\(\\) should return int\\<0, 1023\\> but returns int\\.$#"
 			count: 1
 			path: src/JsonSchema/Constraints/Factory.php
 
 		-
-			message: "#^Method JsonSchema\\\\Constraints\\\\Factory\\:\\:getErrorContext\\(\\) should return 1\\|2 but returns int\\.$#"
-			count: 1
-			path: src/JsonSchema/Constraints/Factory.php
-
-		-
-			message: "#^Property JsonSchema\\\\Constraints\\\\Factory\\:\\:\\$checkMode \\(int\\<0, 511\\>\\) does not accept int\\.$#"
+			message: "#^Property JsonSchema\\\\Constraints\\\\Factory\\:\\:\\$checkMode \\(int\\<0, 1023\\>\\) does not accept int\\.$#"
 			count: 2
 			path: src/JsonSchema/Constraints/Factory.php
 
@@ -630,16 +625,6 @@ parameters:
 			count: 1
 			path: src/JsonSchema/Iterator/ObjectIterator.php
 
-		-
-			message: "#^Offset 4 does not exist on array\\{0\\: string, 1\\: non\\-falsy\\-string, 2\\: string, 3\\: non\\-falsy\\-string, 4\\?\\: string, 5\\?\\: non\\-falsy\\-string&numeric\\-string\\}\\.$#"
-			count: 1
-			path: src/JsonSchema/Rfc3339.php
-
-		-
-			message: "#^Offset 5 does not exist on array\\{0\\: string, 1\\: non\\-falsy\\-string, 2\\: string, 3\\: non\\-falsy\\-string, 4\\?\\: string, 5\\?\\: non\\-falsy\\-string&numeric\\-string\\}\\.$#"
-			count: 1
-			path: src/JsonSchema/Rfc3339.php
-
 		-
 			message: "#^Access to an undefined property object\\:\\:\\$properties\\.$#"
 			count: 3

src/JsonSchema/Constraints/Factory.php

@@ -46,7 +46,7 @@ class Factory
     private $typeCheck = [];
 
     /**
-     * @var int Validation context
+     * @var int-mask-of<Validator::ERROR_*> Validation context
      */
     protected $errorContext = Validator::ERROR_DOCUMENT_VALIDATION;
 
@@ -199,7 +199,7 @@ public function createInstanceFor($constraintName)
     /**
      * Get the error context
      *
-     * @phpstan-return Validator::ERROR_DOCUMENT_VALIDATION|Validator::ERROR_SCHEMA_VALIDATION
+     * @return int-mask-of<Validator::ERROR_*>
      */
     public function getErrorContext(): int
     {
@@ -209,7 +209,7 @@ public function getErrorContext(): int
     /**
      * Set the error context
      *
-     * @phpstan-param Validator::ERROR_DOCUMENT_VALIDATION|Validator::ERROR_SCHEMA_VALIDATION $errorContext
+     * @param int-mask-of<Validator::ERROR_*> $errorContext
      */
     public function setErrorContext(int $errorContext): void
     {

src/JsonSchema/Entity/ErrorBag.php

@@ -16,7 +16,7 @@
  *     pointer: string,
  *     message: string,
  *     constraint: array{name: string, params: array<string, mixed>},
- *     context: int
+ *     "context": int-mask-of<Validator::ERROR_*>
  * }
  * @phpstan-type ErrorList list<Error>
  */
@@ -29,8 +29,7 @@ class ErrorBag
     private $errors = [];
 
     /**
-     * @var int All error types that have occurred
-     * @phpstan-var int-mask-of<Validator::ERROR_*>
+     * @var int-mask-of<Validator::ERROR_*> All error types that have occurred
      */
     protected $errorMask = Validator::ERROR_NONE;
 
@@ -56,6 +55,7 @@ public function addError(ConstraintError $constraint, ?JsonPointer $path = null,
     {
         $message = $constraint->getMessage();
         $name = $constraint->getValue();
+        /** @var Error $error */
         $error = [
             'property' => $this->convertJsonPointerIntoPropertyPath($path ?: new JsonPointer('')),
             'pointer' => ltrim((string) ($path ?: new JsonPointer('')), '#'),

src/JsonSchema/Rfc3339.php

@@ -49,6 +49,9 @@ public static function createFromString($input): ?\DateTime
         }
 
         $mutable = \DateTime::createFromFormat('U.u', $dateTime->format('U.u'));
+        if ($mutable === false) {
+            throw new \RuntimeException('Unable to create DateTime from DateTimeImmutable');
+        }
         $mutable->setTimezone($dateTime->getTimezone());
 
         return $mutable;