Fix #935 - allow Phar to run without composer files

vimeo · Apr 20, 2019 · 79ae72d · 79ae72d
1 parent 764678d
commit 79ae72d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -841,7 +841,7 @@ public static function getInstance()
     /**
      * @return void
      */
-    public function setComposerClassLoader(ClassLoader $loader)
+    public function setComposerClassLoader(ClassLoader $loader = null)
     {
         $this->composer_class_loader = $loader;
     }

diff --git a/src/command_functions.php b/src/command_functions.php
@@ -7,7 +7,7 @@
  *
  * @psalm-suppress MixedInferred
  *
- * @return \Composer\Autoload\ClassLoader
+ * @return ?\Composer\Autoload\ClassLoader
  */
 function requireAutoloaders($current_dir, $has_explicit_root, $vendor_dir)
 {
@@ -86,7 +86,7 @@ function requireAutoloaders($current_dir, $has_explicit_root, $vendor_dir)
         }
     }
 
-    if ($first_autoloader === null) {
+    if ($first_autoloader === null && !$in_phar) {
         if (!$autoload_files) {
             echo 'Failed to find a valid Composer autoloader' . "\n";
         } else {