Merge pull request WordPress#591 from jrfnl/feature/issue-588-no-php-…

…closing-tag Add sniff for (no) closing PHP tag at end of file to `core` ruleset.
jrfnl · Jul 14, 2016 · 21abfbe · 21abfbe
2 parents 77e400c + a4879d4
commit 21abfbe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ php:
 
 env:
   - PHPCS_BRANCH=master
-  - PHPCS_BRANCH=2.2.0
+  - PHPCS_BRANCH=2.4.0
 
 matrix:
   fast_finish: true

diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
@@ -14,6 +14,7 @@
 
 	<!-- http://make.wordpress.org/core/handbook/coding-standards/php/#remove-trailing-spaces -->
 	<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
+	<rule ref="PSR2.Files.ClosingTag"/>
 
 	<!-- http://make.wordpress.org/core/handbook/coding-standards/php/#no-shorthand-php-tags -->
 	<rule ref="Generic.PHP.DisallowShortOpenTag"/>

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
 		}
 	],
 	"require"    : {
-		"squizlabs/php_codesniffer": "~2.2"
+		"squizlabs/php_codesniffer": "^2.4"
 	},
 	"minimum-stability" : "RC",
 	"support"    : {