Merge pull request #59 from rdohms/task/new-coding-standard

Adopt new Coding Standard version

Author: rdohms

.github/workflows/check-cs.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 7.4
+        php-version: 8.x
         coverage: none
         tools: composer, cs2pr
 

composer.json

@@ -15,7 +15,7 @@
     ],
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.4",
-        "dms/coding-standard": "^8"
+        "dms/coding-standard": "^9"
     },
     "autoload": {
         "files": ["assertarraysubset-autoload.php"]

composer.lock

@@ -13,6 +13,8 @@
 
     <rule ref="DMS">
         <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"/>
     </rule>
 
     <rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators.DisallowedEqualOperator">
@@ -36,14 +38,5 @@
         <exclude-pattern>assertarraysubset-autoload\.php</exclude-pattern>
         <exclude-pattern>tests/Availability/*\.php</exclude-pattern>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint">
-        <exclude-pattern>assertarraysubset-autoload\.php</exclude-pattern>
-        <exclude-pattern>src/AssertFallThrough\.php</exclude-pattern>
-    </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint">
-        <exclude-pattern>assertarraysubset-autoload\.php</exclude-pattern>
-        <exclude-pattern>src/AssertFallThrough\.php</exclude-pattern>
-        <exclude-pattern>tests/Availability/*\.php</exclude-pattern>
-    </rule>
 
 </ruleset>

phpcs.xml.dist

@@ -1,12 +1,13 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DMS\PHPUnitExtensions\ArraySubset;
 
 use ArrayAccess;
 use ArrayIterator;
 use IteratorAggregate;
-use ReturnTypeWillChange; // phpcs:ignore SlevomatCodingStandard.Namespaces.UnusedUses.UnusedUse
+use ReturnTypeWillChange;
 use Traversable;
 
 use function array_key_exists;

src/ArrayAccessible.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DMS\PHPUnitExtensions\ArraySubset;

src/ArraySubsetAsserts.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DMS\PHPUnitExtensions\ArraySubset;

src/Assert.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DMS\PHPUnitExtensions\ArraySubset\Constraint;

src/Constraint/ArraySubset.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DMS\PHPUnitExtensions\ArraySubset\Tests\Unit;

tests/Unit/AssertTest.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace DMS\PHPUnitExtensions\ArraySubset\Tests\Unit\Constraint;