Clean up unnecessary annotation

Ref #2111
vimeo · Sep 9, 2019 · a1ea5c3 · a1ea5c3
1 parent b49444b
commit a1ea5c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssignmentAnalyzer.php
@@ -627,8 +627,8 @@ public static function analyze(
             $method_pure_compatible = !empty($assign_var->var->inferredType->external_mutation_free)
                 || isset($assign_var->var->pure);
 
-            if (($context->mutation_free
+            if (($context->mutation_free || $context->external_mutation_free)
-                || ($context->external_mutation_free && !$method_pure_compatible))
+                && !$method_pure_compatible
                 && !$context->collect_mutations
                 && !$context->collect_initializations
             ) {

diff --git a/tests/ImmutableAnnotationTest.php b/tests/ImmutableAnnotationTest.php
@@ -125,9 +125,6 @@ public function __construct(string $bar) {
                             $this->bar = $bar;
                         }
 
-                        /**
-                         * @psalm-external-mutation-free
-                         */
                         public function withBar(string $bar): self {
                             $new = new Foo("hello");
                             /** @psalm-suppress InaccessibleProperty */
@@ -149,9 +146,6 @@ public function __construct(string $bar) {
                             $this->bar = $bar;
                         }
 
-                        /**
-                         * @psalm-external-mutation-free
-                         */
                         public function withBar(string $bar): self {
                             $new = clone $this;
                             /** @psalm-suppress InaccessibleProperty */
@@ -280,9 +274,6 @@ public function __construct(string $bar) {
                             $this->bar = $bar;
                         }
 
-                        /**
-                         * @psalm-external-mutation-free
-                         */
                         public function withBar(Bar $b): Bar {
                             $new = clone $b;
                             $b->a = $this->bar;