Merge with dev

Author: alezhu

.github/workflows/php.yml

@@ -1,4 +1,4 @@
-name: PHP Composer
+name: PHPUnit
 
 on:
   push:
@@ -17,6 +17,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Setup PHP 8.1
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+
       - name: Check PHP Version
         run: php -v
 

.gitignore

@@ -9,3 +9,4 @@ composer.lock
 /.phpunit.result.cache
 
 /coverage
+/.phpunit.cache

phpunit.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         executionOrder="depends,defects"
+         requireCoverageMetadata="false"
+         beStrictAboutCoverageMetadata="false"
+         beStrictAboutOutputDuringTests="false"
+         failOnRisky="true"
+         failOnWarning="true">
+    <testsuites>
+        <testsuite name="default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
+</phpunit>

src/ArrayContainsTrait.php

@@ -11,6 +11,13 @@
 
 trait ArrayContainsTrait
 {
+    /**
+     * @param $subset
+     * @param $array
+     * @param bool $strict
+     * @param string $message
+     * @return void
+     */
     public static function assertArrayContains($subset, $array, bool $strict = false, string $message = '')
     {
         if (!(is_array($subset) || $subset instanceof ArrayAccess || $subset instanceof Iterator)) {
@@ -30,6 +37,13 @@ public static function assertArrayContains($subset, $array, bool $strict = false
         PhpUnitAssert::assertThat($array, $constraint, $message);
     }
 
+    /**
+     * @param $subset
+     * @param $array
+     * @param bool $strict
+     * @param string $message
+     * @return void
+     */
     public static function assertArrayContainsOnly($subset, $array, bool $strict = false, string $message = '')
     {
         if (!(is_array($subset) || $subset instanceof ArrayAccess || $subset instanceof Iterator)) {

src/Constraint/ArrayContainsOnly.php

@@ -15,7 +15,7 @@ protected function _matchAssoc($other): bool
                 if (!array_key_exists($key, $subset)) {
                     $failure = new ComparisonFailure($this->subset, $other, var_export($this->subset, true), var_export($other, true));
                     $this->fail($other, "Actual data contains unexpected keys: ($key)", $failure);
-                };
+                }
             }
         }
         return $result;

tests/ArrayContainsTraitTest.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Alezhu\PHPUnitArrayContainsAsserts\Tests;
+
+
+use Alezhu\PHPUnitArrayContainsAsserts\Assert;
+use PHPUnit\Framework\InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
+
+class ArrayContainsTraitTest extends TestCase
+{
+    public function test_assertArrayContains_should_be_valid_for_valid_arguments()
+    {
+        Assert::assertArrayContains(["foo" => "bar", "baz" => 1], ["foo" => "bar", "baz" => 1]);
+    }
+
+    public function test_assertArrayContainsOnly_should_be_valid_for_valid_arguments()
+    {
+        Assert::assertArrayContainsOnly(["foo" => "bar", "baz" => 1], ["foo" => "bar", "baz" => 1]);
+    }
+
+    public function test_assertArrayContains_should_raise_exception_if_passed_not_array_like_subset()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Argument #1 must be array or ArrayAccess or Iterator");
+
+        Assert::assertArrayContains("string", []);
+    }
+
+    public function test_assertArrayContains_should_raise_exception_if_passed_not_array_like_actual()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Argument #2 must be array or ArrayAccess or Iterator");
+
+        Assert::assertArrayContains([], "string");
+    }
+
+    public function test_assertArrayContainsOnly_should_raise_exception_if_passed_not_array_like_subset()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Argument #1 must be array or ArrayAccess or Iterator");
+
+        Assert::assertArrayContainsOnly("string", []);
+    }
+
+    public function test_assertArrayContainsOnly_should_raise_exception_if_passed_not_array_like_actual()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage("Argument #2 must be array or ArrayAccess or Iterator");
+
+        Assert::assertArrayContainsOnly([], "string");
+    }
+}

…rts/Constraint/ArrayContainsBaseTest.php …sts/Constraint/ArrayContainsBaseTest.phptests/Alezhu/PHPUnitArrayContainsAsserts/Constraint/ArrayContainsBaseTest.php renamed to tests/Constraint/ArrayContainsBaseTest.php tests/Alezhu/PHPUnitArrayContainsAsserts/Constraint/ArrayContainsBaseTest.php renamed to tests/Constraint/ArrayContainsBaseTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Alezhu\PHPUnitArrayContainsAsserts\Constraint\Tests;
+namespace Alezhu\PHPUnitArrayContainsAsserts\Tests\Constraint;
 
 use Alezhu\PHPUnitArrayContainsAsserts\Constraint\ArrayContainsBase;
 use ArrayAccess;
@@ -20,7 +20,7 @@ public function isAssocArray($array): bool
         return parent::_isAssocArray($array);
     }
 
-    public function toArray($value)
+    public function toArray($value): array
     {
         return parent::_toArray($value);
     }
@@ -204,7 +204,7 @@ public function test_toArray_should_throw_exception_4_non_array_like_type()
         $value = "1,2,3";
         $this->expectException(AssertionFailedError::class);
         $this->expectExceptionMessage('Not supported type');
-        $result = $instance->toArray($value);
+        $instance->toArray($value);
 
     }
 }

…rts/Constraint/ArrayContainsOnlyTest.php …sts/Constraint/ArrayContainsOnlyTest.phptests/Alezhu/PHPUnitArrayContainsAsserts/Constraint/ArrayContainsOnlyTest.php renamed to tests/Constraint/ArrayContainsOnlyTest.php tests/Alezhu/PHPUnitArrayContainsAsserts/Constraint/ArrayContainsOnlyTest.php renamed to tests/Constraint/ArrayContainsOnlyTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Alezhu\PHPUnitArrayContainsAsserts\Constraint\Tests;
+namespace Alezhu\PHPUnitArrayContainsAsserts\Tests\Constraint;
 
 use Alezhu\PHPUnitArrayContainsAsserts\Constraint\ArrayContainsOnly;
 use PHPUnit\Framework\ExpectationFailedException;

…Asserts/Constraint/ArrayContainsTest.php tests/Constraint/ArrayContainsTest.phptests/Alezhu/PHPUnitArrayContainsAsserts/Constraint/ArrayContainsTest.php renamed to tests/Constraint/ArrayContainsTest.php tests/Alezhu/PHPUnitArrayContainsAsserts/Constraint/ArrayContainsTest.php renamed to tests/Constraint/ArrayContainsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Alezhu\PHPUnitArrayContainsAsserts\Constraint\Tests;
+namespace Alezhu\PHPUnitArrayContainsAsserts\Tests\Constraint;
 
 use Alezhu\PHPUnitArrayContainsAsserts\Constraint\ArrayContains;
 use PHPUnit\Framework\AssertionFailedError;