same for classes and class constants

Fix #10025
vimeo · Mar 28, 2024 · 086cc08 · 086cc08
1 parent efd17a1
commit 086cc08
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 12 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/NewAnalyzer.php
@@ -373,16 +373,16 @@ private static function analyzeNamedConstructor(
             );
         }
 
-
-        if ($context->self
+        $caller_identifier = $context->self ?? $statements_analyzer->getNamespace();
+        if ($caller_identifier !== null
             && !$context->collect_initializations
             && !$context->collect_mutations
-            && !NamespaceAnalyzer::isWithinAny($context->self, $storage->internal)
+            && !NamespaceAnalyzer::isWithinAny($caller_identifier, $storage->internal)
         ) {
             IssueBuffer::maybeAdd(
                 new InternalClass(
                     $fq_class_name . ' is internal to ' . InternalClass::listToPhrase($storage->internal)
-                        . ' but called from ' . $context->self,
+                        . ' but called from ' . ($caller_identifier ?: 'root namespace'),
                     new CodeLocation($statements_analyzer->getSource(), $stmt),
                     $fq_class_name,
                 ),

diff --git a/...lm/Internal/Analyzer/Statements/Expression/Call/StaticMethod/AtomicStaticCallAnalyzer.php b/...lm/Internal/Analyzer/Statements/Expression/Call/StaticMethod/AtomicStaticCallAnalyzer.php
@@ -840,11 +840,13 @@ private static function handleNamedCall(
             );
         }
 
-        if ($context->self && ! NamespaceAnalyzer::isWithinAny($context->self, $class_storage->internal)) {
+        $caller_identifier = $context->self ?? $statements_analyzer->getNamespace();
+        if ($caller_identifier !== null
+            && !NamespaceAnalyzer::isWithinAny($caller_identifier, $class_storage->internal)) {
             IssueBuffer::maybeAdd(
                 new InternalClass(
                     $fq_class_name . ' is internal to ' . InternalClass::listToPhrase($class_storage->internal)
-                        . ' but called from ' . $context->self,
+                        . ' but called from ' . ($caller_identifier ?: 'root namespace'),
                     new CodeLocation($statements_analyzer->getSource(), $stmt),
                     $fq_class_name,
                 ),

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/ClassConstAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/ClassConstAnalyzer.php
@@ -365,16 +365,17 @@ public static function analyzeFetch(
                 }
             }
 
-            if ($context->self
+            $caller_identifier = $context->self ?? $statements_analyzer->getNamespace();
+            if ($caller_identifier !== null
                 && !$context->collect_initializations
                 && !$context->collect_mutations
-                && !NamespaceAnalyzer::isWithinAny($context->self, $const_class_storage->internal)
+                && !NamespaceAnalyzer::isWithinAny($caller_identifier, $const_class_storage->internal)
             ) {
                 IssueBuffer::maybeAdd(
                     new InternalClass(
                         $fq_class_name . ' is internal to '
                             . InternalClass::listToPhrase($const_class_storage->internal)
-                            . ' but called from ' . $context->self,
+                            . ' but called from ' . ($caller_identifier ?: 'root namespace'),
                         new CodeLocation($statements_analyzer->getSource(), $stmt),
                         $fq_class_name,
                     ),
@@ -656,16 +657,17 @@ public static function analyzeFetch(
                 }
             }
 
-            if ($context->self
+            $caller_identifier = $context->self ?? $statements_analyzer->getNamespace();
+            if ($caller_identifier !== null
                 && !$context->collect_initializations
                 && !$context->collect_mutations
-                && !NamespaceAnalyzer::isWithinAny($context->self, $const_class_storage->internal)
+                && !NamespaceAnalyzer::isWithinAny($caller_identifier, $const_class_storage->internal)
             ) {
                 IssueBuffer::maybeAdd(
                     new InternalClass(
                         $fq_class_name . ' is internal to '
                             . InternalClass::listToPhrase($const_class_storage->internal)
-                            . ' but called from ' . $context->self,
+                            . ' but called from ' . ($caller_identifier ?: 'root namespace'),
                         new CodeLocation($statements_analyzer->getSource(), $stmt),
                         $fq_class_name,
                     ),

diff --git a/tests/InternalAnnotationTest.php b/tests/InternalAnnotationTest.php
@@ -1024,6 +1024,62 @@ class Foo {
                     }',
                 'error_message' => 'InternalProperty',
             ],
+            'internalClassOutsideClass' => [
+                'code' => '<?php
+                    namespace A {
+                        /**
+                         * @internal
+                         */
+                        class Foo {}
+                    }
+                    namespace B {
+                        $f = new \A\Foo();
+                    }',
+                'error_message' => 'InternalClass',
+            ],
+            'internalClassOutsideClassGlobalNamespace' => [
+                'code' => '<?php
+                    namespace A {
+                        /**
+                         * @internal
+                         */
+                        class Foo {}
+                    }
+                    namespace {
+                        $f = new \A\Foo();
+                    }',
+                'error_message' => 'InternalClass',
+            ],
+            'internalClassInsideFunction' => [
+                'code' => '<?php
+                    namespace A {
+                        /**
+                         * @internal
+                         */
+                        class Foo {}
+                    }
+                    namespace B {
+                        function hello(): void {
+                            $f = new \A\Foo();
+                        }
+                    }',
+                'error_message' => 'InternalClass',
+            ],
+            'internalClassInsideFunctionGlobalNamespace' => [
+                'code' => '<?php
+                    namespace A {
+                        /**
+                         * @internal
+                         */
+                        class Foo {}
+                    }
+                    namespace {
+                        function hello(): void {
+                            $f = new \A\Foo();
+                        }
+                    }',
+                'error_message' => 'InternalClass',
+            ],
             'magicPropertyGetInternalExplicit' => [
                 'code' => '<?php
                     namespace A {