CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [6.2.1] - 2025-03-06
+### Fixed
+- allow items: true to pass validation ([#801](https://github.com/jsonrainbow/json-schema/pull/801))
+
+### Changed
+- Include actual count in collection constraint errors ([#797](https://github.com/jsonrainbow/json-schema/pull/797))
+
 ## [6.2.0] - 2025-02-26
 ### Added
 - Welcome first time contributors ([#782](https://github.com/jsonrainbow/json-schema/pull/782))

phpstan-baseline.neon

@@ -30,31 +30,11 @@ parameters:
 			count: 1
 			path: src/JsonSchema/Constraints/BaseConstraint.php
 
-		-
-			message: "#^Cannot access property \\$additionalItems on stdClass\\|null\\.$#"
-			count: 3
-			path: src/JsonSchema/Constraints/CollectionConstraint.php
-
-		-
-			message: "#^Cannot access property \\$items on stdClass\\|null\\.$#"
-			count: 6
-			path: src/JsonSchema/Constraints/CollectionConstraint.php
-
 		-
 			message: "#^Method JsonSchema\\\\Constraints\\\\CollectionConstraint\\:\\:validateItems\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: src/JsonSchema/Constraints/CollectionConstraint.php
 
-		-
-			message: "#^Parameter \\#1 \\$object_or_class of function property_exists expects object\\|string, stdClass\\|null given\\.$#"
-			count: 1
-			path: src/JsonSchema/Constraints/CollectionConstraint.php
-
-		-
-			message: "#^Parameter \\#2 \\$schema of method JsonSchema\\\\Constraints\\\\CollectionConstraint\\:\\:validateItems\\(\\) expects stdClass\\|null, object given\\.$#"
-			count: 1
-			path: src/JsonSchema/Constraints/CollectionConstraint.php
-
 		-
 			message: "#^Method JsonSchema\\\\Constraints\\\\Constraint\\:\\:checkObject\\(\\) has parameter \\$appliedDefaults with no type specified\\.$#"
 			count: 1

src/JsonSchema/ConstraintError.php

@@ -88,9 +88,9 @@ public function getMessage()
             self::LENGTH_MAX => 'Must be at most %d characters long',
             self::INVALID_SCHEMA => 'Schema is not valid',
             self::LENGTH_MIN => 'Must be at least %d characters long',
-            self::MAX_ITEMS => 'There must be a maximum of %d items in the array',
+            self::MAX_ITEMS => 'There must be a maximum of %d items in the array, %d found',
             self::MAXIMUM => 'Must have a maximum value less than or equal to %d',
-            self::MIN_ITEMS => 'There must be a minimum of %d items in the array',
+            self::MIN_ITEMS => 'There must be a minimum of %d items in the array, %d found',
             self::MINIMUM => 'Must have a minimum value greater than or equal to %d',
             self::MISSING_MAXIMUM => 'Use of exclusiveMaximum requires presence of maximum',
             self::MISSING_MINIMUM => 'Use of exclusiveMinimum requires presence of minimum',

src/JsonSchema/Constraints/CollectionConstraint.php

@@ -29,12 +29,12 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
     {
         // Verify minItems
         if (isset($schema->minItems) && count($value) < $schema->minItems) {
-            $this->addError(ConstraintError::MIN_ITEMS(), $path, ['minItems' => $schema->minItems]);
+            $this->addError(ConstraintError::MIN_ITEMS(), $path, ['minItems' => $schema->minItems, 'found' => count($value)]);
         }
 
         // Verify maxItems
         if (isset($schema->maxItems) && count($value) > $schema->maxItems) {
-            $this->addError(ConstraintError::MAX_ITEMS(), $path, ['maxItems' => $schema->maxItems]);
+            $this->addError(ConstraintError::MAX_ITEMS(), $path, ['maxItems' => $schema->maxItems, 'found' => count($value)]);
         }
 
         // Verify uniqueItems
@@ -50,10 +50,7 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
             }
         }
 
-        // Verify items
-        if (isset($schema->items)) {
-            $this->validateItems($value, $schema, $path, $i);
-        }
+        $this->validateItems($value, $schema, $path, $i);
     }
 
     /**
@@ -65,6 +62,14 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
      */
     protected function validateItems(&$value, $schema = null, ?JsonPointer $path = null, $i = null): void
     {
+        if (\is_null($schema) || !isset($schema->items)) {
+            return;
+        }
+
+        if ($schema->items === true) {
+            return;
+        }
+
         if (is_object($schema->items)) {
             // just one type definition for the whole array
             foreach ($value as $k => &$v) {

tests/Constraints/ArraysTest.php

@@ -271,7 +271,17 @@ public function getValidTests(): array
                         }
                     }
                 }'
-            ]
+            ],
+            'items: true passes validation' => [
+                'input' => <<<JSON
+                    [1, 1.2, "12"]
+JSON
+                ,
+                'schema' => <<<JSON
+                    { "type": "array", "items": true }
+JSON
+                ,
+            ],
         ];
     }
 }

tests/Constraints/MinItemsMaxItemsTest.php

@@ -9,34 +9,64 @@
 
 namespace JsonSchema\Tests\Constraints;
 
+use JsonSchema\Constraints\Constraint;
+
 class MinItemsMaxItemsTest extends BaseTestCase
 {
     protected $validateSchema = true;
 
     public function getInvalidTests(): array
     {
         return [
-            [
-                '{
+            'Input violating minItems constraint' => [
+                'input' => '{
                   "value":[2]
                 }',
-                '{
+                'schema' => '{
                   "type":"object",
                   "properties":{
                     "value":{"type":"array","minItems":2,"maxItems":4}
                   }
-                }'
+                }',
+                'checkMode' => Constraint::CHECK_MODE_NORMAL,
+                [[
+                    'property' => 'value',
+                    'pointer' => '/value',
+                    'message' => 'There must be a minimum of 2 items in the array, 1 found',
+                    'constraint' => [
+                        'name' => 'minItems',
+                        'params' => [
+                            'minItems' => 2,
+                            'found' => 1
+                        ]
+                    ],
+                    'context' => 1
+                ]]
             ],
-            [
-                '{
+            'Input violating maxItems constraint' => [
+                'input' => '{
                   "value":[2,2,5,8,5]
                 }',
-                '{
+                'schema' => '{
                   "type":"object",
                   "properties":{
                     "value":{"type":"array","minItems":2,"maxItems":4}
                   }
-                }'
+                }',
+                'checkMode' => Constraint::CHECK_MODE_NORMAL,
+                [[
+                    'property' => 'value',
+                    'pointer' => '/value',
+                    'message' => 'There must be a maximum of 4 items in the array, 5 found',
+                    'constraint' => [
+                        'name' => 'maxItems',
+                        'params' => [
+                            'maxItems' => 4,
+                            'found' => 5
+                        ]
+                    ],
+                    'context' => 1
+                ]]
             ]
         ];
     }