Merge pull request #1021 from simonwelsh/indent-sniff_3.1

Add codesniffer that ensures indentation is with tabs.

.travis.yml

@@ -22,7 +22,8 @@ before_script:
 
 script: 
  - phpunit -c phpunit.xml.dist 
- - phpcs --encoding=utf-8 --tab-width=4 --standard=framework/tests/phpcs -np framework
+ - phpcs --encoding=utf-8 --tab-width=4 --standard=framework/tests/phpcs/ruleset.xml -np framework
+ - phpcs --encoding=utf-8 --standard=framework/tests/phpcs/tabs.xml -np framework
 
 branches:
   except:

dev/BulkLoader.php

@@ -408,5 +408,4 @@ class BulkLoader_Result extends Object {
 		
 		return $set;
 	}
-   
 }

javascript/GridField.js

@@ -244,7 +244,6 @@
 				this._super();
 				this.selectable('destroy');
 			}
-			 
 		});
 		
 		/**

javascript/HtmlEditorField.js

@@ -6,15 +6,15 @@
  * ajax / iframe submissions
  */
 
- var ss = ss || {};
+var ss = ss || {};
 /**
  * Wrapper for HTML WYSIWYG libraries, which abstracts library internals
  * from interface concerns like inserting and editing links.
  * Caution: Incomplete and unstable API.
  */
- ss.editorWrappers = {};
- ss.editorWrappers.initial
- ss.editorWrappers.tinyMCE = (function() {
+ss.editorWrappers = {};
+ss.editorWrappers.initial
+ss.editorWrappers.tinyMCE = (function() {
 	return {
 		init: function(config) {
 			if(!ss.editorWrappers.tinyMCE.initialized) {

model/DataObject.php

@@ -1960,7 +1960,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
 	 * or extended onto it by using {@link DataExtension->updateCMSFields()}.
 	 *
 	 * <code>
-	 * klass MyCustomClass extends DataObject {
+	 * class MyCustomClass extends DataObject {
 	 *  static $db = array('CustomProperty'=>'Boolean');
 	 *
 	 *  function getCMSFields() {

parsers/HTML/HTMLBBCodeParser.php

@@ -209,7 +209,6 @@ class SSHTMLBBCodeParser
 	 */
 	public function addFilter($filter)
 	{
-  
 		$filter = ucfirst($filter);
 		if (!array_key_exists($filter, $this->_filters)) {
 			$class = 'SSHTMLBBCodeParser_Filter_'.$filter;

tests/forms/uploadfield/UploadFieldTest.php

@@ -4,7 +4,7 @@
  * @subpackage tests
  */
 
- class UploadFieldTest extends FunctionalTest {
+class UploadFieldTest extends FunctionalTest {
 
 	static $fixture_file = 'UploadFieldTest.yml';
 

tests/model/ComponentSetTest.php

@@ -60,7 +60,6 @@ class ComponentSetTest_Player extends Member implements TestOnly {
 	static $belongs_many_many = array(
 		'Teams' => 'ComponentSetTest_Team'
 	);
-   
 }
 
 class ComponentSetTest_Team extends DataObject implements TestOnly {

tests/model/DataObjectTest.php

@@ -1125,7 +1125,6 @@ class DataObjectTest_Player extends Member implements TestOnly {
 	static $belongs_many_many = array(
 		'Teams' => 'DataObjectTest_Team'
 	);
-   
 }
 
 class DataObjectTest_Team extends DataObject implements TestOnly {

tests/phpcs/tabs.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="SilverStripe.Tabs">
+	<description>CodeSniffer ruleset for SilverStripe indentation conventions.</description>
+	
+	<!-- exclude SCSS-generated CSS files -->
+	<exclude-pattern>*/css/*</exclude-pattern>
+	<exclude-pattern>css/*</exclude-pattern>
+	
+	<!-- exclude thirdparty content -->
+	<exclude-pattern>thirdparty/*</exclude-pattern>
+	<exclude-pattern>*/jquery-changetracker/*</exclude-pattern>
+	<exclude-pattern>parsers/HTML/BBCodeParser/*</exclude-pattern>
+	
+	<!-- PHP-PEG generated file not intended for human consumption -->
+	<exclude-pattern>*/SSTemplateParser.php$</exclude-pattern>
+	<rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
+</ruleset>
+