Fix #2752 - string casts can be implicit method calls, don’t remove a…

…utomatically
vimeo · Feb 7, 2020 · e567f8c · orklah · Feb 7, 2020 · muglug
1 parent 4cd4e17
commit e567f8c
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Visitor/CheckTrivialExprVisitor.php b/src/Psalm/Internal/Visitor/CheckTrivialExprVisitor.php
@@ -37,6 +37,7 @@ private function checkNonTrivialExpr(PhpParser\Node\Expr $node)
             || $node instanceof PhpParser\Node\Expr\Yield_
             || $node instanceof PhpParser\Node\Expr\YieldFrom
             || $node instanceof PhpParser\Node\Expr\New_
+            || $node instanceof PhpParser\Node\Expr\Cast\String_
         ) {
             if (($node instanceof PhpParser\Node\Expr\FuncCall
                     || $node instanceof PhpParser\Node\Expr\MethodCall

diff --git a/tests/FileManipulation/UnusedVariableManipulationTest.php b/tests/FileManipulation/UnusedVariableManipulationTest.php
@@ -587,6 +587,51 @@ function foo() : void {
                 ['UnusedVariable'],
                 true,
             ],
+            'dontRemoveUsedToStringCall' => [
+                '<?php
+                    class S {
+                        /**
+                         * @throws Exception
+                         */
+                        public function __toString() {
+                            if(rand(0,1)){
+                                throw new exception();
+                            }
+                            return "";
+                        }
+                    }
+
+                    function foo(S $a) {
+                        try {
+                            $b = (string) $a;
+                        } catch(Exception $e){
+                            // this class is not stringable
+                        }
+                    }',
+                '<?php
+                    class S {
+                        /**
+                         * @throws Exception
+                         */
+                        public function __toString() {
+                            if(rand(0,1)){
+                                throw new exception();
+                            }
+                            return "";
+                        }
+                    }
+
+                    function foo(S $a) {
+                        try {
+                            (string) $a;
+                        } catch(Exception $e){
+                            // this class is not stringable
+                        }
+                    }',
+                '7.1',
+                ['UnusedVariable'],
+                true,
+            ],
         ];
     }
 }