mirror of
https://github.com/jbcr/core.git
synced 2026-03-24 00:42:14 +01:00
add some changes suggested in PR
This commit is contained in:
2
.env
2
.env
@@ -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 ###
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user