Merge branch '2.2' into 2.7

.gitattributes

@@ -1,9 +1,10 @@
 # @TODO 3.0 replace following `tests/... exportignore` with single `tests/ export-ignore`
 tests/**/*Test.php export-ignore
+tests/AbstractDoctrineAnnotationFixerTestCase.php export-ignore
+tests/Differ/AbstractDifferTestCase.php export-ignore
 tests/Fixtures/ export-ignore
 tests/Linter/AbstractLinterTestCase.php export-ignore
-tests/Differ/AbstractDifferTestCase.php export-ignore
-tests/AbstractDoctrineAnnotationFixerTestCase.php export-ignore
+tests/Report/AbstractReporterTestCase.php export-ignore
 tests/Test/AbstractTransformerTestCase.php export-ignore
 
 .appveyor.yml export-ignore

circle.yml

@@ -11,6 +11,7 @@ dependencies:
         - ~/.composer
         - ~/Library/Caches/Homebrew
     pre:
+        - brew update
         - brew tap homebrew/homebrew-php
         - brew install php71
         - curl -sS https://getcomposer.org/installer | php

src/Tokenizer/Analyzer/ArgumentsAnalyzer.php

@@ -39,7 +39,7 @@ final class ArgumentsAnalyzer
     /**
      * Returns start and end token indexes of arguments.
      *
-     * Return an array which each index being the first token af an
+     * Returns an array with each key being the first token of an
      * argument and the value the last. Including non-function tokens
      * such as comments and white space tokens, but without the separation
      * tokens like '(', ',' and ')'.

src/Tokenizer/Token.php

@@ -454,9 +454,9 @@ class Token
     }
 
     /**
-     * Check if token is a whitespace.
+     * Check if token is whitespace.
      *
-     * @param null|string $whitespaces whitespaces characters, default is " \t\n\r\0\x0B"
+     * @param null|string $whitespaces whitespace characters, default is " \t\n\r\0\x0B"
      *
      * @return bool
      */