More-phpstan-typing

jack-worman · jack-worman · commit 9d7546beb3ba · 2025-02-07T15:54:44.000-05:00
diff --git a/src/JsonSchema/Constraints/CollectionConstraint.php b/src/JsonSchema/Constraints/CollectionConstraint.php
@@ -25,7 +25,7 @@ class CollectionConstraint extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function check(& $value, $schema = null, ?JsonPointer $path = null, $i = null): void
+    public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
         // Verify minItems
         if (isset($schema->minItems) && count($value) < $schema->minItems) {
@@ -63,7 +63,7 @@ public function check(& $value, $schema = null, ?JsonPointer $path = null, $i =
      * @param \stdClass $schema
      * @param string    $i
      */
-    protected function validateItems(& $value, $schema = null, ?JsonPointer $path = null, $i = null): void
+    protected function validateItems(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
         if (is_object($schema->items)) {
             // just one type definition for the whole array
diff --git a/src/JsonSchema/Constraints/ConstConstraint.php b/src/JsonSchema/Constraints/ConstConstraint.php
@@ -25,7 +25,7 @@ class ConstConstraint extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function check(& $element, $schema = null, ?JsonPointer $path = null, $i = null): void
+    public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
         // Only validate const if the attribute exists
         if ($element instanceof UndefinedConstraint && (!isset($schema->required) || !$schema->required)) {
diff --git a/src/JsonSchema/Constraints/Constraint.php b/src/JsonSchema/Constraints/Constraint.php
@@ -65,7 +65,7 @@ protected function incrementPath(?JsonPointer $path, $i): JsonPointer
      * @param mixed $schema
      * @param mixed $i
      */
-    protected function checkArray(& $value, $schema = null, ?JsonPointer $path = null, $i = null): void
+    protected function checkArray(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
         $validator = $this->factory->createInstanceFor('collection');
         $validator->check($value, $schema, $path, $i);
@@ -82,7 +82,7 @@ protected function checkArray(& $value, $schema = null, ?JsonPointer $path = nul
      * @param mixed $additionalProperties
      * @param mixed $patternProperties
      */
-    protected function checkObject(& $value, $schema = null, ?JsonPointer $path = null, $properties = null,
+    protected function checkObject(&$value, $schema = null, ?JsonPointer $path = null, $properties = null,
         $additionalProperties = null, $patternProperties = null, $appliedDefaults = []): void
     {
         /** @var ObjectConstraint $validator */
@@ -99,7 +99,7 @@ protected function checkObject(& $value, $schema = null, ?JsonPointer $path = nu
      * @param mixed $schema
      * @param mixed $i
      */
-    protected function checkType(& $value, $schema = null, ?JsonPointer $path = null, $i = null): void
+    protected function checkType(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
         $validator = $this->factory->createInstanceFor('type');
         $validator->check($value, $schema, $path, $i);
@@ -114,7 +114,7 @@ protected function checkType(& $value, $schema = null, ?JsonPointer $path = null
      * @param mixed $schema
      * @param mixed $i
      */
-    protected function checkUndefined(& $value, $schema = null, ?JsonPointer $path = null, $i = null, $fromDefault = false): void
+    protected function checkUndefined(&$value, $schema = null, ?JsonPointer $path = null, $i = null, $fromDefault = false): void
     {
         /** @var UndefinedConstraint $validator */
         $validator = $this->factory->createInstanceFor('undefined');
diff --git a/src/JsonSchema/Constraints/ConstraintInterface.php b/src/JsonSchema/Constraints/ConstraintInterface.php
@@ -55,5 +55,5 @@ public function isValid(): bool;
      *
      * @throws \JsonSchema\Exception\ExceptionInterface
      */
-    public function check(& $value, $schema = null, ?JsonPointer $path = null, $i = null): void;
+    public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void;
 }
diff --git a/src/JsonSchema/Constraints/EnumConstraint.php b/src/JsonSchema/Constraints/EnumConstraint.php
@@ -26,7 +26,7 @@ class EnumConstraint extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function check(& $element, $schema = null, ?JsonPointer $path = null, $i = null): void
+    public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
         // Only validate enum if the attribute exists
         if ($element instanceof UndefinedConstraint && (!isset($schema->required) || !$schema->required)) {
diff --git a/src/JsonSchema/Constraints/FormatConstraint.php b/src/JsonSchema/Constraints/FormatConstraint.php
@@ -27,7 +27,7 @@ class FormatConstraint extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function check(& $element, $schema = null, ?JsonPointer $path = null, $i = null): void
+    public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
         if (!isset($schema->format) || $this->factory->getConfig(self::CHECK_MODE_DISABLE_FORMAT)) {
             return;
diff --git a/src/JsonSchema/Constraints/NumberConstraint.php b/src/JsonSchema/Constraints/NumberConstraint.php
@@ -25,7 +25,7 @@ class NumberConstraint extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function check(& $element, $schema = null, ?JsonPointer $path = null, $i = null): void
+    public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
         // Verify minimum
         if (isset($schema->exclusiveMinimum)) {
diff --git a/src/JsonSchema/Constraints/ObjectConstraint.php b/src/JsonSchema/Constraints/ObjectConstraint.php
@@ -30,7 +30,7 @@ class ObjectConstraint extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function check(& $element, $schema = null, ?JsonPointer $path = null, $properties = null,
+    public function check(&$element, $schema = null, ?JsonPointer $path = null, $properties = null,
         $additionalProp = null, $patternProperties = null, $appliedDefaults = []): void
     {
         if ($element instanceof UndefinedConstraint) {
@@ -131,7 +131,7 @@ public function validateElement($element, $matches, $schema = null, ?JsonPointer
      * @param \stdClass        $properties Property definitions
      * @param JsonPointer|null $path       Path?
      */
-    public function validateProperties(& $element, $properties = null, ?JsonPointer $path = null)
+    public function validateProperties(&$element, $properties = null, ?JsonPointer $path = null)
     {
         $undefinedConstraint = $this->factory->createInstanceFor('undefined');
 
@@ -155,7 +155,7 @@ public function validateProperties(& $element, $properties = null, ?JsonPointer
      *
      * @return mixed
      */
-    protected function &getProperty(& $element, $property, $fallback = null)
+    protected function &getProperty(&$element, $property, $fallback = null)
     {
         if (is_array($element) && (isset($element[$property]) || array_key_exists($property, $element)) /*$this->checkMode == self::CHECK_MODE_TYPE_CAST*/) {
             return $element[$property];
diff --git a/src/JsonSchema/Constraints/SchemaConstraint.php b/src/JsonSchema/Constraints/SchemaConstraint.php
@@ -31,7 +31,7 @@ class SchemaConstraint extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function check(& $element, $schema = null, ?JsonPointer $path = null, $i = null): void
+    public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
         if ($schema !== null) {
             // passed schema
diff --git a/src/JsonSchema/Constraints/StringConstraint.php b/src/JsonSchema/Constraints/StringConstraint.php
@@ -25,7 +25,7 @@ class StringConstraint extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function check(& $element, $schema = null, ?JsonPointer $path = null, $i = null): void
+    public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
         // Verify maxLength
         if (isset($schema->maxLength) && $this->strlen($element) > $schema->maxLength) {
diff --git a/src/JsonSchema/Constraints/TypeCheck/LooseTypeCheck.php b/src/JsonSchema/Constraints/TypeCheck/LooseTypeCheck.php
@@ -29,7 +29,7 @@ public static function propertyGet($value, $property)
         return $value[$property];
     }
 
-    public static function propertySet(& $value, $property, $data)
+    public static function propertySet(&$value, $property, $data)
     {
         if (is_object($value)) {
             $value->{$property} = $data;
diff --git a/src/JsonSchema/Constraints/TypeCheck/StrictTypeCheck.php b/src/JsonSchema/Constraints/TypeCheck/StrictTypeCheck.php
@@ -21,7 +21,7 @@ public static function propertyGet($value, $property)
         return $value->{$property};
     }
 
-    public static function propertySet(& $value, $property, $data)
+    public static function propertySet(&$value, $property, $data)
     {
         $value->{$property} = $data;
     }
diff --git a/src/JsonSchema/Constraints/TypeCheck/TypeCheckInterface.php b/src/JsonSchema/Constraints/TypeCheck/TypeCheckInterface.php
@@ -12,7 +12,7 @@ public static function isArray($value);
 
     public static function propertyGet($value, $property);
 
-    public static function propertySet(& $value, $property, $data);
+    public static function propertySet(&$value, $property, $data);
 
     public static function propertyExists($value, $property);
 
diff --git a/src/JsonSchema/Constraints/TypeConstraint.php b/src/JsonSchema/Constraints/TypeConstraint.php
@@ -42,7 +42,7 @@ class TypeConstraint extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function check(& $value = null, $schema = null, ?JsonPointer $path = null, $i = null): void
+    public function check(&$value = null, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
         $type = isset($schema->type) ? $schema->type : null;
         $isValid = false;
@@ -90,7 +90,7 @@ public function check(& $value = null, $schema = null, ?JsonPointer $path = null
      * @param ?JsonPointer $path
      * @param bool         $coerce
      */
-    protected function validateTypesArray(& $value, array $type, & $validTypesWording, & $isValid, $path, $coerce = false)
+    protected function validateTypesArray(&$value, array $type, & $validTypesWording, & $isValid, $path, $coerce = false)
     {
         foreach ($type as $tp) {
             // already valid, so no need to waste cycles looping over everything
@@ -173,7 +173,7 @@ protected function validateTypeNameWording($type)
      *
      * @return bool
      */
-    protected function validateType(& $value, $type, $coerce = false)
+    protected function validateType(&$value, $type, $coerce = false)
     {
         //mostly the case for inline schema
         if (!$type) {
diff --git a/src/JsonSchema/Constraints/UndefinedConstraint.php b/src/JsonSchema/Constraints/UndefinedConstraint.php
@@ -34,7 +34,7 @@ class UndefinedConstraint extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function check(& $value, $schema = null, ?JsonPointer $path = null, $i = null, $fromDefault = false): void
+    public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = null, $fromDefault = false): void
     {
         if (is_null($schema) || !is_object($schema)) {
             return;
@@ -63,7 +63,7 @@ public function check(& $value, $schema = null, ?JsonPointer $path = null, $i =
      * @param JsonPointer $path
      * @param string      $i
      */
-    public function validateTypes(& $value, $schema, JsonPointer $path, $i = null)
+    public function validateTypes(&$value, $schema, JsonPointer $path, $i = null)
     {
         // check array
         if ($this->getTypeCheck()->isArray($value)) {
@@ -114,7 +114,7 @@ public function validateTypes(& $value, $schema, JsonPointer $path, $i = null)
      * @param JsonPointer $path
      * @param string      $i
      */
-    protected function validateCommonProperties(& $value, $schema, JsonPointer $path, $i = '')
+    protected function validateCommonProperties(&$value, $schema, JsonPointer $path, $i = '')
     {
         // if it extends another schema, it must pass that schema as well
         if (isset($schema->extends)) {
@@ -243,7 +243,7 @@ private function shouldApplyDefaultValue($requiredOnly, $schema, $name = null, $
      * @param mixed       $schema
      * @param JsonPointer $path
      */
-    protected function applyDefaultValues(& $value, $schema, $path): void
+    protected function applyDefaultValues(&$value, $schema, $path): void
     {
         // only apply defaults if feature is enabled
         if (!$this->factory->getConfig(self::CHECK_MODE_APPLY_DEFAULTS)) {
@@ -310,7 +310,7 @@ protected function applyDefaultValues(& $value, $schema, $path): void
      * @param JsonPointer $path
      * @param string      $i
      */
-    protected function validateOfProperties(& $value, $schema, JsonPointer $path, $i = '')
+    protected function validateOfProperties(&$value, $schema, JsonPointer $path, $i = '')
     {
         // Verify type
         if ($value instanceof self) {
diff --git a/src/JsonSchema/SchemaStorage.php b/src/JsonSchema/SchemaStorage.php
@@ -82,7 +82,7 @@ public function addSchema($id, $schema = null)
      * @param mixed  $schema
      * @param string $base
      */
-    private function expandRefs(& $schema, $base = null)
+    private function expandRefs(&$schema, $base = null)
     {
         if (!is_object($schema)) {
             if (is_array($schema)) {
diff --git a/src/JsonSchema/Validator.php b/src/JsonSchema/Validator.php
@@ -47,7 +47,7 @@ class Validator extends BaseConstraint
      * @phpstan-param int-mask-of<Constraint::CHECK_MODE_*> $checkMode
      * @phpstan-return int-mask-of<Validator::ERROR_*>
      */
-    public function validate(& $value, $schema = null, $checkMode = null)
+    public function validate(&$value, $schema = null, $checkMode = null)
     {
         // reset errors prior to validation
         $this->reset();
@@ -94,7 +94,7 @@ public function check($value, $schema)
      *
      * @deprecated
      */
-    public function coerce(& $value, $schema)
+    public function coerce(&$value, $schema)
     {
         return $this->validate($value, $schema, Constraint::CHECK_MODE_COERCE_TYPES);
     }
diff --git a/tests/Constraints/FactoryTest.php b/tests/Constraints/FactoryTest.php
@@ -25,7 +25,7 @@ class MyBadConstraint
 
 class MyStringConstraint extends Constraint
 {
-    public function check(& $value, $schema = null, ?JsonPointer $path = null, $i = null): void
+    public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
     }
 }
diff --git a/tests/Uri/UriRetrieverTest.php b/tests/Uri/UriRetrieverTest.php
@@ -108,7 +108,7 @@ public function testResolveRelativeUri($childSchema, $parentSchema): void
         $this->assertTrue($this->validator->isValid());
     }
 
-    private static function setParentSchemaExtendsValue(& $parentSchema, $value): void
+    private static function setParentSchemaExtendsValue(&$parentSchema, $value): void
     {
         $parentSchemaDecoded = json_decode($parentSchema, true);
         $parentSchemaDecoded['extends'] = $value;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class ConstConstraint extends Constraint`
`25`	`25`	`/**`
`26`	`26`	`* {@inheritdoc}`
`27`	`27`	`*/`
`28`		`- public function check(& $element, $schema = null, ?JsonPointer $path = null, $i = null): void`
	`28`	`+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null): void`
`29`	`29`	`{`
`30`	`30`	`// Only validate const if the attribute exists`
`31`	`31`	`if ($element instanceof UndefinedConstraint && (!isset($schema->required) \|\| !$schema->required)) {`
Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,5 @@ public function isValid(): bool;`
`55`	`55`	`*`
`56`	`56`	`* @throws \JsonSchema\Exception\ExceptionInterface`
`57`	`57`	`*/`
`58`		`- public function check(& $value, $schema = null, ?JsonPointer $path = null, $i = null): void;`
	`58`	`+ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void;`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class EnumConstraint extends Constraint`
`26`	`26`	`/**`
`27`	`27`	`* {@inheritdoc}`
`28`	`28`	`*/`
`29`		`- public function check(& $element, $schema = null, ?JsonPointer $path = null, $i = null): void`
	`29`	`+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null): void`
`30`	`30`	`{`
`31`	`31`	`// Only validate enum if the attribute exists`
`32`	`32`	`if ($element instanceof UndefinedConstraint && (!isset($schema->required) \|\| !$schema->required)) {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class FormatConstraint extends Constraint`
`27`	`27`	`/**`
`28`	`28`	`* {@inheritdoc}`
`29`	`29`	`*/`
`30`		`- public function check(& $element, $schema = null, ?JsonPointer $path = null, $i = null): void`
	`30`	`+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null): void`
`31`	`31`	`{`
`32`	`32`	`if (!isset($schema->format) \|\| $this->factory->getConfig(self::CHECK_MODE_DISABLE_FORMAT)) {`
`33`	`33`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class NumberConstraint extends Constraint`
`25`	`25`	`/**`
`26`	`26`	`* {@inheritdoc}`
`27`	`27`	`*/`
`28`		`- public function check(& $element, $schema = null, ?JsonPointer $path = null, $i = null): void`
	`28`	`+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null): void`
`29`	`29`	`{`
`30`	`30`	`// Verify minimum`
`31`	`31`	`if (isset($schema->exclusiveMinimum)) {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class ObjectConstraint extends Constraint`
`30`	`30`	`/**`
`31`	`31`	`* {@inheritdoc}`
`32`	`32`	`*/`
`33`		`- public function check(& $element, $schema = null, ?JsonPointer $path = null, $properties = null,`
	`33`	`+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $properties = null,`
`34`	`34`	`$additionalProp = null, $patternProperties = null, $appliedDefaults = []): void`
`35`	`35`	`{`
`36`	`36`	`if ($element instanceof UndefinedConstraint) {`
`@@ -131,7 +131,7 @@ public function validateElement($element, $matches, $schema = null, ?JsonPointer`
`131`	`131`	`* @param \stdClass $properties Property definitions`
`132`	`132`	`* @param JsonPointer\|null $path Path?`
`133`	`133`	`*/`
`134`		`- public function validateProperties(& $element, $properties = null, ?JsonPointer $path = null)`
	`134`	`+ public function validateProperties(&$element, $properties = null, ?JsonPointer $path = null)`
`135`	`135`	`{`
`136`	`136`	`$undefinedConstraint = $this->factory->createInstanceFor('undefined');`
`137`	`137`
`@@ -155,7 +155,7 @@ public function validateProperties(& $element, $properties = null, ?JsonPointer`
`155`	`155`	`*`
`156`	`156`	`* @return mixed`
`157`	`157`	`*/`
`158`		`- protected function &getProperty(& $element, $property, $fallback = null)`
	`158`	`+ protected function &getProperty(&$element, $property, $fallback = null)`
`159`	`159`	`{`
`160`	`160`	`if (is_array($element) && (isset($element[$property]) \|\| array_key_exists($property, $element)) /$this->checkMode == self::CHECK_MODE_TYPE_CAST/) {`
`161`	`161`	`return $element[$property];`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class SchemaConstraint extends Constraint`
`31`	`31`	`/**`
`32`	`32`	`* {@inheritdoc}`
`33`	`33`	`*/`
`34`		`- public function check(& $element, $schema = null, ?JsonPointer $path = null, $i = null): void`
	`34`	`+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null): void`
`35`	`35`	`{`
`36`	`36`	`if ($schema !== null) {`
`37`	`37`	`// passed schema`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class StringConstraint extends Constraint`
`25`	`25`	`/**`
`26`	`26`	`* {@inheritdoc}`
`27`	`27`	`*/`
`28`		`- public function check(& $element, $schema = null, ?JsonPointer $path = null, $i = null): void`
	`28`	`+ public function check(&$element, $schema = null, ?JsonPointer $path = null, $i = null): void`
`29`	`29`	`{`
`30`	`30`	`// Verify maxLength`
`31`	`31`	`if (isset($schema->maxLength) && $this->strlen($element) > $schema->maxLength) {`