Skip to content

Slevomat CS 7.0.0 and PHPCS 3.6.0 #241

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

Merged
merged 1 commit into from
Apr 12, 2021
Merged

Slevomat CS 7.0.0 and PHPCS 3.6.0 #241

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"require": {
"php": "^7.1 || ^8.0",
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
"slevomat/coding-standard": "^6.4.1",
"squizlabs/php_codesniffer": "^3.5.8"
"slevomat/coding-standard": "^7.0.0",
"squizlabs/php_codesniffer": "^3.6.0"
},
"config": {
"sort-packages": true
Expand Down
40 changes: 22 additions & 18 deletions lib/Doctrine/ruleset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,15 @@
<exclude name="SlevomatCodingStandard.ControlStructures.BlockControlStructureSpacing.IncorrectLinesCountBeforeControlStructure" />
<exclude name="SlevomatCodingStandard.ControlStructures.BlockControlStructureSpacing.IncorrectLinesCountBeforeFirstControlStructure" />
<properties>
<property name="tokensToCheck" type="array">
<element value="T_IF" />
<element value="T_DO" />
<element value="T_WHILE" />
<element value="T_FOR" />
<element value="T_FOREACH" />
<element value="T_SWITCH" />
<element value="T_TRY" />
<element value="T_DEFAULT" />
<property name="controlStructures" type="array">
<element value="if" />
<element value="do" />
<element value="while" />
<element value="for" />
<element value="foreach" />
<element value="switch" />
<element value="try" />
<element value="default" />
</property>
</properties>
</rule>
Expand All @@ -252,11 +252,11 @@
<property name="linesCountBeforeWhenFirstInCaseOrDefault" value="0"/>
<property name="linesCountAfterWhenLastInCaseOrDefault" value="1"/>
<property name="linesCountAfterWhenLastInLastCaseOrDefault" value="0"/>
<property name="tokensToCheck" type="array">
<element value="T_RETURN" />
<element value="T_THROW" />
<element value="T_YIELD" />
<element value="T_YIELD_FROM" />
<property name="jumpStatements" type="array">
<element value="return" />
<element value="throw" />
<element value="yield" />
<element value="yield_from" />
</property>
</properties>
</rule>
Expand Down Expand Up @@ -346,16 +346,20 @@
<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
<properties>
<property
name="newlinesCountBetweenOpenTagAndDeclare"
value="2"
name="declareOnFirstLine"
value="false"
/>
<property
name="linesCountBeforeDeclare"
value="1"
/>
<property
name="spacesCountAroundEqualsSign"
value="0"
/>
<property
name="newlinesCountAfterDeclare"
value="2"
name="linesCountAfterDeclare"
value="1"
/>
</properties>
</rule>
Expand Down