Tokens - little DRY, use Token::equalsAny
BracesFixer - fix #540
improve OrderUseStatementsFixer parsing logic

- Sort only the actual namespaces and not complete lines
- Use correct sorting when using multiple namespace blocks
- Detect traits correctly
- Preserve original white space
bug #518 improve OrderUseStatementsFixer parsing logic (sstok)

This PR was merged into the 1.0.x-dev branch.

Discussion
----------

improve OrderUseStatementsFixer parsing logic

|Q            |A   |
|---          |--- |
|Bug Fix?     |yes |
|New Feature? |n   |
|BC Breaks?   |n   |
|Deprecations?|n   |
|Tests Pass?  |yes |
|Fixed Tickets|#499|
|License      |MIT |

- Sort only the actual namespaces and not complete lines
- Detect traits correctly
- Preserve original white space

Todo:

- [x] Resolve Tokens cache bug
- [x] Add some tests with multiple namespaces
- [x] Fix comments being moved to the wrong position

Commits
-------

8a5b724 improve OrderUseStatementsFixer parsing logic
safer curly braces checking
minor #538 safer curly braces checking (keradus)

This PR was squashed before being merged into the 1.0.x-dev branch (closes #538).

Discussion
----------

safer curly braces checking

- Safer check if token is { or }
- little speed impr. in `Tokens::getNamespaceUseIndexes`

Commits
-------

062b933 safer curly braces checking
minor #539 Tokens - little DRY, use Token::equalsAny (keradus)

This PR was merged into the 1.0.x-dev branch.

Discussion
----------

Tokens - little DRY, use Token::equalsAny

Commits
-------

71216d7 Tokens - little DRY, use Token::equalsAny
bug #541 BracesFixer - fix #540 (keradus)

This PR was merged into the 1.0.x-dev branch.

Discussion
----------

BracesFixer - fix #540

Commits
-------

b433d62 BracesFixer - fix #540
Merge branch 'master' of git://github.com/fabpot/PHP-CS-Fixer