Merge branch 'master' into 8758-optional-offsets-in-phpstorm-meta

vimeo · Nov 27, 2022 · d6bc64f · d6bc64f
2 parents 57693af + 8fa35c2
commit d6bc64f
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 13 deletions.
diff --git a/src/Psalm/Internal/Analyzer/NamespaceAnalyzer.php b/src/Psalm/Internal/Analyzer/NamespaceAnalyzer.php
@@ -87,16 +87,17 @@ public function collectAnalyzableInformation(): void
 
         if ($leftover_stmts) {
             $statements_analyzer = new StatementsAnalyzer($this, new NodeDataProvider());
-            $context = new Context();
-            $context->is_global = true;
-            $context->defineGlobals();
-            $context->collect_exceptions = $codebase->config->check_for_throws_in_global_scope;
-            $statements_analyzer->analyze($leftover_stmts, $context, null, true);
-
             $file_context = $this->source->context;
-            if ($file_context) {
-                $file_context->mergeExceptions($context);
+
+            if ($file_context !== null) {
+                $context = $file_context;
+            } else {
+                $context = new Context();
+                $context->is_global = true;
+                $context->defineGlobals();
+                $context->collect_exceptions = $codebase->config->check_for_throws_in_global_scope;
             }
+            $statements_analyzer->analyze($leftover_stmts, $context, null, true);
         }
     }
 

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/StaticPropertyFetchAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/StaticPropertyFetchAnalyzer.php
@@ -369,6 +369,8 @@ public static function analyze(
                     }
                 }
             }
+
+            return true;
         }
 
         if ($var_id) {

diff --git a/tests/Config/ConfigTest.php b/tests/Config/ConfigTest.php
@@ -152,7 +152,7 @@ public function testIgnoreMissingProjectDirectory(): void
         $config = $this->project_analyzer->getConfig();
 
         $this->assertTrue($config->isInProjectDirs(realpath('src/Psalm/Type.php')));
-        $this->assertFalse($config->isInProjectDirs(realpath(__DIR__.'/../../').'/does/not/exist/FileAnalyzer.php'));
+        $this->assertFalse($config->isInProjectDirs(realpath(__DIR__ . '/../../') . '/does/not/exist/FileAnalyzer.php'));
         $this->assertFalse($config->isInProjectDirs(realpath('examples/TemplateScanner.php')));
     }
 
@@ -1159,15 +1159,18 @@ function example1(): void {
                         ord($_GET["str"]);
                     }
 
-                    $glob1 = 0;
-                    error_reporting($glob1);
+                    $z = $glob1;
+                    $z = 0;
+                    error_reporting($z);
 
+                    $old = $_GET["str"];
                     $_GET["str"] = 0;
                     error_reporting($_GET["str"]);
+                    $_GET["str"] = $old;
 
                     function example2(): void {
-                        global $glob1, $glob2, $glob3;
-                        error_reporting($glob1);
+                        global $z, $glob2, $glob3;
+                        error_reporting($z);
                         ord($glob2["str"]);
                         $glob3->func();
                         ord($_GET["str"]);

diff --git a/tests/FileManipulation/ClassMoveTest.php b/tests/FileManipulation/ClassMoveTest.php
@@ -749,6 +749,29 @@ class Hello extends \Foo\Base {}
                     'Foo\Hello' => 'Foo\Bar\Hello',
                 ],
             ],
+            'renamesAllStaticPropReferences' => [
+                'input' => '<?php
+                    namespace Foo;
+
+                    class Bar {
+                        public static $props = [1, 2, 3];
+                    }
+                    echo Bar::$props[1];
+                    echo Bar::$props[2];
+                ',
+                'output' => '<?php
+                    namespace Zoo;
+
+                    class Baz {
+                        public static $props = [1, 2, 3];
+                    }
+                    echo \Zoo\Baz::$props[1];
+                    echo \Zoo\Baz::$props[2];
+                ',
+                'migrations' => [
+                    'Foo\Bar' => 'Zoo\Baz',
+                ],
+            ],
         ];
     }
 }
diff --git a/tests/NamespaceTest.php b/tests/NamespaceTest.php
@@ -71,6 +71,24 @@ function foo() : void {
                         $c = $argv;
                     }',
             ],
+            'varsAreNotScoped' => [
+                'code' => '<?php
+                    namespace A {
+                        $a = "1";
+                    }
+                    namespace B\C {
+                        $bc = "2";
+                    }
+                    namespace {
+                        echo $a . PHP_EOL;
+                        echo $bc . PHP_EOL;
+                    }
+                ',
+                'assertions' => [
+                    '$a===' => "'1'",
+                    '$bc===' => "'2'",
+                ],
+            ],
         ];
     }