Merge pull request #7260 from orklah/6691

forbid calling impure callable in immutable context
vimeo · Jan 1, 2022 · 2a6f122 · 2a6f122
2 parents 8dc1a31 + 8e5c9f0
commit 2a6f122
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/src/Psalm/Context.php b/src/Psalm/Context.php
@@ -353,11 +353,13 @@ class Context
 
     /**
      * @var bool
+     * Set by @psalm-immutable
      */
     public $mutation_free = false;
 
     /**
      * @var bool
+     * Set by @psalm-external-mutation-free
      */
     public $external_mutation_free = false;
 

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
@@ -643,7 +643,7 @@ private static function getAnalyzeNamedExpression(
                 }
 
                 if ($var_type_part instanceof TClosure || $var_type_part instanceof TCallable) {
-                    if (!$var_type_part->is_pure && $context->pure) {
+                    if (!$var_type_part->is_pure && ($context->pure || $context->mutation_free)) {
                         IssueBuffer::maybeAdd(
                             new ImpureFunctionCall(
                                 'Cannot call an impure function from a mutation-free context',

diff --git a/tests/PureAnnotationTest.php b/tests/PureAnnotationTest.php
@@ -876,6 +876,38 @@ function testImpure(): void
                     ',
                 'error_message' => 'ImpureMethodCall',
             ],
+            'impureCallableInImmutableContext' => [
+                '<?php
+
+                    /**
+                     * @psalm-immutable
+                     */
+                    class Either
+                    {
+                        /**
+                         * @psalm-param callable $_
+                         */
+                        public function fold($_): void
+                        {
+                            $_();
+                        }
+                    }
+
+                    class Whatever
+                    {
+                        public function __construct()
+                        {
+                            $either = new Either();
+                            $either->fold(
+                                function (): void {}
+                            );
+                        }
+                    }
+
+                    new Whatever();
+                    ',
+                'error_message' => 'ImpureFunctionCall',
+            ],
         ];
     }
 }
diff --git a/tests/Template/ClassTemplateTest.php b/tests/Template/ClassTemplateTest.php
@@ -2991,7 +2991,7 @@ public function toString(): string
 
                         /**
                          * @psalm-template TResult
-                         * @psalm-param callable(self::READ_UNCOMMITTED): TResult $readUncommitted
+                         * @psalm-param pure-callable(self::READ_UNCOMMITTED): TResult $readUncommitted
                          * @psalm-return TResult
                          */
                         public function resolve(callable $readUncommitted) {