File tree 1 file changed +22
-1
lines changed
1 file changed +22
-1
lines changed Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ class Configuration implements ConfigurationInterface
11
11
public function getConfigTreeBuilder ()
12
12
{
13
13
// Maintain backwars compatibility, only merge when AWS_MERGE_CONFIG is set
14
- $ mergeConfig = getenv ( ' AWS_MERGE_CONFIG ' ) ?: false ;
14
+ $ mergeConfig = $ this -> shouldMergeConfig () ;
15
15
$ treeType = 'variable ' ;
16
16
17
17
if ($ mergeConfig ) {
@@ -117,4 +117,25 @@ public function getConfigTreeBuilder()
117
117
118
118
return $ treeBuilder ;
119
119
}
120
+
121
+ protected function shouldMergeConfig ()
122
+ {
123
+ # works with symfony/dotenv
124
+ if (isset ($ _ENV ['AWS_MERGE_CONFIG ' ])) {
125
+ return $ _ENV ['AWS_MERGE_CONFIG ' ];
126
+ }
127
+
128
+ # works with case-insensitive names on windows and doesn't work with symfony/dotenv
129
+ $ mergeConfig = getenv ('AWS_MERGE_CONFIG ' );
130
+
131
+ if ($ mergeConfig ) {
132
+ @trigger_error (
133
+ 'Since aws/aws-sdk-php-symfony 2.5.0: Support for case-insensitive '
134
+ . ' AWS_MERGE_CONFIG is deprecated and will be removed in 3.0.0 ' ,
135
+ \E_USER_DEPRECATED
136
+ );
137
+ }
138
+
139
+ return $ mergeConfig ;
140
+ }
120
141
}
You can’t perform that action at this time.
0 commit comments