Skip to content

Commit 792bba6

Browse files
committed
Merge branch 'release/0.8.14'
2 parents 33f4181 + 70b78af commit 792bba6

3 files changed

Lines changed: 17 additions & 8 deletions

File tree

.version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"strategy": "semver",
33
"major": 0,
44
"minor": 8,
5-
"patch": 13,
5+
"patch": 14,
66
"build": 0
77
}

bin/neuron

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,28 @@ if( version_compare( PHP_VERSION, '8.4.0', '<' ) )
4848
}
4949

5050
// Load configuration if available
51+
// Use SettingManagerFactory to load environment-specific configs and encrypted secrets
5152
$settings = null;
5253
$configPaths = [
53-
getcwd() . '/config/neuron.yaml',
54-
getcwd() . '/neuron.yaml',
54+
getcwd() . '/config',
55+
getcwd(),
5556
];
5657

5758
foreach( $configPaths as $configPath )
5859
{
59-
if( file_exists( $configPath ) )
60+
$neuronYaml = $configPath . '/neuron.yaml';
61+
62+
if( file_exists( $neuronYaml ) )
6063
{
6164
try
6265
{
63-
$settings = new \Neuron\Data\Settings\Source\Yaml( $configPath );
66+
// Use SettingManagerFactory to load all configuration layers:
67+
// - Base config (neuron.yaml)
68+
// - Environment-specific config (environments/{env}.yaml)
69+
// - Base secrets (secrets.yml.enc)
70+
// - Environment-specific secrets (environments/{env}.secrets.yml.enc)
71+
// - .env variables (fallback)
72+
$settings = \Neuron\Data\Settings\SettingManagerFactory::create( null, $configPath );
6473
break;
6574
}
6675
catch( \Exception $e )

versionlog.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
## 0.8.13 2026-01-13
1+
## 0.8.14 2026-01-15
2+
* Cli now loads merged configurations correctly on boot.
23

4+
## 0.8.13 2026-01-13
35
## 0.8.12 2026-01-12
4-
56
## 0.8.11 2026-01-06
6-
77
## 0.8.10 2026-01-06
88
* Added secret commands.
99

0 commit comments

Comments
 (0)