vimeo / psalm

src/psalter.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 require_once('command_functions.php');
 
-use Psalm\DocComment;
 use Psalm\Internal\Analyzer\ProjectAnalyzer;
 use Psalm\Config;
 use Psalm\IssueBuffer;

src/Psalm/Internal/TypeVisitor/TypeChecker.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace Psalm\Internal\TypeVisitor;
 
 use Psalm\CodeLocation;
-use Psalm\Internal\Analyzer\Statements\ExpressionAnalyzer;
 use Psalm\Internal\Analyzer\ClassLikeAnalyzer;
 use Psalm\Internal\Analyzer\TypeAnalyzer;
 use Psalm\Internal\Type\TypeExpander;

src/Psalm/Internal/Analyzer/Statements/Block/TryAnalyzer.php

Doc Comments +2 added lines, -2 removed lines

@@ -290,9 +290,9 @@
                 $catch_context->vars_in_scope[$catch_var_id] = new Union(
                     array_map(
                         /**
-                         * @param string $fq_catch_class
+                         * @param StatementsAnalyzer $fq_catch_class
                          *
-                         * @return Type\Atomic
+                         * @return false|null
                          */
                         function ($fq_catch_class) use ($codebase) {
                             $catch_class_type = new TNamedObject($fq_catch_class);

src/Psalm/Internal/Stubs/ext-ds.php

Doc Comments +16 added lines, -7 removed lines

@@ -466,6 +466,7 @@ 
 
     /**
      * @param TValue ...$values
+     * @param TValue[] $values
      */
     public function contains(...$values): bool;
 
@@ -482,19 +483,20 @@ 
     public function find($value);
 
     /**
-     * @return TValue
+     * @return TValue|null
      * @throws \UnderflowException
      */
     public function first();
 
     /**
-     * @return TValue
+     * @return TValue|null
      * @throws \OutOfRangeException
      */
     public function get(int $index);
 
     /**
      * @param TValue ...$values
+     * @param TValue[] $values
      * @throws \OutOfRangeException
      */
     public function insert(int $index, ...$values);
@@ -506,7 +508,7 @@ 
     public function join(string $glue = null): string;
 
     /**
-     * @return TValue
+     * @return TValue|null
      * @throws \UnderflowException
      */
     public function last();
@@ -526,13 +528,14 @@ 
     public function merge(iterable $values): Sequence;
 
     /**
-     * @return TValue
+     * @return TValue|null
      * @throws \UnderflowException
      */
     public function pop();
 
     /**
      * @param TValue ...$values
+     * @param TValue[] $values
      */
     public function push(...$values);
 
@@ -540,12 +543,12 @@ 
      * @template TCarry
      * @param callable(TCarry, TValue): TCarry $callback
      * @param TCarry $initial
-     * @return TCarry
+     * @return TCarry|null
      */
     public function reduce(callable $callback, $initial = null);
 
     /**
-     * @return TValue
+     * @return TValue|null
      * @throws \OutOfRangeException
      */
     public function remove(int $index);
@@ -562,7 +565,7 @@ 
     public function set(int $index, $value);
 
     /**
-     * @return TValue
+     * @return TValue|null
      * @throws \UnderflowException
      */
     public function shift();
@@ -585,6 +588,7 @@ 
 
     /**
      * @param TValue ...$values
+     * @param TValue[] $values
      */
     public function unshift(...$values);
 }
@@ -739,6 +743,7 @@ 
 
     /**
      * @param TValue ...$values
+     * @param TValue[] $values
      */
     public function add(...$values): void
     {
@@ -746,6 +751,7 @@ 
 
     /**
      * @param TValue ...$values
+     * @param TValue[] $values
      */
     public function contains(...$values): bool
     {
@@ -819,6 +825,7 @@ 
 
     /**
      * @param TValue ...$values
+     * @param TValue[] $values
      */
     public function remove(...$values): void
     {
@@ -917,6 +924,7 @@ 
 
     /**
      * @param TValue ...$values
+     * @param TValue[] $values
      */
     public function push(...$values): void
     {
@@ -968,6 +976,7 @@ 
 
     /**
      * @param TValue ...$values
+     * @param TValue[] $values
      */
     public function push(...$values): void
     {

src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php

Doc Comments +4 added lines

@@ -884,6 +884,7 @@ 
 
     /**
      * @param non-empty-string $function_id
+     * @param \Psalm\Storage\FunctionStorage|null $function_storage
      */
     private static function getFunctionCallReturnType(
         StatementsAnalyzer $statements_analyzer,
@@ -1189,6 +1190,9 @@ 
         return true;
     }
 
+    /**
+     * @param \Psalm\Storage\FunctionStorage|null $function_storage
+     */
     private static function checkFunctionCallPurity(
         StatementsAnalyzer $statements_analyzer,
         \Psalm\Codebase $codebase,

src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php

Doc Comments +4 added lines, -1 removed lines

@@ -588,7 +588,7 @@ 
 
                         $array_values = array_map(
                             /**
-                             * @return PhpParser\Node\Expr\ArrayItem
+                             * @return boolean
                              */
                             function (PhpParser\Node\Arg $arg) {
                                 return new PhpParser\Node\Expr\ArrayItem($arg->value);
@@ -1346,6 +1346,9 @@ 
         return true;
     }
 
+    /**
+     * @param \Psalm\Storage\MethodStorage|null $method_storage
+     */
     private static function taintReturnType(
         StatementsAnalyzer $statements_analyzer,
         PhpParser\Node\Expr\StaticCall $stmt,

src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php

Doc Comments +7 added lines, -4 removed lines

@@ -404,7 +404,7 @@ 
         if ($storage instanceof MethodStorage) {
             $non_null_param_types = array_filter(
                 $storage->params,
-                /** @return bool */
+                /** @return null|false */
                 function (FunctionLikeParameter $p) {
                     return $p->type !== null && $p->has_docblock_type;
                 }
@@ -412,7 +412,7 @@ 
         } else {
             $non_null_param_types = array_filter(
                 $storage->params,
-                /** @return bool */
+                /** @return null|false */
                 function (FunctionLikeParameter $p) {
                     return $p->type !== null;
                 }
@@ -425,7 +425,7 @@ 
         ) {
             $types_without_docblocks = array_filter(
                 $storage->params,
-                /** @return bool */
+                /** @return null|false */
                 function (FunctionLikeParameter $p) {
                     return !$p->type || !$p->has_docblock_type;
                 }
@@ -839,6 +839,9 @@ 
         return null;
     }
 
+    /**
+     * @param \Psalm\Storage\ClassLikeStorage|null $class_storage
+     */
     private function checkParamReferences(
         StatementsAnalyzer $statements_analyzer,
         FunctionLikeStorage $storage,
@@ -962,6 +965,7 @@ 
     /**
      * @param array<int, \Psalm\Storage\FunctionLikeParameter> $params
      * @param array<int, Type\Union> $implemented_docblock_param_types
+     * @param string|null $cased_method_id
      */
     private function processParams(
         StatementsAnalyzer $statements_analyzer,
@@ -1471,7 +1475,6 @@ 
     /**
      * Adds return types for the given function
      *
-     * @param   string  $return_type
      * @param   Context $context
      *
      * @return  void

src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentsAnalyzer.php

Doc Comments +1 added lines

@@ -691,6 +691,7 @@
      * @param  string|null $cased_method_id
      * @param  FunctionLikeParameter|null $last_param
      * @param  array<int, FunctionLikeParameter> $function_params
+     * @param FunctionLikeParameter[] $function_params
      * @return false|null
      */
     private static function handlePossiblyMatchingByRefParam(

src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php

Doc Comments +9 added lines

@@ -305,6 +305,9 @@ 
         return true;
     }
 
+    /**
+     * @param null|string $keyed_array_var_id
+     */
     public static function taintArrayFetch(
         StatementsAnalyzer $statements_analyzer,
         PhpParser\Node\Expr $var,
@@ -1468,6 +1471,9 @@ 
         return $array_access_type;
     }
 
+    /**
+     * @param null|string $array_var_id
+     */
     private static function checkLiteralIntArrayOffset(
         Type\Union $offset_type,
         Type\Union $expected_offset_type,
@@ -1517,6 +1523,9 @@ 
         }
     }
 
+    /**
+     * @param null|string $array_var_id
+     */
     private static function checkLiteralStringArrayOffset(
         Type\Union $offset_type,
         Type\Union $expected_offset_type,