Skip to content
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.

Sign up for GitHub

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

Jump to bottom

chore(deps): require slevomat/coding-standard v8 and squizlabs/php_codesniffer v3.7 #264

Merged
merged 1 commit into from Jun 23, 2022
Merged

chore(deps): require slevomat/coding-standard v8 and squizlabs/php_codesniffer v3.7 #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Expand Up @@ -90,7 +90,6 @@ jobs:
strategy:
matrix:
php-version:
- "7.1"
- "7.2"
- "7.3"
- "7.4"
Expand Down Expand Up @@ -128,7 +127,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.1"
simPod marked this conversation as resolved.
Show resolved Hide resolved
- "7.2"
- "7.4"
- "8.0"
- "8.1"
Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Expand Up @@ -21,10 +21,10 @@
{"name": "Steve Müller", "email": "st.mueller@dzh-online.de"}
],
"require": {
"php": "^7.1 || ^8.0",
"php": "^7.2 || ^8.0",
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
"slevomat/coding-standard": "^7.0.0",
"squizlabs/php_codesniffer": "^3.6.0"
"slevomat/coding-standard": "^8",
derrabus marked this conversation as resolved.
Show resolved Hide resolved
"squizlabs/php_codesniffer": "^3.7"
},
"config": {
"sort-packages": true
Expand Down
3 changes: 2 additions & 1 deletion lib/Doctrine/ruleset.xml
View file
Open in desktop
Expand Up @@ -133,6 +133,8 @@
</rule>
<!-- Require usage of ::class instead of __CLASS__, get_class(), get_class($this), get_called_class() and get_parent_class() -->
<rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference"/>
<!-- https://github.com/slevomat/coding-standard#slevomatcodingstandardclassespropertydeclaration- -->
<rule ref="SlevomatCodingStandard.Classes.PropertyDeclaration"/>
<!-- Forbid uses of multiple traits separated by comma -->
<rule ref="SlevomatCodingStandard.Classes.TraitUseDeclaration"/>
<!-- Require no spaces before trait use, between trait uses and one space after trait uses -->
Expand Down Expand Up @@ -408,7 +410,6 @@
</property>
</properties>
</rule>
<rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHintSpacing"/>
<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
<properties>
<property name="traversableTypeHints" type="array">
Expand Down
2 changes: 1 addition & 1 deletion tests/expected_report.txt
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ tests/input/not_spacing.php 8 0
tests/input/null_coalesce_equal_operator.php 1 0
tests/input/null_coalesce_operator.php 3 0
tests/input/optimized-functions.php 1 0
tests/input/PropertyTypeHintSpacing.php 6 0
tests/input/PropertyDeclaration.php 6 0
tests/input/return_type_on_closures.php 21 0
tests/input/return_type_on_methods.php 17 0
tests/input/semicolon_spacing.php 3 0
Expand Down
2 changes: 1 addition & 1 deletion tests/fixed/PropertyTypeHintSpacing.php → tests/fixed/PropertyDeclaration.php
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@

namespace Spacing;

final class PropertyTypeHintSpacing
final class PropertyDeclaration
{
public bool $boolPropertyWithDefaultValue = false;
public string $stringProperty;
Expand Down
2 changes: 1 addition & 1 deletion tests/input/PropertyTypeHintSpacing.php → tests/input/PropertyDeclaration.php
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@

namespace Spacing;

final class PropertyTypeHintSpacing
final class PropertyDeclaration
{
public bool $boolPropertyWithDefaultValue = false;
public string $stringProperty;
Expand Down
2 changes: 1 addition & 1 deletion tests/php74-compatibility.patch
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@ index fd5432c..233e24d 100644
+tests/input/null_coalesce_equal_operator.php 5 0
tests/input/null_coalesce_operator.php 3 0
tests/input/optimized-functions.php 1 0
tests/input/PropertyTypeHintSpacing.php 6 0
tests/input/PropertyDeclaration.php 6 0
@@ -39,15 +39,15 @@ tests/input/superfluous-naming.php 11 0
tests/input/test-case.php 8 0
tests/input/trailing_comma_on_array.php 1 0
Expand Down
2 changes: 1 addition & 1 deletion tests/php80-compatibility.patch
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ index c644926..d0f0a44 100644
tests/input/null_coalesce_operator.php 3 0
+tests/input/null_safe_operator.php 1 0
tests/input/optimized-functions.php 1 0
tests/input/PropertyTypeHintSpacing.php 6 0
tests/input/PropertyDeclaration.php 6 0
tests/input/return_type_on_closures.php 21 0
@@ -39,15 +40,15 @@ tests/input/superfluous-naming.php 11 0
tests/input/test-case.php 8 0
Expand Down
2 changes: 1 addition & 1 deletion tests/php81-compatibility.patch
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ index c644926..d0f0a44 100644
tests/input/null_coalesce_operator.php 3 0
+tests/input/null_safe_operator.php 1 0
tests/input/optimized-functions.php 1 0
tests/input/PropertyTypeHintSpacing.php 6 0
tests/input/PropertyDeclaration.php 6 0
tests/input/return_type_on_closures.php 21 0
@@ -39,15 +40,15 @@ tests/input/superfluous-naming.php 11 0
tests/input/test-case.php 8 0
Expand Down