Move argument checking from ArrayAssertsTrait to constraint constructors

Author: PhrozenByte

src/ArrayAssertsTrait.php

@@ -55,11 +55,6 @@ public static function assertAssociativeArray(
         bool $allowAdditional = true,
         string $message = ''
     ): void {
-        $isNoConstraint = static function ($constraint): bool { return !($constraint instanceof Constraint); };
-        if (!(is_array($constraints) && !array_filter($constraints, $isNoConstraint))) {
-            throw InvalidArgumentException::create(1, sprintf('array of %s', Constraint::class));
-        }
-
         if (!(is_array($array) || ($array instanceof ArrayAccess))) {
             throw InvalidArgumentException::create(2, 'array or ArrayAccess');
         }
@@ -82,7 +77,7 @@ public static function assertAssociativeArray(
      *
      * @return AssociativeArray
      *
-     * @throws Exception
+     * @throws InvalidArgumentException
      */
     public static function associativeArray(
         array $constraints,
@@ -107,10 +102,6 @@ public static function associativeArray(
      */
     public static function assertArrayHasKeyWith($key, Constraint $constraint, $array, string $message = ''): void
     {
-        if (!(is_int($key) || is_string($key))) {
-            throw InvalidArgumentException::create(1, 'integer or string');
-        }
-
         if (!(is_array($array) || ($array instanceof ArrayAccess))) {
             throw InvalidArgumentException::create(3, 'array or ArrayAccess');
         }
@@ -127,7 +118,7 @@ public static function assertArrayHasKeyWith($key, Constraint $constraint, $arra
      *
      * @return ArrayHasKeyWith
      *
-     * @throws Exception
+     * @throws InvalidArgumentException
      */
     public static function arrayHasKeyWith($key, Constraint $constraint): ArrayHasKeyWith
     {
@@ -155,18 +146,6 @@ public static function assertSequentialArray(
         Constraint $constraint = null,
         string $message = ''
     ): void {
-        if ($minItems < 0) {
-            throw InvalidArgumentException::create(1, 'non-negative integer');
-        }
-
-        if ($maxItems !== null) {
-            if ($maxItems < 0) {
-                throw InvalidArgumentException::create(2, 'non-negative integer');
-            } elseif ($minItems > $maxItems) {
-                throw InvalidArgumentException::create(2, 'integer not lesser than argument #2');
-            }
-        }
-
         if (!(is_array($array) || ($array instanceof Traversable))) {
             throw InvalidArgumentException::create(3, 'array or Traversable');
         }
@@ -184,7 +163,7 @@ public static function assertSequentialArray(
      *
      * @return SequentialArray
      *
-     * @throws Exception
+     * @throws InvalidArgumentException
      */
     public static function sequentialArray(
         int $minItems,
@@ -224,8 +203,6 @@ public static function assertArrayHasItemWith(int $index, Constraint $constraint
      * @param Constraint $constraint the constraint the item's value is applied to
      *
      * @return ArrayHasItemWith
-     *
-     * @throws Exception
      */
     public static function arrayHasItemWith(int $index, Constraint $constraint): ArrayHasItemWith
     {

src/Constraint/ArrayHasKeyWith.php

@@ -21,6 +21,7 @@
 
 use ArrayAccess;
 use PHPUnit\Framework\Constraint\Constraint;
+use PHPUnit\Framework\InvalidArgumentException;
 
 /**
  * Constraint that asserts that an array has a given key and that its value
@@ -45,9 +46,15 @@ class ArrayHasKeyWith extends Constraint
      *
      * @param int|string $key        the key of the item to check
      * @param Constraint $constraint the constraint the item's value is applied to
+     *
+     * @throws InvalidArgumentException
      */
     public function __construct($key, Constraint $constraint)
     {
+        if (!(is_int($key) || is_string($key))) {
+            throw InvalidArgumentException::create(1, 'integer or string');
+        }
+
         $this->key = $key;
         $this->constraint = $constraint;
     }

src/Constraint/AssociativeArray.php

@@ -22,7 +22,7 @@
 use ArrayAccess;
 use LucidFrame\Console\ConsoleTable;
 use PHPUnit\Framework\Constraint\Constraint;
-use PHPUnit\Framework\Exception as PHPUnitException;
+use PHPUnit\Framework\InvalidArgumentException;
 
 /**
  * Constraint that asserts that a value is an associative array matching a
@@ -55,18 +55,17 @@ class AssociativeArray extends Constraint
      * @param bool         $allowMissing    whether missing items should fail the constraint (defaults to FALSE)
      * @param bool         $allowAdditional whether additional items should fail the constraint (defaults to TRUE);
      *                                      this option works for native arrays only
+     *
+     * @throws InvalidArgumentException
      */
     public function __construct(array $constraints, bool $allowMissing = false, bool $allowAdditional = true)
     {
-        foreach ($constraints as $key => $constraint) {
-            if (!($constraint instanceof Constraint)) {
-                $errorTemplate = 'All constraints of %s must be instances of %s.';
-                throw new PHPUnitException(sprintf($errorTemplate, __CLASS__, Constraint::class));
-            }
-
-            $this->constraints[$key] = $constraint;
+        $isNoConstraint = static function ($constraint): bool { return !($constraint instanceof Constraint); };
+        if (!(is_array($constraints) && !array_filter($constraints, $isNoConstraint))) {
+            throw InvalidArgumentException::create(1, sprintf('array of %s', Constraint::class));
         }
 
+        $this->constraints = $constraints;
         $this->allowMissing = $allowMissing;
         $this->allowAdditional = $allowAdditional;
     }

src/Constraint/SequentialArray.php

@@ -25,7 +25,7 @@
 use IteratorAggregate;
 use NoRewindIterator;
 use PHPUnit\Framework\Constraint\Constraint;
-use PHPUnit\Framework\Exception as PHPUnitException;
+use PHPUnit\Framework\InvalidArgumentException;
 use Traversable;
 
 /**
@@ -62,16 +62,26 @@ class SequentialArray extends Constraint
      * @param int             $minItems   required minimum number of items, defaults to 0
      * @param int|null        $maxItems   required maximum number of items, defaults to NULL (infinite)
      * @param Constraint|null $constraint optional constraint to apply all items to (defaults to NULL)
+     *
+     * @throws InvalidArgumentException
      */
     public function __construct(int $minItems = 0, int $maxItems = null, Constraint $constraint = null)
     {
+        if ($minItems < 0) {
+            throw InvalidArgumentException::create(1, 'non-negative integer');
+        }
+
+        if ($maxItems !== null) {
+            if ($maxItems < 0) {
+                throw InvalidArgumentException::create(2, 'non-negative integer');
+            } elseif ($minItems > $maxItems) {
+                throw InvalidArgumentException::create(2, 'integer not lesser than argument #2');
+            }
+        }
+
         $this->minItems = $minItems;
         $this->maxItems = $maxItems;
         $this->constraint = $constraint;
-
-        if (($this->minItems < 0) || (($this->maxItems !== null) && ($this->minItems > $this->maxItems))) {
-            throw new PHPUnitException(sprintf('Count constraints of %s must not be contradictory.', __CLASS__));
-        }
     }
 
     /**