Skip to content

Commit b0121b5

Browse files
simonwelshsimonwelsh
committed
Add codesniffer that ensures indentation is with tabs.
1 parent ed11970 commit b0121b5

File tree

107 files changed

+3117
-3103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+3117
-3103
lines changed

‎.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ before_script:
2222

2323
script:
2424
- phpunit -c phpunit.xml.dist
25-
- phpcs --encoding=utf-8 --tab-width=4 --standard=framework/tests/phpcs -np framework
25+
- phpcs --encoding=utf-8 --tab-width=4 --standard=framework/tests/phpcs/ruleset.xml -np framework
26+
- phpcs --encoding=utf-8 --standard=framework/tests/phpcs/tabs.xml -np framework
2627

2728
branches:
2829
except:

‎admin/code/CMSProfileController.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ public function getEditForm($id = null, $fields = null) {
2626
$form->Fields()->push(new HiddenField('ID', null, Member::currentUserID()));
2727
$form->Actions()->push(
2828
FormAction::create('save',_t('CMSMain.SAVE', 'Save'))
29-
->addExtraClass('ss-ui-button ss-ui-action-constructive')
30-
->setAttribute('data-icon', 'accept')
31-
->setUseButtonTag(true)
32-
);
33-
$form->Actions()->removeByName('delete');
34-
$form->setValidator(new Member_Validator());
35-
$form->setTemplate('Form');
36-
$form->setAttribute('data-pjax-fragment', null);
37-
if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
29+
->addExtraClass('ss-ui-button ss-ui-action-constructive')
30+
->setAttribute('data-icon', 'accept')
31+
->setUseButtonTag(true)
32+
);
33+
$form->Actions()->removeByName('delete');
34+
$form->setValidator(new Member_Validator());
35+
$form->setTemplate('Form');
36+
$form->setAttribute('data-pjax-fragment', null);
37+
if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
3838
$form->addExtraClass('member-profile-form root-form cms-edit-form cms-panel-padded center');
3939

4040
return $form;

‎admin/code/ModelAdmin.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ public function getManagedModels() {
296296
*
297297
* @return array Map of model class names to importer instances
298298
*/
299-
public function getModelImporters() {
299+
public function getModelImporters() {
300300
$importerClasses = $this->stat('model_importers');
301301

302302
// fallback to all defined models if not explicitly defined

‎admin/javascript/LeftAndMain.Tree.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@
153153
"select_limit" : 1,
154154
'initially_select': [this.find('.current').attr('id')]
155155
},
156-
"crrm": {
157-
'move': {
156+
"crrm": {
157+
'move': {
158158
// Check if a node is allowed to be moved.
159159
// Caution: Runs on every drag over a new node
160160
'check_move': function(data) {

‎admin/javascript/LeftAndMain.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ jQuery.noConflict();
301301
*/
302302
submitForm: function(form, button, callback, ajaxOptions) {
303303
var self = this;
304-
304+
305305
// look for save button
306306
if(!button) button = this.find('.Actions :submit[name=action_save]');
307307
// default to first button if none given - simulates browser behaviour

‎admin/javascript/lib.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@
170170
convertUrlToDataUrl: function( absUrl ) {
171171
var u = path.parseUrl( absUrl );
172172
if ( path.isEmbeddedPage( u ) ) {
173-
// For embedded pages, remove the dialog hash key as in getFilePath(),
174-
// otherwise the Data Url won't match the id of the embedded Page.
173+
// For embedded pages, remove the dialog hash key as in getFilePath(),
174+
// otherwise the Data Url won't match the id of the embedded Page.
175175
return u.hash.split( dialogHashKey )[0].replace( /^#/, "" );
176176
} else if ( path.isSameDomain( u, documentBase ) ) {
177177
return u.hrefNoHash.replace( documentBase.domain, "" );
@@ -232,4 +232,4 @@
232232
};
233233

234234
$.path = path;
235-
}(jQuery));
235+
}(jQuery));

‎api/FormEncodedDataFormatter.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public function supportedMimeTypes() {
3030
}
3131

3232
public function convertStringToArray($strData) {
33-
$postArray = array();
34-
parse_str($strData, $postArray);
35-
return $postArray;
33+
$postArray = array();
34+
parse_str($strData, $postArray);
35+
return $postArray;
3636
//TODO: It would be nice to implement this function in Convert.php
3737
//return Convert::querystr2array($strData);
3838
}

‎api/RSSFeed.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ class RSSFeed extends ViewableData {
106106
* every time the representation does
107107
*/
108108
public function __construct(SS_List $entries, $link, $title,
109-
$description = null, $titleField = "Title",
110-
$descriptionField = "Content", $authorField = null,
111-
$lastModified = null, $etag = null) {
109+
$description = null, $titleField = "Title",
110+
$descriptionField = "Content", $authorField = null,
111+
$lastModified = null, $etag = null) {
112112
$this->entries = $entries;
113113
$this->link = $link;
114114
$this->description = $description;
@@ -269,7 +269,7 @@ class RSSFeed_Entry extends ViewableData {
269269
* Create a new RSSFeed entry.
270270
*/
271271
public function __construct($entry, $titleField, $descriptionField,
272-
$authorField) {
272+
$authorField) {
273273
$this->failover = $entry;
274274
$this->titleField = $titleField;
275275
$this->descriptionField = $descriptionField;

‎api/RestfulService.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function setQueryString($params=NULL){
6565
* @param string $password The proxy auth password
6666
* @param boolean $socks Set true to use socks5 proxy instead of http
6767
*/
68-
public function setProxy($proxy, $port = 80, $user = "", $password = "", $socks = false) {
68+
public function setProxy($proxy, $port = 80, $user = "", $password = "", $socks = false) {
6969
$this->proxy = array(
7070
CURLOPT_PROXY => $proxy,
7171
CURLOPT_PROXYUSERPWD => "{$user}:{$password}",
@@ -337,14 +337,14 @@ protected function getRecurseValues($xml,&$data,$parent=""){
337337
$child_count++;
338338
$k = ($parent == "") ? (string)$key : $parent . "_" . (string)$key;
339339
if($this->getRecurseValues($value,$data,$k) == 0){ // no childern, aka "leaf node"
340-
$conv_value = Convert::raw2xml($value);
340+
$conv_value = Convert::raw2xml($value);
341341
}
342342
//Review the fix for similar node names overriding it's predecessor
343343
if(array_key_exists($k, $data) == true) {
344344
$data[$k] = $data[$k] . ",". $conv_value;
345345
}
346346
else {
347-
$data[$k] = $conv_value;
347+
$data[$k] = $conv_value;
348348
}
349349

350350

‎cli-script.php

+14-14
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@
3737
* fourth => val
3838
*/
3939
if(isset($_SERVER['argv'][2])) {
40-
$args = array_slice($_SERVER['argv'],2);
41-
if(!isset($_GET)) $_GET = array();
42-
if(!isset($_REQUEST)) $_REQUEST = array();
43-
foreach($args as $arg) {
44-
if(strpos($arg,'=') == false) {
45-
$_GET['args'][] = $arg;
46-
} else {
47-
$newItems = array();
48-
parse_str( (substr($arg,0,2) == '--') ? substr($arg,2) : $arg, $newItems );
49-
$_GET = array_merge($_GET, $newItems);
50-
}
51-
}
52-
$_REQUEST = array_merge($_REQUEST, $_GET);
40+
$args = array_slice($_SERVER['argv'],2);
41+
if(!isset($_GET)) $_GET = array();
42+
if(!isset($_REQUEST)) $_REQUEST = array();
43+
foreach($args as $arg) {
44+
if(strpos($arg,'=') == false) {
45+
$_GET['args'][] = $arg;
46+
} else {
47+
$newItems = array();
48+
parse_str( (substr($arg,0,2) == '--') ? substr($arg,2) : $arg, $newItems );
49+
$_GET = array_merge($_GET, $newItems);
50+
}
51+
}
52+
$_REQUEST = array_merge($_REQUEST, $_GET);
5353
}
5454

5555
// Set 'url' GET parameter
@@ -76,7 +76,7 @@
7676
$url = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : null;
7777
if(!$url) {
7878
echo 'Please specify an argument to cli-script.php/sake. For more information, visit'
79-
. ' http://doc.silverstripe.org/framework/en/topics/commandline';
79+
. ' http://doc.silverstripe.org/framework/en/topics/commandline';
8080
die();
8181
}
8282

‎conf/ConfigureFromEnv.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
}
101101

102102
// For schema enabled drivers:
103-
if(defined('SS_DATABASE_SCHEMA'))
104-
$databaseConfig["schema"] = SS_DATABASE_SCHEMA;
103+
if(defined('SS_DATABASE_SCHEMA'))
104+
$databaseConfig["schema"] = SS_DATABASE_SCHEMA;
105105
}
106106

107107
if(defined('SS_SEND_ALL_EMAILS_TO')) {

‎control/ContentNegotiator.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static function set_encoding($encoding) {
4545
* that need to specify the character set make use of this function.
4646
*/
4747
public static function get_encoding() {
48-
return self::$encoding;
48+
return self::$encoding;
4949
}
5050

5151
/**
@@ -96,7 +96,7 @@ public static function process(SS_HTTPResponse $response) {
9696
} else {
9797
// The W3C validator doesn't send an HTTP_ACCEPT header, but it can support xhtml. We put this special
9898
// case in here so that designers don't get worried that their templates are HTML4.
99-
if(isset($_SERVER['HTTP_USER_AGENT']) && substr($_SERVER['HTTP_USER_AGENT'], 0, 14) == 'W3C_Validator/') {
99+
if(isset($_SERVER['HTTP_USER_AGENT']) && substr($_SERVER['HTTP_USER_AGENT'], 0, 14) == 'W3C_Validator/') {
100100
$chosenFormat = "xhtml";
101101

102102
} else {

‎control/Controller.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public function handleRequest(SS_HTTPRequest $request, DataModel $model) {
164164
Debug::message("Request handler $body->class object to $this->class controller;"
165165
. "rendering with template returned by $body->class::getViewer()");
166166
}
167-
$body = $body->getViewer($request->latestParam('Action'))->process($body);
167+
$body = $body->getViewer($request->latestParam('Action'))->process($body);
168168
}
169169

170170
$this->response->setBody($body);
@@ -367,7 +367,7 @@ public function render($params = null) {
367367

368368
return $template->process($obj);
369369
}
370-
370+
371371
/**
372372
* Call this to disable site-wide basic authentication for a specific contoller.
373373
* This must be called before Controller::init(). That is, you must call it in your controller's

‎control/Director.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ public static function absoluteURL($url, $relativeToSiteBase = false) {
348348
$url = dirname($_SERVER['REQUEST_URI'] . 'x') . '/' . $url;
349349
}
350350

351-
if(substr($url,0,4) != "http") {
352-
if($url[0] != "/") $url = Director::baseURL() . $url;
351+
if(substr($url,0,4) != "http") {
352+
if($url[0] != "/") $url = Director::baseURL() . $url;
353353
// Sometimes baseURL() can return a full URL instead of just a path
354354
if(substr($url,0,4) != "http") $url = self::protocolAndHost() . $url;
355355
}
@@ -630,21 +630,21 @@ public static function fileExists($file) {
630630
/**
631631
* Returns the Absolute URL of the site root.
632632
*/
633-
public static function absoluteBaseURL() {
634-
return Director::absoluteURL(Director::baseURL());
635-
}
636-
633+
public static function absoluteBaseURL() {
634+
return Director::absoluteURL(Director::baseURL());
635+
}
636+
637637
/**
638638
* Returns the Absolute URL of the site root, embedding the current basic-auth credentials into the URL.
639639
*/
640-
public static function absoluteBaseURLWithAuth() {
640+
public static function absoluteBaseURLWithAuth() {
641641
$s = "";
642642
$login = "";
643643

644-
if(isset($_SERVER['PHP_AUTH_USER'])) $login = "$_SERVER[PHP_AUTH_USER]:$_SERVER[PHP_AUTH_PW]@";
644+
if(isset($_SERVER['PHP_AUTH_USER'])) $login = "$_SERVER[PHP_AUTH_USER]:$_SERVER[PHP_AUTH_PW]@";
645645

646-
return Director::protocol() . $login . $_SERVER['HTTP_HOST'] . Director::baseURL();
647-
}
646+
return Director::protocol() . $login . $_SERVER['HTTP_HOST'] . Director::baseURL();
647+
}
648648

649649
/**
650650
* Force the site to run on SSL.
@@ -843,7 +843,7 @@ public static function isDev($dontTouchDB = false) {
843843
$result = $_GET['isDev'];
844844
} else {
845845
if($firstTimeCheckingGetVar && DB::connection_attempted()) {
846-
echo "<p style=\"padding: 3px; margin: 3px; background-color: orange;
846+
echo "<p style=\"padding: 3px; margin: 3px; background-color: orange;
847847
color: white; font-weight: bold\">Sorry, you can't use ?isDev=1 until your
848848
Member and Group tables database are available. Perhaps your database
849849
connection is failing?</p>";

‎control/HTTP.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ public static function findByTagAndAttribute($content, $attributes) {
171171
if($regexes) foreach($regexes as $regex) {
172172
if(preg_match_all($regex, $content, $matches)) {
173173
$result = array_merge_recursive($result, (isset($matches[2]) ? $matches[2] : $matches[1]));
174-
}
175-
}
174+
}
175+
}
176176

177177
return count($result) ? $result : null;
178178
}

‎control/HTTPRequest.php

+24-24
Original file line numberDiff line numberDiff line change
@@ -296,21 +296,21 @@ public function removeHeader($header) {
296296
public function getURL($includeGetVars = false) {
297297
$url = ($this->getExtension()) ? $this->url . '.' . $this->getExtension() : $this->url;
298298

299-
if ($includeGetVars) {
300-
// if we don't unset $vars['url'] we end up with /my/url?url=my/url&foo=bar etc
301-
302-
$vars = $this->getVars();
303-
unset($vars['url']);
299+
if ($includeGetVars) {
300+
// if we don't unset $vars['url'] we end up with /my/url?url=my/url&foo=bar etc
301+
302+
$vars = $this->getVars();
303+
unset($vars['url']);
304304

305-
if (count($vars)) {
306-
$url .= '?' . http_build_query($vars);
307-
}
308-
}
309-
else if(strpos($url, "?") !== false) {
310-
$url = substr($url, 0, strpos($url, "?"));
311-
}
305+
if (count($vars)) {
306+
$url .= '?' . http_build_query($vars);
307+
}
308+
}
309+
else if(strpos($url, "?") !== false) {
310+
$url = substr($url, 0, strpos($url, "?"));
311+
}
312312

313-
return $url;
313+
return $url;
314314
}
315315

316316
/**
@@ -501,9 +501,9 @@ public function allParams() {
501501
* @return string
502502
*/
503503
public function shiftAllParams() {
504-
$keys = array_keys($this->allParams);
505-
$values = array_values($this->allParams);
506-
$value = array_shift($values);
504+
$keys = array_keys($this->allParams);
505+
$values = array_values($this->allParams);
506+
$value = array_shift($values);
507507

508508
// push additional unparsed URL parts onto the parameter stack
509509
if(array_key_exists($this->unshiftedButParsedParts, $this->dirParts)) {
@@ -636,10 +636,10 @@ public function allParsed() {
636636
*/
637637
public function getIP() {
638638
if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
639-
//check ip from share internet
639+
//check ip from share internet
640640
return $_SERVER['HTTP_CLIENT_IP'];
641641
} elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
642-
//to check ip is pass from proxy
642+
//to check ip is pass from proxy
643643
return $_SERVER['HTTP_X_FORWARDED_FOR'];
644644
} elseif(isset($_SERVER['REMOTE_ADDR'])) {
645645
return $_SERVER['REMOTE_ADDR'];
@@ -655,12 +655,12 @@ public function getIP() {
655655
* @return array
656656
*/
657657
public function getAcceptMimetypes($includeQuality = false) {
658-
$mimetypes = array();
659-
$mimetypesWithQuality = explode(',',$this->getHeader('Accept'));
660-
foreach($mimetypesWithQuality as $mimetypeWithQuality) {
661-
$mimetypes[] = ($includeQuality) ? $mimetypeWithQuality : preg_replace('/;.*/', '', $mimetypeWithQuality);
662-
}
663-
return $mimetypes;
658+
$mimetypes = array();
659+
$mimetypesWithQuality = explode(',',$this->getHeader('Accept'));
660+
foreach($mimetypesWithQuality as $mimetypeWithQuality) {
661+
$mimetypes[] = ($includeQuality) ? $mimetypeWithQuality : preg_replace('/;.*/', '', $mimetypeWithQuality);
662+
}
663+
return $mimetypes;
664664
}
665665

666666
/**

0 commit comments

Comments
 (0)