Bugfix: Crash when no env initialized

This commit is contained in:
Chris 2021-12-17 13:37:22 +01:00
parent 0f45219747
commit 8f7e8013ab
1 changed files with 15 additions and 12 deletions

View File

@ -15,7 +15,7 @@ class SparkApplication extends Application
{ {
public static SparkApplication $instance; public static SparkApplication $instance;
private Environment $environment; private ?Environment $environment;
private ResourceManager $resourceManager; private ResourceManager $resourceManager;
@ -32,20 +32,23 @@ class SparkApplication extends Application
$this->pluginManager = new PluginManager(); $this->pluginManager = new PluginManager();
$this->environment = Environment::createFromDirectory(null, true); $this->environment = Environment::createFromDirectory(null, true);
$this->environment->loadEnvironment(); if ($this->environment) {
$this->environment->loadEnvironment();
$this->add(new Commands\RunCommand()); $this->add(new Commands\RunCommand());
$this->add(new Commands\ResourcesCommand()); $this->add(new Commands\ResourcesCommand());
$this->add(new Commands\ReplCommand()); $this->add(new Commands\ReplCommand());
$this->add(new Commands\InitCommand()); $this->add(new Commands\PipeCommand());
$this->add(new Commands\PipeCommand());
$this->get("list")->setHidden(true); $this->get("list")->setHidden(true);
$this->get("completion")->setHidden(true); $this->get("completion")->setHidden(true);
$this->get("help")->setHidden(true); $this->get("help")->setHidden(true);
if (getenv("SPARK_PLUGINS")) { if (getenv("SPARK_PLUGINS")) {
$this->add(new Commands\PluginsCommand()); $this->add(new Commands\PluginsCommand());
}
} else {
$this->add(new Commands\InitCommand());
} }
} }