Psalm and PHPUnit Issue Fixes

Signed-off-by: Raj Mohan <[email protected]>

Author: cod43156

src/Cache.php

@@ -26,6 +26,7 @@
 
 /**
  * \Laminas\Server\Cache: cache server definitions
+ *
  * @psalm-suppress DeprecatedInterface
  */
 class Cache
@@ -41,13 +42,10 @@ class Cache
      *
      * Returns false on any error (typically, inability to write to file), true
      * on success.
-     *
-     * @param  string $filename
-     * @return bool
      */
     public static function save(string $filename, Server $server): bool
     {
-        if ((! file_exists($filename) && ! is_writable(dirname($filename)))) {
+        if (! file_exists($filename) && ! is_writable(dirname($filename))) {
             return false;
         }
 
@@ -155,7 +153,7 @@ private static function createDefinitionFromMethodsDefinition(Definition $method
         $definition = new Definition();
         /** @psalm-suppress MixedAssignment */
         foreach ($methods as $method) {
-            /** @psalm-suppress MixedMethodCall */
+            /** @psalm-suppress MixedMethodCall, InvalidMethodCall */
             if (in_array($method->getName(), static::$skipMethods, true)) {
                 continue;
             }

src/Definition.php

@@ -23,6 +23,7 @@
 
 /**
  * Server methods metadata
+ *
  * @psalm-suppress MissingTemplateParam
  */
 class Definition implements Countable, Iterator
@@ -134,7 +135,6 @@ public function hasMethod($method)
      * Get a given method definition
      *
      * @param  string $method
-     * @return mixed
      */
     public function getMethod($method): mixed
     {
@@ -209,7 +209,8 @@ public function count()
     /**
      * Iterator: current item
      *
-     * @return
+     * @psalm-suppress MixedInferredReturnType
+     * @return array
      */
     #[ReturnTypeWillChange]
     public function current()

src/Reflection/AbstractFunction.php

@@ -322,7 +322,7 @@ protected function reflect()
             foreach ($paramTags as $paramTag) {
                 $paramTypesTmp[] = $paramTag->getTypes();
                 /** @psalm-suppress RiskyTruthyFalsyComparison*/
-                $paramDesc[]     = $paramTag->getDescription() ? : '';
+                $paramDesc[] = $paramTag->getDescription() ? : '';
             }
         }
 

src/Reflection/Node.php

@@ -101,8 +101,6 @@ public function attachChild(Node $node)
 
     /**
      * Return an array of all child nodes
-     *
-     * @return array
      */
     public function getChildren(): array
     {
@@ -156,8 +154,6 @@ public function setValue($value)
      * Retrieves the bottommost nodes of the tree by recursively calling
      * getEndPoints() on all children. If a child is null, it returns the parent
      * as an end point.
-     *
-     * @return array
      */
     public function getEndPoints(): array
     {

src/Reflection/ReflectionMethod.php

@@ -98,7 +98,7 @@ public function __wakeup()
             $this->getInvokeArguments()
         );
         /** @psalm-suppress MixedArgument */
-        $this->reflection      = new \ReflectionMethod($this->classReflection->getName(), $this->name);
+        $this->reflection = new \ReflectionMethod($this->classReflection->getName(), $this->name);
     }
 
     /**

src/Reflection/ReflectionParameter.php

@@ -66,7 +66,7 @@ public function __construct(\ReflectionParameter $r, $type = 'mixed', $descripti
         $this->reflection = $r;
 
         // Store parameters needed for (un)serialization
-        $this->name         = $r->getName();
+        $this->name = $r->getName();
         /** @psalm-suppress PossiblyInvalidPropertyAssignmentValue */
         $this->functionName = $r->getDeclaringClass()
             ? [$r->getDeclaringClass()->getName(), $r->getDeclaringFunction()->getName()]