Skip to content

Adopt new Coding Standard version #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"require-dev": {
"squizlabs/php_codesniffer": "^3.4",
"dms/coding-standard": "^8"
"dms/coding-standard": "^9"
},
"autoload": {
"files": ["assertarraysubset-autoload.php"]
Expand Down
92 changes: 44 additions & 48 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 2 additions & 9 deletions phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
3 changes: 2 additions & 1 deletion src/ArrayAccessible.php
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/ArraySubsetAsserts.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

declare(strict_types=1);

namespace DMS\PHPUnitExtensions\ArraySubset;
Expand Down
1 change: 1 addition & 0 deletions src/Assert.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

declare(strict_types=1);

namespace DMS\PHPUnitExtensions\ArraySubset;
Expand Down
1 change: 1 addition & 0 deletions src/Constraint/ArraySubset.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

declare(strict_types=1);

namespace DMS\PHPUnitExtensions\ArraySubset\Constraint;
Expand Down
1 change: 1 addition & 0 deletions tests/Unit/AssertTest.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

declare(strict_types=1);

namespace DMS\PHPUnitExtensions\ArraySubset\Tests\Unit;
Expand Down
1 change: 1 addition & 0 deletions tests/Unit/Constraint/ArraySubsetTest.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

declare(strict_types=1);

namespace DMS\PHPUnitExtensions\ArraySubset\Tests\Unit\Constraint;
Expand Down