Skip to content

Commit 92210d5

Browse files
authored
refactor(InlineControlStructure): Use upstream Generic sniff instead (#3559493)
1 parent 44bf9e3 commit 92210d5

File tree

3 files changed

+2
-58
lines changed

3 files changed

+2
-58
lines changed

.github/workflows/testing.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,5 @@ jobs:
102102
sed -i 's/Drupal.Classes.InterfaceName/Generic.NamingConventions.InterfaceNameSuffix/g' phpcs.xml.dist
103103
sed -i '/<rule ref="Drupal.Commenting.DataTypeNamespace"\/>/d' phpcs.xml.dist
104104
sed -i 's/Drupal.ControlStructures.ElseIf/PSR2.ControlStructures.ElseIfDeclaration/g' phpcs.xml.dist
105+
sed -i 's/Drupal.ControlStructures.InlineControlStructure/Generic.ControlStructures.InlineControlStructure/g' phpcs.xml.dist
105106
../../vendor/bin/phpcs -p -s --parallel=$(nproc) --exclude=Drupal.ControlStructures.ControlSignature --ignore=lib/Drupal/Core/Command/GenerateTheme.php,modules/mysql/tests/src/Kernel/mysql/Console/DbDumpCommandTest.php,modules/big_pipe/tests/modules/big_pipe_test/src/BigPipePlaceholderTestCases.php,tests/fixtures/plugins/CustomPlugin.php,modules/package_manager/tests/modules/package_manager_test_api/src/ApiController.php,modules/views/tests/src/Kernel/Plugin/StyleGridTest.php

coder_sniffer/Drupal/Sniffs/ControlStructures/InlineControlStructureSniff.php

Lines changed: 0 additions & 58 deletions
This file was deleted.

coder_sniffer/Drupal/ruleset.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
4242
<rule ref="Generic.CodeAnalysis.EmptyPHPStatement"/>
4343
<rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
44+
<rule ref="Generic.ControlStructures.InlineControlStructure"/>
4445
<rule ref="Generic.Files.ByteOrderMark"/>
4546
<rule ref="Generic.Files.LineEndings"/>
4647
<rule ref="Generic.Formatting.DisallowMultipleStatements"/>

0 commit comments

Comments
 (0)