refactor: resolve phpstan found issues

Author: DannyvdSluijs

src/JsonSchema/Constraints/Drafts/Draft06/AdditionalItemsConstraint.php

@@ -6,15 +6,14 @@
 
 use JsonSchema\ConstraintError;
 use JsonSchema\Constraints\ConstraintInterface;
-use JsonSchema\Constraints\Factory;
 use JsonSchema\Entity\ErrorBagProxy;
 use JsonSchema\Entity\JsonPointer;
 
 class AdditionalItemsConstraint implements ConstraintInterface
 {
     use ErrorBagProxy;
 
-    /** @var \JsonSchema\Constraints\Drafts\Draft06\Factory */
+    /** @var Factory */
     private $factory;
 
     public function __construct(?Factory $factory = null)

src/JsonSchema/Constraints/Drafts/Draft06/Draft06Constraint.php

@@ -58,6 +58,11 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
         $this->checkForKeyword('format', $value, $schema, $path, $i);
     }
 
+    /**
+     * @param mixed $value
+     * @param mixed $schema
+     * @param mixed $i
+     */
     protected function checkForKeyword(string $keyword, $value, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
         $validator = $this->factory->createInstanceFor($keyword);

src/JsonSchema/Constraints/Drafts/Draft06/FormatConstraint.php

@@ -156,7 +156,7 @@ private function validateStyle(string $style): bool
         return empty($invalidEntries);
     }
 
-    private function validatePhone($phone): bool
+    private function validatePhone(string $phone): bool
     {
         return preg_match('/^\+?(\(\d{3}\)|\d{3}) \d{3} \d{4}$/', $phone) !== false;
     }

src/JsonSchema/Constraints/Drafts/Draft06/ItemsConstraint.php

@@ -5,15 +5,14 @@
 namespace JsonSchema\Constraints\Drafts\Draft06;
 
 use JsonSchema\Constraints\ConstraintInterface;
-use JsonSchema\Constraints\Factory;
 use JsonSchema\Entity\ErrorBagProxy;
 use JsonSchema\Entity\JsonPointer;
 
 class ItemsConstraint implements ConstraintInterface
 {
     use ErrorBagProxy;
 
-    /** @var \JsonSchema\Constraints\Drafts\Draft06\Factory */
+    /** @var Factory */
     private $factory;
 
     public function __construct(?Factory $factory = null)

src/JsonSchema/Constraints/Drafts/Draft06/NotConstraint.php

@@ -6,15 +6,14 @@
 
 use JsonSchema\ConstraintError;
 use JsonSchema\Constraints\ConstraintInterface;
-use JsonSchema\Constraints\Factory;
 use JsonSchema\Entity\ErrorBagProxy;
 use JsonSchema\Entity\JsonPointer;
 
 class NotConstraint implements ConstraintInterface
 {
     use ErrorBagProxy;
 
-    /** @var \JsonSchema\Constraints\Drafts\Draft06\Factory */
+    /** @var Factory */
     private $factory;
 
     public function __construct(?Factory $factory = null)

src/JsonSchema/Constraints/Drafts/Draft06/PropertiesConstraint.php

@@ -5,15 +5,14 @@
 namespace JsonSchema\Constraints\Drafts\Draft06;
 
 use JsonSchema\Constraints\ConstraintInterface;
-use JsonSchema\Constraints\Factory;
 use JsonSchema\Entity\ErrorBagProxy;
 use JsonSchema\Entity\JsonPointer;
 
 class PropertiesConstraint implements ConstraintInterface
 {
     use ErrorBagProxy;
 
-    /** @var \JsonSchema\Constraints\Drafts\Draft06\Factory */
+    /** @var Factory */
     private $factory;
 
     public function __construct(?Factory $factory = null)

src/JsonSchema/Entity/ErrorBagProxy.php

@@ -13,8 +13,8 @@
  */
 trait ErrorBagProxy
 {
-    /** @var ErrorBag */
-    protected $errorBag;
+    /** @var ?ErrorBag */
+    protected $errorBag = null;
 
     /** @return ErrorList */
     public function getErrors(): array
@@ -29,7 +29,7 @@ public function addErrors(array $errors): void
     }
 
     /**
-     * @param array $more more array elements to add to the error
+     * @param array<string, mixed> $more more array elements to add to the error
      */
     public function addError(ConstraintError $constraint, ?JsonPointer $path = null, array $more = []): void
     {
@@ -43,7 +43,7 @@ public function isValid(): bool
 
     protected function initialiseErrorBag(Factory $factory): ErrorBag
     {
-        if (!isset($this->errorBag)) {
+        if (is_null($this->errorBag)) {
             $this->errorBag = new ErrorBag($factory);
         }
 
@@ -52,7 +52,7 @@ protected function initialiseErrorBag(Factory $factory): ErrorBag
 
     protected function errorBag(): ErrorBag
     {
-        if (!isset($this->errorBag)) {
+        if (is_null($this->errorBag)) {
             throw new \RuntimeException('ErrorBag not initialized');
         }
 
@@ -61,6 +61,6 @@ protected function errorBag(): ErrorBag
 
     public function __clone()
     {
-        $this->errorBag->reset();
+        $this->errorBag()->reset();
     }
 }