Merge branch '2.12' into 2.14

Author: keradus

src/Fixer/LanguageConstruct/NoUnsetOnPropertyFixer.php

@@ -89,7 +89,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
      * @param Tokens $tokens
      * @param int    $index
      *
-     * @return string[]
+     * @return array<array<string, bool|int>>
      */
     private function getUnsetsInfo(Tokens $tokens, $index)
     {
@@ -152,7 +152,7 @@ private function isProperty(Tokens $tokens, $index, $endIndex)
     }
 
     /**
-     * @param string[] $unsetsInfo
+     * @param array<array<string, bool|int>> $unsetsInfo
      *
      * @return bool
      */
@@ -168,9 +168,9 @@ private function isAnyUnsetToTransform(array $unsetsInfo)
     }
 
     /**
-     * @param Tokens   $tokens
-     * @param string[] $unsetInfo
-     * @param bool     $isLastUnset
+     * @param Tokens                  $tokens
+     * @param array<string, bool|int> $unsetInfo
+     * @param bool                    $isLastUnset
      */
     private function updateTokens(Tokens $tokens, array $unsetInfo, $isLastUnset)
     {

src/Tokenizer/TokensAnalyzer.php

@@ -64,7 +64,7 @@ public function getClassyElements()
      *
      * @param bool $perNamespace Return namespace uses per namespace
      *
-     * @return array|array[]
+     * @return int[]|int[][]
      */
     public function getImportUseIndexes($perNamespace = false)
     {