Merge branch 'master' into 4.x

Author: jrfnl

src/Ruleset.php

@@ -336,7 +336,7 @@ public function explain()
         }//end foreach
 
         if (count($this->deprecatedSniffs) > 0) {
-            echo PHP_EOL.'* Sniffs marked with an asterix are deprecated.'.PHP_EOL;
+            echo PHP_EOL.'* Sniffs marked with an asterisk are deprecated.'.PHP_EOL;
         }
 
     }//end explain()

src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php

@@ -104,7 +104,7 @@ public function process(File $phpcsFile, $stackPtr)
                     return;
                 }
 
-                // If it is not an array check what is inside.
+                // If it is not an array, check what is inside.
                 $found = $phpcsFile->findPrevious(
                     T_VARIABLE,
                     ($previousIndex - 1),

tests/Core/Files/File/FindStartOfStatementTest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for the \PHP_CodeSniffer\Files\File:findStartOfStatement method.
+ * Tests for the \PHP_CodeSniffer\Files\File::findStartOfStatement method.
  *
  * @author    Greg Sherwood <[email protected]>
  * @author    Juliette Reinders Folmer <[email protected]>
@@ -15,7 +15,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 
 /**
- * Tests for the \PHP_CodeSniffer\Files\File:findStartOfStatement method.
+ * Tests for the \PHP_CodeSniffer\Files\File::findStartOfStatement method.
  *
  * @covers \PHP_CodeSniffer\Files\File::findStartOfStatement
  */

tests/Core/Files/File/GetMethodParametersParseError3Test.php

@@ -20,7 +20,7 @@ final class GetMethodParametersParseError3Test extends AbstractMethodTestCase
 
 
     /**
-     * Test receiving an empty array when encountering a specific parse error.
+     * Test receiving an exception when encountering a specific parse error.
      *
      * @return void
      */

tests/Core/Ruleset/ExplainTest.php

@@ -201,7 +201,7 @@ public function testExplainWithDeprecatedSniffs()
         $expected .= '  TestStandard.SetProperty.PropertyTypeHandlingOldArrayFormat'.PHP_EOL;
         $expected .= '  TestStandard.ValidSniffs.RegisterEmptyArray'.PHP_EOL.PHP_EOL;
 
-        $expected .= '* Sniffs marked with an asterix are deprecated.'.PHP_EOL;
+        $expected .= '* Sniffs marked with an asterisk are deprecated.'.PHP_EOL;
 
         $this->expectOutputString($expected);
 

tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.inc

@@ -58,7 +58,7 @@ switch (true) {
     case CONSTANT:
     /* testCaseWithConstantAndIdenticalIsNotEnumCase */
     case CONSTANT === 1:
-    /* testCaseWithAssigmentToConstantIsNotEnumCase */
+    /* testCaseWithAssignmentToConstantIsNotEnumCase */
     case CONSTANT = 1:
     /* testIsNotEnumCaseIsCaseInsensitive */
     cAsE CONSTANT:

tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php

@@ -163,7 +163,7 @@ public static function dataNotEnumCases()
                 'testCloserMarker' => '/* testCaseConstantCloserMarker */',
             ],
             'switch case with constant, assignment'                             => [
-                'testMarker'       => '/* testCaseWithAssigmentToConstantIsNotEnumCase */',
+                'testMarker'       => '/* testCaseWithAssignmentToConstantIsNotEnumCase */',
                 'expectedTokens'   => [
                     'scope_opener' => T_COLON,
                     'scope_closer' => T_CLOSE_CURLY_BRACKET,