mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Add codesniffer that ensures indentation is with tabs.
This commit is contained in:
parent
379b561cdb
commit
d795b191ec
@ -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:
|
||||
|
@ -408,5 +408,4 @@ class BulkLoader_Result extends Object {
|
||||
|
||||
return $set;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -244,7 +244,6 @@
|
||||
this._super();
|
||||
this.selectable('destroy');
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
/**
|
||||
|
@ -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() {
|
||||
|
@ -209,7 +209,6 @@ class SSHTMLBBCodeParser
|
||||
*/
|
||||
public function addFilter($filter)
|
||||
{
|
||||
|
||||
$filter = ucfirst($filter);
|
||||
if (!array_key_exists($filter, $this->_filters)) {
|
||||
$class = 'SSHTMLBBCodeParser_Filter_'.$filter;
|
||||
|
@ -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 {
|
||||
|
@ -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 {
|
||||
|
18
tests/phpcs/tabs.xml
Normal file
18
tests/phpcs/tabs.xml
Normal file
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user