Handle PHPCS errors

Handle the new issues from updated coding standard.

Author: rdohms

phpcs.xml.dist

@@ -12,7 +12,7 @@
 
     <rule ref="DMS"/>
 
-<!--    <rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators">-->
-<!--        <exclude-pattern>src/Constraint/ArraySubset.php</exclude-pattern>-->
-<!--    </rule>-->
+    <rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators.DisallowedEqualOperator">
+        <exclude-pattern>src/Constraint/ArraySubset.php</exclude-pattern>
+    </rule>
 </ruleset>

src/ArrayAccessible.php

@@ -7,14 +7,15 @@
 use ArrayIterator;
 use IteratorAggregate;
 use Traversable;
+
 use function array_key_exists;
 
 class ArrayAccessible implements ArrayAccess, IteratorAggregate
 {
     /**
      * @var mixed[]
      */
-    private $array;
+    private array $array;
 
     /**
      * @param mixed[] $array
@@ -63,6 +64,9 @@ public function offsetUnset($offset): void
         unset($this->array[$offset]);
     }
 
+    /**
+     * @return mixed[]
+     */
     public function getIterator(): Traversable
     {
         return new ArrayIterator($this->array);

src/ArraySubsetAsserts.php

@@ -9,6 +9,7 @@
 use PHPUnit\Framework\Assert as PhpUnitAssert;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\InvalidArgumentException;
+
 use function is_array;
 
 trait ArraySubsetAsserts
@@ -31,12 +32,14 @@ public static function assertArraySubset($subset, $array, bool $checkForObjectId
                 'array or ArrayAccess'
             );
         }
+
         if (! (is_array($array) || $array instanceof ArrayAccess)) {
             throw InvalidArgumentException::create(
                 2,
                 'array or ArrayAccess'
             );
         }
+
         $constraint = new ArraySubset($subset, $checkForObjectIdentity);
         PhpUnitAssert::assertThat($array, $constraint, $message);
     }

src/Constraint/ArraySubset.php

@@ -10,6 +10,7 @@
 use SebastianBergmann\Comparator\ComparisonFailure;
 use SebastianBergmann\RecursionContext\InvalidArgumentException;
 use Traversable;
+
 use function array_replace_recursive;
 use function is_array;
 use function iterator_to_array;
@@ -26,11 +27,8 @@ final class ArraySubset extends Constraint
     /**
      * @var iterable|mixed[]
      */
-    private $subset;
-    /**
-     * @var bool
-     */
-    private $strict;
+    private iterable $subset;
+    private bool $strict;
 
     /**
      * @param mixed[] $subset
@@ -52,7 +50,8 @@ public function __construct(iterable $subset, bool $strict = false)
      * failure.
      *
      * @param mixed[]|ArrayAccess $other
-     * @return mixed[]|null|bool
+     *
+     * @return mixed[]|bool|null
      *
      * @throws ExpectationFailedException
      * @throws InvalidArgumentException
@@ -69,9 +68,11 @@ public function evaluate($other, string $description = '', bool $returnResult =
         } else {
             $result = $other == $patched;
         }
+
         if ($returnResult) {
             return $result;
         }
+
         if ($result) {
             return null;
         }
@@ -120,12 +121,15 @@ private function toArray(iterable $other): array
         if (is_array($other)) {
             return $other;
         }
+
         if ($other instanceof ArrayObject) {
             return $other->getArrayCopy();
         }
+
         if ($other instanceof Traversable) {
             return iterator_to_array($other);
         }
+
         // Keep BC even if we know that array would not be the expected one
         return (array) $other;
     }

tests/Unit/Constraint/ArraySubsetTest.php

@@ -13,6 +13,7 @@
 use ReflectionClass;
 use SebastianBergmann\RecursionContext\InvalidArgumentException;
 use Traversable;
+
 use function sprintf;
 
 final class ArraySubsetTest extends TestCase
@@ -53,13 +54,13 @@ public static function evaluateDataProvider(): array
     /**
      * @param array|Traversable|mixed[] $subset
      * @param array|Traversable|mixed[] $other
-     * @param bool                      $strict
      *
      * @throws ExpectationFailedException
      * @throws InvalidArgumentException
+     *
      * @dataProvider evaluateDataProvider
      */
-    public function testEvaluate(bool $expected, $subset, $other, $strict): void
+    public function testEvaluate(bool $expected, $subset, $other, bool $strict): void
     {
         $constraint = new ArraySubset($subset, $strict);