Conform to new Coding Standard

Author: rdohms

phpcs.xml.dist

@@ -11,4 +11,8 @@
     <file>tests</file>
 
     <rule ref="DMS"/>
+
+    <rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators.DisallowedEqualOperator">
+        <exclude-pattern>src/Constraint/ArraySubset.php</exclude-pattern>
+    </rule>
 </ruleset>

src/ArraySubsetAsserts.php

@@ -6,19 +6,19 @@
 use ArrayAccess;
 use DMS\PHPUnitExtensions\ArraySubset\Constraint\ArraySubset;
 use Exception;
-use function is_array;
 use PHPUnit\Framework\Assert as PhpUnitAssert;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Util\InvalidArgumentHelper;
 use SebastianBergmann\RecursionContext\InvalidArgumentException;
+use function is_array;
 
 trait ArraySubsetAsserts
 {
     /**
      * Asserts that an array has a specified subset.
      *
-     * @param array|ArrayAccess $subset
-     * @param array|ArrayAccess $array
+     * @param array|ArrayAccess|mixed[] $subset
+     * @param array|ArrayAccess|mixed[] $array
      *
      * @throws ExpectationFailedException
      * @throws InvalidArgumentException

src/Constraint/ArraySubset.php

@@ -3,6 +3,7 @@
 
 namespace DMS\PHPUnitExtensions\ArraySubset\Constraint;
 
+use ArrayAccess;
 use ArrayObject;
 use PHPUnit\Framework\Constraint\Constraint;
 use PHPUnit\Framework\ExpectationFailedException;
@@ -23,14 +24,17 @@
 final class ArraySubset extends Constraint
 {
     /**
-     * @var iterable
+     * @var iterable|mixed[]
      */
     private $subset;
     /**
      * @var bool
      */
     private $strict;
 
+    /**
+     * @param mixed[] $subset
+     */
     public function __construct(iterable $subset, bool $strict = false)
     {
         $this->strict = $strict;
@@ -47,6 +51,9 @@ public function __construct(iterable $subset, bool $strict = false)
      * a boolean value instead: true in case of success, false in case of a
      * failure.
      *
+     * @param mixed[]|ArrayAccess $other
+     * @return mixed[]|null|bool
+     *
      * @throws ExpectationFailedException
      * @throws InvalidArgumentException
      */
@@ -103,6 +110,11 @@ protected function failureDescription($other): string
         return 'an array ' . $this->toString();
     }
 
+    /**
+     * @param mixed[]|iterable $other
+     *
+     * @return mixed[]
+     */
     private function toArray(iterable $other): array
     {
         if (is_array($other)) {

tests/Unit/AssertTest.php

@@ -4,9 +4,9 @@
 namespace DMS\PHPUnitExtensions\ArraySubset\Tests\Unit;
 
 use DMS\PHPUnitExtensions\ArraySubset\Assert;
+use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
-use PHPUnit\Framework\Exception;
 
 final class AssertTest extends TestCase
 {
@@ -19,7 +19,7 @@ public function testAssertArraySubsetPassesStrictConfig(): void
     public function testAssertArraySubsetThrowsExceptionForInvalidSubset(): void
     {
         $this->expectException(ExpectationFailedException::class);
-        Assert::assertArraySubset([6,7], [1,2,3,4,5,6]);
+        Assert::assertArraySubset([6, 7], [1, 2, 3, 4, 5, 6]);
     }
 
     public function testAssertArraySubsetThrowsExceptionForInvalidSubsetArgument(): void
@@ -36,6 +36,6 @@ public function testAssertArraySubsetThrowsExceptionForInvalidArrayArgument(): v
 
     public function testAssertArraySubsetDoesNothingForValidScenario(): void
     {
-        Assert::assertArraySubset([1,2], [1,2,3]);
+        Assert::assertArraySubset([1, 2], [1, 2, 3]);
     }
 }

tests/Unit/Constraint/ArraySubsetTest.php

@@ -1,7 +1,6 @@
 <?php
 declare(strict_types=1);
 
-
 namespace DMS\PHPUnitExtensions\ArraySubset\Tests\Unit\Constraint;
 
 use ArrayAccessible;
@@ -18,22 +17,25 @@
 
 final class ArraySubsetTest extends TestCase
 {
+    /**
+     * @return mixed[]
+     */
     public static function evaluateDataProvider(): array
     {
         return [
-            'loose array subset and array other' => [
+            'loose array subset and array other'        => [
                 'expected' => true,
                 'subset'   => ['bar' => 0],
                 'other'    => ['foo' => '', 'bar' => '0'],
                 'strict'   => false,
             ],
-            'strict array subset and array other' => [
+            'strict array subset and array other'       => [
                 'expected' => false,
                 'subset'   => ['bar' => 0],
                 'other'    => ['foo' => '', 'bar' => '0'],
                 'strict'   => true,
             ],
-            'loose array subset and ArrayObject other' => [
+            'loose array subset and ArrayObject other'  => [
                 'expected' => true,
                 'subset'   => ['bar' => 0],
                 'other'    => new ArrayObject(['foo' => '', 'bar' => '0']),
@@ -49,9 +51,9 @@ public static function evaluateDataProvider(): array
     }
 
     /**
-     * @param array|Traversable $subset
-     * @param array|Traversable $other
-     * @param bool              $strict
+     * @param array|Traversable|mixed[] $subset
+     * @param array|Traversable|mixed[] $other
+     * @param bool                      $strict
      *
      * @throws ExpectationFailedException
      * @throws InvalidArgumentException
@@ -92,19 +94,25 @@ public function testIsCountable(): void
     {
         $reflection = new ReflectionClass(ArraySubset::class);
 
-        $this->assertTrue($reflection->implementsInterface(Countable::class), sprintf(
-            'Failed to assert that ArraySubset implements "%s".',
-            Countable::class
-        ));
+        $this->assertTrue(
+            $reflection->implementsInterface(Countable::class),
+            sprintf(
+                'Failed to assert that ArraySubset implements "%s".',
+                Countable::class
+            )
+        );
     }
 
     public function testIsSelfDescribing(): void
     {
         $reflection = new ReflectionClass(ArraySubset::class);
 
-        $this->assertTrue($reflection->implementsInterface(SelfDescribing::class), sprintf(
-            'Failed to assert that Array implements "%s".',
-            SelfDescribing::class
-        ));
+        $this->assertTrue(
+            $reflection->implementsInterface(SelfDescribing::class),
+            sprintf(
+                'Failed to assert that Array implements "%s".',
+                SelfDescribing::class
+            )
+        );
     }
 }