Pull master from squizlabs #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… a new option to turn colors off
…nstead of always using padding to fill the space
…stead of always using padding to fill the space
… processing a parse error
…ters around operators (request #348)
…es a lot of strpos calls
… chars while parsing
…e to ScopeIndent checking)
…NotAligned when key contains space
…art or end of a statement
…ws for colour codes
… within foreach
This fixes a bug in the `Squiz.Functions.FunctionDeclarationSpacing` sniff when the `requiredSpacesAfterOpen` option was set to anything other than 0. When the first argument in a multiline function declaration had a type-hint, this error would be given: > Expected 1 spaces between opening bracket and type hint "array"; 0 found I don’t think this check was ever intended to affect multiline functions. The logic was such that it never does when `requiredSpacesAfterOpen` is 0, and because this is the default, the bug was never noticed.
…ot in camel caps format
HHVM 3.5-3.6 tokenize "#!/usr/bin/php" as a non-standard T_HASHBANG instead of PHP5's T_INLINE_HTML, so convert it to the expected T_INLINE_HTML.
findNext() might return false, so we have to check for that. Otherwise we overwrite our loop variable and get stuck. Detected while playing around with the horde source tree.
…some parse errors
Fix misspellings of 'comment'
…ultiple use statements
- see documentation at: http://php.net/declare
…od prefixes like public and abstract
…uctures.SwitchDeclaration sniff
…port when showing error codes
…on a line by itself
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.