Skip to content

Commit

Permalink
Merge pull request #4369 from wp-cli/4058-restore
Browse files Browse the repository at this point in the history 
Revert "Revert "PHPCS: Remove exclusions that can be fixed""
  • Loading branch information
@miya0001
miya0001 committed Sep 20, 2017
2 parents 45b0720 + 23005e3 commit c79ff2e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 46 deletions.
4 changes: 3 additions & 1 deletion php/utils.php
View file
Expand Up @@ -1201,7 +1201,9 @@ function check_proc_available( $context = null, $return = false ) {
* @return string
*/
function past_tense_verb( $verb ) {
static $irregular = array( 'reset' => 'reset' );
static $irregular = array(
'reset' => 'reset',
);
if ( isset( $irregular[ $verb ] ) ) {
return $irregular[ $verb ];
}
Expand Down
45 changes: 0 additions & 45 deletions phpcs.xml.dist
View file
Expand Up @@ -20,40 +20,8 @@
<exclude-pattern>*/vendor/*</exclude-pattern>

<rule ref="WordPress-Core">
<exclude name="Generic.ControlStructures.InlineControlStructure.NotAllowed" />
<exclude name="Generic.Formatting.DisallowMultipleStatements.SameLine" />
<exclude name="Generic.Formatting.SpaceAfterCast.NoSpace" />
<exclude name="Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace" />
<exclude name="Generic.Functions.OpeningFunctionBraceKernighanRitchie.SpaceBeforeBrace" />
<exclude name="Generic.PHP.LowerCaseKeyword.Found" />
<exclude name="Generic.PHP.LowerCaseConstant.Found" />
<exclude name="Generic.PHP.NoSilencedErrors.Discouraged" />
<exclude name="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed" />
<exclude name="Generic.WhiteSpace.ScopeIndent.Incorrect" />
<exclude name="Generic.WhiteSpace.ScopeIndent.IncorrectExact" />
<exclude name="PEAR.Functions.FunctionCallSignature.Indent" />
<exclude name="PEAR.Functions.FunctionCallSignature.EmptyLine" />
<exclude name="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket" />
<exclude name="PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket" />
<exclude name="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket" />
<exclude name="PSR2.ControlStructures.ElseIfDeclaration.NotAllowed" />
<exclude name="Squiz.Strings.ConcatenationSpacing.PaddingFound" />
<exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword" />
<exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis" />
<exclude name="Squiz.Commenting.LongConditionClosingComment.Missing" />
<exclude name="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterOpen" />
<exclude name="Squiz.PHP.DisallowMultipleAssignments.Found" />
<exclude name="Squiz.Strings.DoubleQuoteUsage.NotRequired" />
<exclude name="Squiz.WhiteSpace.SuperfluousWhitespace.EndLine" />
<exclude name="WordPress.Arrays.ArrayDeclaration.NotLowerCase" />
<exclude name="WordPress.Arrays.ArrayDeclaration.NoComma" />
<exclude name="WordPress.Arrays.ArrayDeclaration.NoCommaAfterLast" />
<exclude name="WordPress.Arrays.ArrayDeclaration.SpaceAfterKeyword" />
<exclude name="WordPress.Arrays.ArrayDeclarationSpacing.AssociativeKeyFound" />
<exclude name="WordPress.Arrays.ArrayDeclarationSpacing.NoSpaceAfterArrayOpener" />
<exclude name="WordPress.Arrays.ArrayDeclarationSpacing.NoSpaceBeforeArrayCloser" />
<exclude name="WordPress.Arrays.ArrayKeySpacingRestrictions.SpacesAroundArrayKeys" />
<exclude name="WordPress.Arrays.ArrayKeySpacingRestrictions.NoSpacesAroundArrayKeys" />
<exclude name="WordPress.DB.RestrictedFunctions.mysql_mysql_host_to_cli_args" />
<exclude name="WordPress.Files.FileName.InvalidClassFileName" />
<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase" />
Expand All @@ -63,18 +31,5 @@
<exclude name="WordPress.NamingConventions.ValidVariableName.MemberNotSnakeCase" />
<exclude name="WordPress.NamingConventions.ValidVariableName.NotSnakeCase" />
<exclude name="WordPress.PHP.YodaConditions.NotYoda" />
<exclude name="WordPress.WhiteSpace.CastStructureSpacing.NoSpaceBeforeOpenParenthesis" />
<exclude name="WordPress.WhiteSpace.CastStructureSpacing.NoSpaceAfterCloseParenthesis" />
<exclude name="WordPress.WhiteSpace.ControlStructureSpacing.BlankLineAfterEnd" />
<exclude name="WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceAfterStructureOpen" />
<exclude name="WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceAfterOpenParenthesis" />
<exclude name="WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceBeforeOpenParenthesis" />
<exclude name="WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceAfterCloseParenthesis" />
<exclude name="WordPress.WhiteSpace.ControlStructureSpacing.NoSpaceBeforeCloseParenthesis" />
<exclude name="WordPress.WhiteSpace.ControlStructureSpacing.ExtraSpaceAfterOpenParenthesis" />
<exclude name="WordPress.WhiteSpace.ControlStructureSpacing.ExtraSpaceBeforeCloseParenthesis" />
<exclude name="WordPress.WhiteSpace.OperatorSpacing.NoSpaceAfter" />
<exclude name="WordPress.WhiteSpace.OperatorSpacing.NoSpaceBefore" />
<exclude name="WordPress.WP.CapitalPDangit" />
</rule>
</ruleset>

0 comments on commit c79ff2e

Please sign in to comment.