Skip to content

Generic ScopeIndentSniff throws PHP notices in JS files #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Generic ScopeIndentSniff throws PHP notices in JS files #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
862e6ff
Test case for PHP notices in scope indent sniff
klausi Apr 24, 2015
b1a153b
Fixed JS object scope indentation check
klausi Apr 24, 2015
8d0a490
Minor coding standards fix
klausi Apr 24, 2015
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,15 +414,23 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
array_pop($openScopes);
}

$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $tokens[$scopeCloser]['scope_condition'], true);
// JS object scopes don't have a scope_condition property, so we need
// to look at bracket_opener instead.
if (isset($tokens[$scopeCloser]['scope_condition']) === true) {
$firstLine = $tokens[$scopeCloser]['scope_condition'];
} else if (isset($tokens[$scopeCloser]['bracket_opener']) === true) {
$firstLine = $tokens[$scopeCloser]['bracket_opener'];
}

$first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $firstLine, true);

$currentIndent = ($tokens[$first]['column'] - 1);
if (isset($adjustments[$first]) === true) {
$currentIndent += $adjustments[$first];
}

// Make sure it is divisible by our expected indent.
if ($tokens[$tokens[$scopeCloser]['scope_condition']]['code'] !== T_CLOSURE) {
if ($tokens[$firstLine]['code'] !== T_CLOSURE) {
$currentIndent = (int) (ceil($currentIndent / $this->indent) * $this->indent);
}

Expand Down
27 changes: 27 additions & 0 deletions CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.4.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
jQuery(document).ready(function () {

if(jQuery('.imgGallery').length > 0 || jQuery('.featuresBox').length > 0) {var controller = jQuery.superscrollorama();}

var a2 = jQuery('.imgGallery .rowImages a');
for (var i = 0; i < a2.length; i++) {
controller.addTween(jQuery(a2[i]),TweenMax.fromTo(
jQuery(a2[i]),.5,
{css:{'opacity':'0','-webkit-transform':'scale(0)','-moz-transform':'scale(0)',
'-ms-transform':'scale(0)','-o-transform':'scale(0)','transform':'scale(0)'},
immediateRender:true,ease:Quad.easeInOut},{css:{'opacity':'1','-webkit-transform':'scale(1)',
'-moz-transform':'scale(1)','-ms-transform':'scale(1)','-o-transform':'scale(1)','transform':'scale(1)'},
ease:Quad.easeInOut}));
}

var a3 = jQuery('.featuresBox ul li');
for (var i = 0; i < a3.length; i++) {
controller.addTween(jQuery(a3[i]),TweenMax.fromTo(
jQuery(a3[i]),.7,
{css:{'opacity':'0','-webkit-transform':'scale(0)','-moz-transform':'scale(0)',
'-ms-transform':'scale(0)','-o-transform':'scale(0)','transform':'scale(0)'},
immediateRender:true,ease:Quad.easeInOut},{css:{'opacity':'1','-webkit-transform':'scale(1)',
'-moz-transform':'scale(1)','-ms-transform':'scale(1)','-o-transform':'scale(1)','transform':'scale(1)'},
ease:Quad.easeInOut}));
}

});
16 changes: 16 additions & 0 deletions CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,22 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
);
}

if ($testFile === 'ScopeIndentUnitTest.4.js') {
return array(
7 => 1,
10 => 1,
11 => 1,
12 => 1,
13 => 1,
18 => 1,
21 => 1,
22 => 1,
23 => 1,
24 => 1,
27 => 1,
);
}

return array(
7 => 1,
10 => 1,
Expand Down