Baselined psalm errors

laminas · Oct 31, 2023 · 1272818 · 1272818
1 parent 530efa7
commit 1272818
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -46,7 +46,7 @@
     <InvalidPropertyAssignmentValue occurrences="1">
       <code>$this-&gt;charList</code>
     </InvalidPropertyAssignmentValue>
-    <MixedArgument occurrences="16">
+    <MixedArgument occurrences="18">
       <code>$firstPart[$i]</code>
       <code>$lastPart[$i]</code>
       <code>$leftChar</code>
@@ -63,6 +63,7 @@
       <code>$this-&gt;outputLine[$row]</code>
       <code>$this-&gt;outputLine[$row][$k]</code>
       <code>$this-&gt;outputLine[0]</code>
+      <code>$rightChar</code>
     </MixedArgument>
     <MixedArgumentTypeCoercion occurrences="3">
       <code>$char</code>
@@ -190,6 +191,9 @@
       <code>$amount</code>
       <code>$amount</code>
     </UnusedVariable>
+  <RedundantConditionGivenDocblockType occurrences="2">
+    <code>$this->_smushem($leftChar, $rightChar)</code>
+  </RedundantConditionGivenDocblockType>
   </file>
   <file src="src/Table/Column.php">
     <DocblockTypeContradiction occurrences="3">
@@ -241,8 +245,9 @@
     </InvalidFalsableReturnType>
   </file>
   <file src="src/Table/DecoratorManager.php">
-    <NonInvariantDocblockPropertyType occurrences="1">
+    <NonInvariantDocblockPropertyType occurrences="2">
       <code>$aliases</code>
+      <code>$factories</code>
     </NonInvariantDocblockPropertyType>
   </file>
   <file src="src/Table/Row.php">
@@ -367,6 +372,9 @@
       <code>(int) $autoSeparate</code>
       <code>(int) $padding</code>
     </RedundantCastGivenDocblockType>
+    <MethodSignatureMustProvideReturnType occurence="1">
+      <code>__toString</code>
+    </MethodSignatureMustProvideReturnType>
   </file>
   <file src="test/FigletTest.php">
     <InvalidArgument occurrences="1">
@@ -416,7 +424,7 @@
     </UnusedVariable>
   </file>
   <file src="test/MultiByteTest.php">
-    <DeprecatedMethod occurrences="2">
+    <DeprecatedMethod occurrences="4">
       <code>Text\MultiByte::strPad('äääöö', 2, 'ö')</code>
       <code>Text\MultiByte::wordWrap('äbüöcß', 2, ' ', true)</code>
     </DeprecatedMethod>

diff --git a/src/Figlet/Figlet.php b/src/Figlet/Figlet.php
@@ -832,10 +832,6 @@ protected function _smushAmount()
             if (empty($leftChar) || $leftChar === ' ') {
                 $amount++;
             } elseif (! empty($rightChar)) {
-                /**
-                 * @psalm-suppress RedundantConditionGivenDocblockType
-                 * @psalm-suppress MixedArgument
-                 */
                 if ($this->_smushem($leftChar, $rightChar) !== null) {
                     $amount++;
                 }

diff --git a/src/Table/DecoratorManager.php b/src/Table/DecoratorManager.php
@@ -46,10 +46,7 @@ class DecoratorManager extends AbstractPluginManager
         'zendtexttabledecoratorunicode' => Decorator\Unicode::class,
     ];
 
-    /**
-     * @var FactoriesConfigurationType
-     * @psalm-suppress NonInvariantDocblockPropertyType
-     */
+    /** @var FactoriesConfigurationType */
     protected $factories = [
         Decorator\Ascii::class             => InvokableFactory::class,
         Decorator\Unicode::class           => InvokableFactory::class,

diff --git a/src/Table/Table.php b/src/Table/Table.php
@@ -499,7 +499,6 @@ public function render()
     /**
      * Magic method which returns the rendered table
      *
-     * @psalm-suppress MethodSignatureMustProvideReturnType
      * @return string
      */
     public function __toString()

diff --git a/test/MultiByteTest.php b/test/MultiByteTest.php
@@ -9,7 +9,6 @@
 
 /**
  * @group      Laminas_Text
- * @psalm-suppress DeprecatedMethod
  */
 class MultiByteTest extends TestCase
 {