Skip to content

Commit 922993c

Browse files
authored
Merge pull request #440 from cakephp/feature/function-predicates
Allow grouped use declarations
2 parents 2e171a7 + dcdf87a commit 922993c

2 files changed

Lines changed: 2 additions & 8 deletions

File tree

‎CakePHP/ruleset.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,9 @@
176176
<property name="allowPartialUses" type="boolean" value="false"/>
177177
</properties>
178178
</rule>
179-
<rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse"/>
180179
<rule ref="SlevomatCodingStandard.Namespaces.UnusedUses"/>
181180
<rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash"/>
182181
<rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace"/>
183-
<rule ref="SlevomatCodingStandard.Namespaces.UseSpacing">
184-
<exclude-pattern>*/templates/*</exclude-pattern>
185-
</rule>
186182
<rule ref="SlevomatCodingStandard.PHP.ShortList"/>
187183
<rule ref="SlevomatCodingStandard.PHP.TypeCast"/>
188184
<rule ref="SlevomatCodingStandard.PHP.UselessParentheses"/>

‎docs/README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CakePHP ruleset
22

3-
The CakePHP standard contains 159 sniffs
3+
The CakePHP standard contains 157 sniffs
44

55
CakePHP (19 sniffs)
66
-------------------
@@ -95,7 +95,7 @@ PSR12 (17 sniffs)
9595
- PSR12.Properties.ConstantVisibility
9696
- PSR12.Traits.UseDeclaration
9797

98-
SlevomatCodingStandard (56 sniffs)
98+
SlevomatCodingStandard (54 sniffs)
9999
----------------------------------
100100
- SlevomatCodingStandard.Arrays.TrailingArrayComma
101101
- SlevomatCodingStandard.Attributes.AttributeAndTargetSpacing
@@ -129,14 +129,12 @@ SlevomatCodingStandard (56 sniffs)
129129
- SlevomatCodingStandard.Functions.RequireTrailingCommaInClosureUse
130130
- SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration
131131
- SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses
132-
- SlevomatCodingStandard.Namespaces.DisallowGroupUse
133132
- SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation
134133
- SlevomatCodingStandard.Namespaces.NamespaceDeclaration
135134
- SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly
136135
- SlevomatCodingStandard.Namespaces.UnusedUses
137136
- SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash
138137
- SlevomatCodingStandard.Namespaces.UseFromSameNamespace
139-
- SlevomatCodingStandard.Namespaces.UseSpacing
140138
- SlevomatCodingStandard.PHP.ShortList
141139
- SlevomatCodingStandard.PHP.TypeCast
142140
- SlevomatCodingStandard.PHP.UselessParentheses

0 commit comments

Comments
 (0)