Fix some psalm issues by annotating static props

Signed-off-by: George Steel <[email protected]>
laminas · Jul 24, 2022 · 7371256 · 7371256
1 parent fbe1509
commit 7371256
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 25 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -9,36 +9,17 @@
     </MixedAssignment>
   </file>
   <file src="src/AbstractWord.php">
-    <MissingPropertyType occurrences="4">
-      <code>$C</code>
-      <code>$CN</code>
-      <code>$V</code>
-      <code>$VN</code>
-    </MissingPropertyType>
-    <MixedArgument occurrences="3">
-      <code>$consonants</code>
+    <MixedArgument occurrences="1">
       <code>$value['input']</code>
-      <code>$vowels</code>
     </MixedArgument>
-    <MixedArrayAccess occurrences="2">
-      <code>$consonants[Rand::getInteger(0, $totIndexCon, true)]</code>
-      <code>$vowels[Rand::getInteger(0, $totIndexVow, true)]</code>
-    </MixedArrayAccess>
-    <MixedAssignment occurrences="7">
-      <code>$consonant</code>
-      <code>$consonants</code>
+    <MixedAssignment occurrences="3">
       <code>$this-&gt;id</code>
       <code>$this-&gt;word</code>
       <code>$value</code>
-      <code>$vowel</code>
-      <code>$vowels</code>
     </MixedAssignment>
     <MixedInferredReturnType occurrences="1">
       <code>string</code>
     </MixedInferredReturnType>
-    <MixedOperand occurrences="1">
-      <code>$consonant</code>
-    </MixedOperand>
     <MixedReturnStatement occurrences="1">
       <code>$this-&gt;word</code>
     </MixedReturnStatement>
@@ -48,10 +29,6 @@
     <RedundantCastGivenDocblockType occurrences="1">
       <code>(int) $ttl</code>
     </RedundantCastGivenDocblockType>
-    <TooManyArguments occurrences="2">
-      <code>Rand::getInteger(0, $totIndexCon, true)</code>
-      <code>Rand::getInteger(0, $totIndexVow, true)</code>
-    </TooManyArguments>
     <UnsafeInstantiation occurrences="1">
       <code>new $this-&gt;sessionClass('Laminas_Form_Captcha_' . $id)</code>
     </UnsafeInstantiation>

diff --git a/src/AbstractWord.php b/src/AbstractWord.php
@@ -27,9 +27,13 @@ abstract class AbstractWord extends AbstractAdapter
     /**#@+
      * @var array Character sets
      */
+    /** @var list<string> */
     public static $V  = ["a", "e", "i", "o", "u", "y"];
+    /** @var list<string> */
     public static $VN = ["a", "e", "i", "o", "u", "y", "2", "3", "4", "5", "6", "7", "8", "9"];
+    /** @var list<string> */
     public static $C  = ["b", "c", "d", "f", "g", "h", "j", "k", "m", "n", "p", "q", "r", "s", "t", "u", "v", "w", "x", "z"];
+    /** @var list<string> */
     public static $CN = ["b", "c", "d", "f", "g", "h", "j", "k", "m", "n", "p", "q", "r", "s", "t", "u", "v", "w", "x", "z", "2", "3", "4", "5", "6", "7", "8", "9"];
     /**#@-*/
     // @codingStandardsIgnoreEnd