Skip to content

Commit 53993fa

Browse files
jack-wormanjack-worman
committed
More-phpstan-typing
1 parent ccd660a commit 53993fa

19 files changed

+69
-69
lines changed

‎src/JsonSchema/Constraints/CollectionConstraint.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class CollectionConstraint extends Constraint
2525
/**
2626
* {@inheritdoc}
2727
*/
28-
public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void
28+
public function check(& $value, $schema = null, ?JsonPointer $path = null, $i = null): void
2929
{
3030
// Verify minItems
3131
if (isset($schema->minItems) && count($value) < $schema->minItems) {
@@ -59,11 +59,11 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
5959
/**
6060
* Validates the items
6161
*
62-
* @param array $value
63-
* @param \stdClass $schema
64-
* @param string $i
62+
* @param array $value
63+
* @param \stdClass $schema
64+
* @param string $i
6565
*/
66-
protected function validateItems(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void
66+
protected function validateItems(& $value, $schema = null, ?JsonPointer $path = null, $i = null): void
6767
{
6868
if (is_object($schema->items)) {
6969
// just one type definition for the whole array

‎src/JsonSchema/Constraints/ConstConstraint.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ConstConstraint extends Constraint
2525
/**
2626
* {@inheritdoc}
2727
*/
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
2929
{
3030
// Only validate const if the attribute exists
3131
if ($element instanceof UndefinedConstraint && (!isset($schema->required) || !$schema->required)) {

‎src/JsonSchema/Constraints/Constraint.php‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ protected function incrementPath(?JsonPointer $path, $i): JsonPointer
6161
/**
6262
* Validates an array
6363
*
64-
* @param mixed $value
65-
* @param mixed $schema
66-
* @param mixed $i
64+
* @param mixed $value
65+
* @param mixed $schema
66+
* @param mixed $i
6767
*/
68-
protected function checkArray(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void
68+
protected function checkArray(& $value, $schema = null, ?JsonPointer $path = null, $i = null): void
6969
{
7070
$validator = $this->factory->createInstanceFor('collection');
7171
$validator->check($value, $schema, $path, $i);
@@ -76,13 +76,13 @@ protected function checkArray(&$value, $schema = null, ?JsonPointer $path = null
7676
/**
7777
* Validates an object
7878
*
79-
* @param mixed $value
80-
* @param mixed $schema
81-
* @param mixed $properties
82-
* @param mixed $additionalProperties
83-
* @param mixed $patternProperties
79+
* @param mixed $value
80+
* @param mixed $schema
81+
* @param mixed $properties
82+
* @param mixed $additionalProperties
83+
* @param mixed $patternProperties
8484
*/
85-
protected function checkObject(&$value, $schema = null, ?JsonPointer $path = null, $properties = null,
85+
protected function checkObject(& $value, $schema = null, ?JsonPointer $path = null, $properties = null,
8686
$additionalProperties = null, $patternProperties = null, $appliedDefaults = []): void
8787
{
8888
/** @var ObjectConstraint $validator */
@@ -95,11 +95,11 @@ protected function checkObject(&$value, $schema = null, ?JsonPointer $path = nul
9595
/**
9696
* Validates the type of a property
9797
*
98-
* @param mixed $value
99-
* @param mixed $schema
100-
* @param mixed $i
98+
* @param mixed $value
99+
* @param mixed $schema
100+
* @param mixed $i
101101
*/
102-
protected function checkType(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void
102+
protected function checkType(& $value, $schema = null, ?JsonPointer $path = null, $i = null): void
103103
{
104104
$validator = $this->factory->createInstanceFor('type');
105105
$validator->check($value, $schema, $path, $i);
@@ -110,11 +110,11 @@ protected function checkType(&$value, $schema = null, ?JsonPointer $path = null,
110110
/**
111111
* Checks a undefined element
112112
*
113-
* @param mixed $value
114-
* @param mixed $schema
115-
* @param mixed $i
113+
* @param mixed $value
114+
* @param mixed $schema
115+
* @param mixed $i
116116
*/
117-
protected function checkUndefined(&$value, $schema = null, ?JsonPointer $path = null, $i = null, $fromDefault = false): void
117+
protected function checkUndefined(& $value, $schema = null, ?JsonPointer $path = null, $i = null, $fromDefault = false): void
118118
{
119119
/** @var UndefinedConstraint $validator */
120120
$validator = $this->factory->createInstanceFor('undefined');
@@ -127,9 +127,9 @@ protected function checkUndefined(&$value, $schema = null, ?JsonPointer $path =
127127
/**
128128
* Checks a string element
129129
*
130-
* @param mixed $value
131-
* @param mixed $schema
132-
* @param mixed $i
130+
* @param mixed $value
131+
* @param mixed $schema
132+
* @param mixed $i
133133
*/
134134
protected function checkString($value, $schema = null, ?JsonPointer $path = null, $i = null): void
135135
{
@@ -142,9 +142,9 @@ protected function checkString($value, $schema = null, ?JsonPointer $path = null
142142
/**
143143
* Checks a number element
144144
*
145-
* @param mixed $value
146-
* @param mixed $schema
147-
* @param mixed $i
145+
* @param mixed $value
146+
* @param mixed $schema
147+
* @param mixed $i
148148
*/
149149
protected function checkNumber($value, $schema = null, ?JsonPointer $path = null, $i = null): void
150150
{
@@ -157,9 +157,9 @@ protected function checkNumber($value, $schema = null, ?JsonPointer $path = null
157157
/**
158158
* Checks a enum element
159159
*
160-
* @param mixed $value
161-
* @param mixed $schema
162-
* @param mixed $i
160+
* @param mixed $value
161+
* @param mixed $schema
162+
* @param mixed $i
163163
*/
164164
protected function checkEnum($value, $schema = null, ?JsonPointer $path = null, $i = null): void
165165
{
@@ -172,9 +172,9 @@ protected function checkEnum($value, $schema = null, ?JsonPointer $path = null,
172172
/**
173173
* Checks a const element
174174
*
175-
* @param mixed $value
176-
* @param mixed $schema
177-
* @param mixed $i
175+
* @param mixed $value
176+
* @param mixed $schema
177+
* @param mixed $i
178178
*/
179179
protected function checkConst($value, $schema = null, ?JsonPointer $path = null, $i = null): void
180180
{
@@ -187,9 +187,9 @@ protected function checkConst($value, $schema = null, ?JsonPointer $path = null,
187187
/**
188188
* Checks format of an element
189189
*
190-
* @param mixed $value
191-
* @param mixed $schema
192-
* @param mixed $i
190+
* @param mixed $value
191+
* @param mixed $schema
192+
* @param mixed $i
193193
*/
194194
protected function checkFormat($value, $schema = null, ?JsonPointer $path = null, $i = null): void
195195
{

‎src/JsonSchema/Constraints/ConstraintInterface.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public function addErrors(array $errors): void;
3434
/**
3535
* adds an error
3636
*
37-
* @param ConstraintError $constraint the constraint/rule that is broken, e.g.: ConstraintErrors::LENGTH_MIN()
38-
* @param array $more more array elements to add to the error
37+
* @param ConstraintError $constraint the constraint/rule that is broken, e.g.: ConstraintErrors::LENGTH_MIN()
38+
* @param array $more more array elements to add to the error
3939
*/
4040
public function addError(ConstraintError $constraint, ?JsonPointer $path = null, array $more = []): void;
4141

@@ -49,11 +49,11 @@ public function isValid(): bool;
4949
*
5050
* @abstract
5151
*
52-
* @param mixed $value
53-
* @param mixed $schema
54-
* @param mixed $i
52+
* @param mixed $value
53+
* @param mixed $schema
54+
* @param mixed $i
5555
*
5656
* @throws \JsonSchema\Exception\ExceptionInterface
5757
*/
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;
5959
}

‎src/JsonSchema/Constraints/EnumConstraint.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class EnumConstraint extends Constraint
2626
/**
2727
* {@inheritdoc}
2828
*/
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
3030
{
3131
// Only validate enum if the attribute exists
3232
if ($element instanceof UndefinedConstraint && (!isset($schema->required) || !$schema->required)) {

‎src/JsonSchema/Constraints/FormatConstraint.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class FormatConstraint extends Constraint
2727
/**
2828
* {@inheritdoc}
2929
*/
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
3131
{
3232
if (!isset($schema->format) || $this->factory->getConfig(self::CHECK_MODE_DISABLE_FORMAT)) {
3333
return;

‎src/JsonSchema/Constraints/NumberConstraint.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class NumberConstraint extends Constraint
2525
/**
2626
* {@inheritdoc}
2727
*/
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
2929
{
3030
// Verify minimum
3131
if (isset($schema->exclusiveMinimum)) {

‎src/JsonSchema/Constraints/ObjectConstraint.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ObjectConstraint extends Constraint
3030
/**
3131
* {@inheritdoc}
3232
*/
33-
public function check(&$element, $schema = null, ?JsonPointer $path = null, $properties = null,
33+
public function check(& $element, $schema = null, ?JsonPointer $path = null, $properties = null,
3434
$additionalProp = null, $patternProperties = null, $appliedDefaults = []): void
3535
{
3636
if ($element instanceof UndefinedConstraint) {
@@ -131,7 +131,7 @@ public function validateElement($element, $matches, $schema = null, ?JsonPointer
131131
* @param \stdClass $properties Property definitions
132132
* @param JsonPointer|null $path Path?
133133
*/
134-
public function validateProperties(&$element, $properties = null, ?JsonPointer $path = null)
134+
public function validateProperties(& $element, $properties = null, ?JsonPointer $path = null)
135135
{
136136
$undefinedConstraint = $this->factory->createInstanceFor('undefined');
137137

@@ -155,7 +155,7 @@ public function validateProperties(&$element, $properties = null, ?JsonPointer $
155155
*
156156
* @return mixed
157157
*/
158-
protected function &getProperty(&$element, $property, $fallback = null)
158+
protected function &getProperty(& $element, $property, $fallback = null)
159159
{
160160
if (is_array($element) && (isset($element[$property]) || array_key_exists($property, $element)) /*$this->checkMode == self::CHECK_MODE_TYPE_CAST*/) {
161161
return $element[$property];

‎src/JsonSchema/Constraints/SchemaConstraint.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class SchemaConstraint extends Constraint
3131
/**
3232
* {@inheritdoc}
3333
*/
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
3535
{
3636
if ($schema !== null) {
3737
// passed schema

‎src/JsonSchema/Constraints/StringConstraint.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class StringConstraint extends Constraint
2525
/**
2626
* {@inheritdoc}
2727
*/
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
2929
{
3030
// Verify maxLength
3131
if (isset($schema->maxLength) && $this->strlen($element) > $schema->maxLength) {

0 commit comments

Comments
 (0)