vimeo · weirdan · Jan 3, 2022 · Jan 3, 2022
diff --git a/composer.json b/composer.json
@@ -82,7 +82,6 @@
             "Psalm\\": "src/Psalm/"
         },
         "files": [
-            "src/functions.php",
             "src/spl_object_id.php"
         ]
     },

diff --git a/psalm b/psalm
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+namespace Psalm;
+
 use Psalm\Internal\Cli\Psalm;
 
 require_once __DIR__ . '/src/Psalm/Internal/Cli/Psalm.php';

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -367,31 +367,6 @@
       <code>$type[0]</code>
     </PossiblyUndefinedIntArrayOffset>
   </file>
-  <file src="src/psalm-language-server.php">
-    <InternalMethod occurrences="1">
-      <code>LanguageServer::run($argv)</code>
-    </InternalMethod>
-  </file>
-  <file src="src/psalm-refactor.php">
-    <InternalMethod occurrences="1">
-      <code>Refactor::run($argv)</code>
-    </InternalMethod>
-  </file>
-  <file src="src/psalm.php">
-    <InternalMethod occurrences="1">
-      <code>Psalm::run($argv)</code>
-    </InternalMethod>
-  </file>
-  <file src="src/psalm_plugin.php">
-    <InternalMethod occurrences="1">
-      <code>Plugin::run()</code>
-    </InternalMethod>
-  </file>
-  <file src="src/psalter.php">
-    <InternalMethod occurrences="1">
-      <code>Psalter::run($argv)</code>
-    </InternalMethod>
-  </file>
   <file src="vendor/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php">
     <PossiblyUndefinedStringArrayOffset occurrences="1">
       <code>$subNodes['expr']</code>

diff --git a/psalm-language-server b/psalm-language-server
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+namespace Psalm;
+
 use Psalm\Internal\Cli\LanguageServer;
 
 require_once __DIR__ . '/src/Psalm/Internal/Cli/LanguageServer.php';

diff --git a/psalm-plugin b/psalm-plugin
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+namespace Psalm;
+
 use Psalm\Internal\Cli\Plugin;
 
 require_once __DIR__ . '/src/Psalm/Internal/Cli/Plugin.php';

diff --git a/psalm-refactor b/psalm-refactor
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+namespace Psalm;
+
 use Psalm\Internal\Cli\Refactor;
 
 require_once __DIR__ . '/src/Psalm/Internal/Cli/Refactor.php';

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -25,6 +25,11 @@
         <directory name="src"/>
         <directory name="tests"/>
         <directory name="examples"/>
+        <file name="psalm"/>
+        <file name="psalm-language-server"/>
+        <file name="psalm-plugin"/>
+        <file name="psalm-refactor"/>
+        <file name="psalter"/>
         <ignoreFiles>
             <file name="src/Psalm/Internal/PhpTraverser/CustomTraverser.php"/>
             <file name="tests/ErrorBaselineTest.php"/>

diff --git a/psalter b/psalter
@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+namespace Psalm;
+
 use Psalm\Internal\Cli\Psalter;
 
 require_once __DIR__ . '/src/Psalm/Internal/Cli/Psalter.php';

diff --git a/src/command_functions.php b/src/command_functions.php
diff --git a/src/functions.php b/src/functions.php
diff --git a/src/psalm-language-server.php b/src/psalm-language-server.php
diff --git a/src/psalm-refactor.php b/src/psalm-refactor.php
diff --git a/src/psalm.php b/src/psalm.php
diff --git a/src/psalm_plugin.php b/src/psalm_plugin.php
diff --git a/src/psalter.php b/src/psalter.php