add some changes suggested in PR

This commit is contained in:
Ionut Lipciuc
2022-02-10 12:13:00 +02:00
parent 79aedd9a34
commit 81ad739207
2 changed files with 3 additions and 5 deletions

2
.env
View File

@@ -17,7 +17,7 @@
APP_ENV=dev
APP_SECRET=!ChangeMe!
TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
BOLT_CONFIG_FOLDER=bolt
BOLT_CONFIG_FOLDER='config/bolt'
#TRUSTED_HOSTS='^(localhost|nginx)$'
###< symfony/framework-bundle ###

View File

@@ -26,7 +26,7 @@ abstract class BaseParser
public function __construct(string $projectDir, string $initialFilename)
{
$this->fileLocator = new FileLocator([$projectDir . $this->getProjectConfigDir()]);
$this->fileLocator = new FileLocator([$projectDir . '/' . $this->getProjectConfigDir()]);
$this->pathResolver = new PathResolver(dirname(dirname(dirname(__DIR__))));
$this->initialFilename = $initialFilename;
}
@@ -81,9 +81,7 @@ abstract class BaseParser
$projectConfigDir = getenv('BOLT_CONFIG_FOLDER');
}
$projectConfigDir = $projectConfigDir ?? 'bolt';
return '/config/' . $projectConfigDir;
return $projectConfigDir ?? 'config/bolt';
}
public function getFilenameLocalOverrides()