fix: Fixes for minContains and maxContains

Author: DannyvdSluijs

src/JsonSchema/ConstraintError.php

@@ -39,7 +39,9 @@ class ConstraintError extends Enum
     public const INVALID_SCHEMA = 'invalidSchema';
     public const LENGTH_MAX = 'maxLength';
     public const LENGTH_MIN = 'minLength';
+    public const MAX_CONTAINS = 'maxContains';
     public const MAXIMUM = 'maximum';
+    public const MIN_CONTAINS = 'minContains';
     public const MIN_ITEMS = 'minItems';
     public const MINIMUM = 'minimum';
     public const MISSING_ERROR = 'missingError';
@@ -99,8 +101,10 @@ 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_CONTAINS => 'There must be a maximum of %d valid items in the array, %d found',
             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_CONTAINS => 'There must be a minimum of %d valid items in the array, %d found',
             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',

src/JsonSchema/Constraints/Drafts/Draft2019/ContainsConstraint.php

@@ -28,20 +28,27 @@ public function check(&$value, $schema = null, ?JsonPointer $path = null, $i = n
             return;
         }
 
-        $properties = [];
         if (!is_array($value)) {
             return;
         }
 
-        foreach ($value as $propertyName => $propertyValue) {
+        $validElementCount = 0;
+        foreach ($value as $propertyValue) {
             $schemaConstraint = $this->factory->createInstanceFor('schema');
 
             $schemaConstraint->check($propertyValue, $schema->contains, $path, $i);
             if ($schemaConstraint->isValid()) {
-                return;
+                $validElementCount++;
             }
         }
 
-        $this->addError(ConstraintError::CONTAINS(), $path, ['contains' => $schema->contains]);
+        if (property_exists($schema, 'maxContains') && $validElementCount > $schema->maxContains) {
+            $this->addError(ConstraintError::MAX_CONTAINS(), $path, ['maxContains' => $schema->maxContains, 'count' => $validElementCount]);
+        }
+
+        $minContains = property_exists($schema, 'minContains') ? $schema->minContains : 1;
+        if ($validElementCount < $minContains) {
+            $this->addError(ConstraintError::MIN_CONTAINS(), $path, ['minContains' => $minContains, 'count' => $validElementCount]);
+        }
     }
 }