Permalink
Browse files

Merge github.com:asnyder/PHP_CodeSniffer

  • Loading branch information...
2 parents 0e058d9 + 69de8fa commit 7c10e3697b4af33dc7b9e6fbc9415700352655e4 @asnyder asnyder committed Feb 10, 2013
@@ -223,7 +223,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
}
if ($tokens[$start]['code'] === T_OPEN_CURLY_BRACKET) {
- $start = $tokens[$start]['scope_closer'];
+ $start = $tokens[$start]['bracket_closer'];
continue;
}
@@ -209,6 +209,11 @@ switch ($foo) {
return $bar;
}
+function foo()
+{
+ return $bar->{$action . 'JsonAction'}();
+}
+
exit();
@@ -81,11 +81,11 @@ public function getWarningList()
152 => 1,
165 => 1,
179 => 1,
- 216 => 1,
- 217 => 1,
- 218 => 1,
- 219 => 2,
+ 221 => 1,
+ 222 => 1,
223 => 1,
+ 224 => 2,
+ 228 => 1,
);
}//end getWarningList()
View
@@ -14,8 +14,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
<email>gsherwood@squiz.net</email>
<active>yes</active>
</lead>
- <date>2012-12-04</date>
- <time>14:12:00</time>
+ <date>2013-02-07</date>
+ <time>10:10:00</time>
<version>
<release>1.4.4</release>
<api>1.4.4</api>
@@ -2098,6 +2098,69 @@ http://pear.php.net/dtd/package-2.0.xsd">
<changelog>
<release>
<version>
+ <release>1.5.0RC1</release>
+ <api>1.5.0RC1</api>
+ </version>
+ <stability>
+ <release>beta</release>
+ <api>beta</api>
+ </stability>
+ <date>2013-02-08</date>
+ <license uri="http://matrix.squiz.net/developer/tools/php_cs/licence">BSD License</license>
+ <notes>
+ - Reports have been completely rewritten to consume far less memory
+ -- Each report is incrementally written to the file system during a run and then printed out when the run ends
+ -- There is no longer a need to keep the list of errors and warnings in memory during a run
+ - Multi-file sniff support has been removed because they are too memory intensive
+ -- If you have a custom multi-file sniff, you can convert it into a standard sniff quite easily
+ -- See CodeSniffer/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php for an example
+ </notes>
+ </release>
+ <release>
+ <version>
+ <release>1.4.4</release>
+ <api>1.4.4</api>
+ </version>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <date>2013-02-07</date>
+ <license uri="http://matrix.squiz.net/developer/tools/php_cs/licence">BSD License</license>
+ <notes>
+ - Ignored lines no longer cause the summary report to show incorrect error and warning counts
+ -- Thanks to Bert Van Hauwaert for the patch
+ - Added Generic CSSLintSniff to run CSSLint over a CSS file and report warnings
+ -- Set full command to run CSSLint using phpcs --config-set csslint_path /path/to/csslint
+ -- Thanks to Roman Levishchenko for the contribution
+ - Added PSR2 ControlStructureSpacingSniff to ensure there are no spaces before and after parenthesis in control structures
+ -- Fixes bug #19732 : PSR2: some control structures errors not reported
+ - Squiz commenting sniffs now support non-English characters when checking for capital letters
+ -- Thanks to Roman Levishchenko for the patch
+ - Generic EndFileNewlineSniff now supports JS and CSS files
+ -- Thanks to Denis Ryabkov for the patch
+ - PSR1 SideEffectsSniff no longer reports constant declarations as side effects
+ - Notifysend report now supports notify-send versions before 0.7.3
+ -- Thanks to Ken Guest for the patch
+ - PEAR and Squiz FunctionCommentSniffs no longer report errors for misaligned argument comments when they are blank
+ -- Thanks to Thomas Peterson for the patch
+ - Squiz FunctionDeclarationArgumentSpacingSniff now works correctly for equalsSpacing values greater than 0
+ -- Thanks to Klaus Purer for the patch
+ - Squiz SuperfluousWhitespaceSniff no longer throws errors for CSS files with no newline at the end
+ - Squiz SuperfluousWhitespaceSniff now allows a single newline at the end of JS and CSS files
+ - Fixed bug #19755 : Token of T_CLASS type has no scope_opener and scope_closer keys
+ - Fixed bug #19759 : Squiz.PHP.NonExecutableCode fails for return function()...
+ - Fixed bug #19763 : Use statements for traits not recognised correctly for PSR2 code style
+ - Fixed bug #19764 : Instead of for traits throws uppercase constant name errors
+ - Fixed bug #19772 : PSR2_Sniffs_Namespaces_UseDeclarationSniff does not properly recognize last use
+ - Fixed bug #19775 : False positive in NonExecutableCode sniff when not using curly braces
+ - Fixed bug #19782 : Invalid found size functions in loop when using object operator
+ - Fixed bug #19799 : config folder is not created automatically
+ - Fixed bug #19804 : JS Tokenizer wrong /**/ parsing
+ </notes>
+ </release>
+ <release>
+ <version>
<release>1.4.3</release>
<api>1.4.3</api>
</version>

0 comments on commit 7c10e36

Please sign in to comment.