Merge branch 'master' into 4.x

Author: jrfnl

autoload.php

@@ -188,8 +188,8 @@ public static function loadFile(string $path)
         /**
          * Determine which class was loaded based on the before and after lists of loaded classes.
          *
-         * @param array $classesBeforeLoad The classes/interfaces/traits before the file was included.
-         * @param array $classesAfterLoad  The classes/interfaces/traits after the file was included.
+         * @param array<string, array<string>> $classesBeforeLoad The classes/interfaces/traits before the file was included.
+         * @param array<string, array<string>> $classesAfterLoad  The classes/interfaces/traits after the file was included.
          *
          * @return string The fully qualified name of the class in the loaded file.
          */
@@ -262,7 +262,7 @@ public static function addSearchPath(string $path, string $nsPrefix = '')
         /**
          * Retrieve the namespaces and paths registered by external standards.
          *
-         * @return array
+         * @return array<string>
          */
         public static function getSearchPaths()
         {

src/Files/File.php

@@ -1199,7 +1199,8 @@ public function getFixedWarningCount()
     /**
      * Retrieve information about the first run.
      *
-     * @param $type string
+     * @param string $type The type for which to get the "first run" count.
+     *                     Valid values are: 'error', 'warning', 'fixableError' and 'fixableWarning'.
      *
      * @internal This method does not form part of any public API nor backwards compatibility guarantee.
      *

src/Files/LocalFile.php

@@ -158,8 +158,8 @@ public function process()
      * and then errors and warnings to be reapplied with the new rules. This is
      * particularly useful while caching.
      *
-     * @param array $errors   The list of errors to replay.
-     * @param array $warnings The list of warnings to replay.
+     * @param array<int, array<int, array<string, mixed>>> $errors   The list of errors to replay.
+     * @param array<int, array<int, array<string, mixed>>> $warnings The list of warnings to replay.
      *
      * @return void
      */

src/Fixer.php

@@ -83,7 +83,7 @@ class Fixer
      * All changes in changeset must be able to be applied, or else
      * the entire changeset is rejected.
      *
-     * @var array
+     * @var array<int, string>
      */
     private $changeset = [];
 

src/Reporter.php

@@ -91,7 +91,7 @@ class Reporter
     /**
      * A cache of opened temporary files.
      *
-     * @var array
+     * @var array<string, string>
      */
     private $tmpFiles = [];
 
@@ -225,7 +225,7 @@ public function __get(string $name)
      * @param string $name  Property name.
      * @param mixed  $value Property value.
      *
-     * @return bool
+     * @return void
      *
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
      */
@@ -240,7 +240,7 @@ public function __set(string $name, $value)
      *
      * @param string $name Property name.
      *
-     * @return bool
+     * @return void
      *
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
      */

src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php

@@ -19,7 +19,7 @@ class DuplicateClassNameSniff implements Sniff
     /**
      * List of classes that have been found during checking.
      *
-     * @var array
+     * @var array<string, array<string, string|int>>
      */
     protected $foundClasses = [];
 

src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php

@@ -25,14 +25,14 @@ class AssignmentInConditionSniff implements Sniff
      *
      * Set in the register() method.
      *
-     * @var array
+     * @var array<int|string, int|string>
      */
     protected $assignmentTokens = [];
 
     /**
      * The tokens that indicate the start of a condition.
      *
-     * @var array
+     * @var array<int|string, int|string>
      */
     protected $conditionStartTokens = [];
 

src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php

@@ -107,7 +107,7 @@ public function testStdIn($content, $errorCount, $expectedErrors)
     /**
      * Data provider for testStdIn().
      *
-     * @return array[]
+     * @return array<string, array<string|int|array>>
      */
     public static function dataStdIn()
     {

src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php

@@ -28,7 +28,7 @@ class FunctionCommentSniff implements Sniff
     /**
      * Array of methods which do not require a return type.
      *
-     * @var array
+     * @var array<string>
      */
     public $specialMethods = [
         '__construct',

src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php

@@ -35,7 +35,7 @@ public function register()
      * @param int                         $stackPtr  The position of the current
      *                                               token in the stack.
      *
-     * @return int|void
+     * @return int
      */
     public function process(File $phpcsFile, int $stackPtr)
     {