Merge pull request #207 from cakephp/uppercase-constant-fix

Switch to using the phpcs provided uppercase constant sniff.
cakephp · Jun 8, 2018 · d6018c8 · d6018c8
2 parents 1309b61 + ebc4557
commit d6018c8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 288 deletions.
diff --git a/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php b/CakePHP/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
diff --git a/CakePHP/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc b/CakePHP/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc
diff --git a/CakePHP/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php b/CakePHP/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php
diff --git a/CakePHP/ruleset.xml b/CakePHP/ruleset.xml
@@ -50,6 +50,7 @@
    <property name="ignoreBlankLines" value="false"/>
   </properties>
  </rule>
+
  <!--
  Temporarily ignore until API docblock formatting and line length issues in core code are fixed.
  -->
@@ -111,6 +112,7 @@
  <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
  <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
  <rule ref="Squiz.WhiteSpace.ScopeClosingBrace"/>
+ <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
 
  <!-- Relax some src/* and tests/* rules -->
  <rule ref="PSR1.Files.SideEffects">