Merge pull request #8570 from Nicelocal/fix_8569

Fix #8569
vimeo · Oct 12, 2022 · bb9aabe · bb9aabe
2 parents 8d874aa + e43c6c1
commit bb9aabe
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeNodeScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/FunctionLikeNodeScanner.php
@@ -557,7 +557,11 @@ public function start(PhpParser\Node\FunctionLike $stmt, bool $fake_method = fal
                 = $classlike_storage->appearing_method_ids[$method_name_lc]
                 = $method_id;
 
-            if (!$stmt->isPrivate() || $method_name_lc === '__construct' || $classlike_storage->is_trait) {
+            if (!$stmt->isPrivate()
+                || $method_name_lc === '__construct'
+                || $method_name_lc === '__clone'
+                || $classlike_storage->is_trait
+            ) {
                 $classlike_storage->inheritable_method_ids[$method_name_lc] = $method_id;
             }
 

diff --git a/tests/CloneTest.php b/tests/CloneTest.php
@@ -82,6 +82,28 @@ private function __clone() {}
                     clone $a;',
                 'error_message' => 'InvalidClone',
             ],
+            'notVisibleCloneMethodSubClass' => [
+                'code' => '<?php
+                    class a {
+                        private function __clone() {}
+                    }
+                    class b extends a {}
+                    
+                    clone new b;',
+                'error_message' => 'InvalidClone',
+            ],
+            'notVisibleCloneMethodTrait' => [
+                'code' => '<?php
+                    trait a {
+                        private function __clone() {}
+                    }
+                    class b {
+                        use a;
+                    }
+                    
+                    clone new b;',
+                'error_message' => 'InvalidClone',
+            ],
             'invalidGenericClone' => [
                 'code' => '<?php
                     /**