File tree 1 file changed +21
-4
lines changed
src/Symfony/Bundle/FrameworkBundle/Test 1 file changed +21
-4
lines changed Original file line number Diff line number Diff line change @@ -188,10 +188,27 @@ protected static function createKernel(array $options = array())
188
188
static ::$ class = static ::getKernelClass ();
189
189
}
190
190
191
- return new static::$ class (
192
- isset ($ options ['environment ' ]) ? $ options ['environment ' ] : 'test ' ,
193
- isset ($ options ['debug ' ]) ? $ options ['debug ' ] : true
194
- );
191
+ if (isset ($ options ['environment ' ])) {
192
+ $ env = $ options ['environment ' ];
193
+ } elseif (isset ($ _SERVER ['APP_ENV ' ])) {
194
+ $ env = $ _SERVER ['APP_ENV ' ];
195
+ } elseif (isset ($ _ENV ['APP_ENV ' ])) {
196
+ $ env = $ _ENV ['APP_ENV ' ];
197
+ } else {
198
+ $ env = 'test ' ;
199
+ }
200
+
201
+ if (isset ($ options ['debug ' ])) {
202
+ $ debug = $ options ['debug ' ];
203
+ } elseif (isset ($ _SERVER ['APP_DEBUG ' ])) {
204
+ $ debug = $ _SERVER ['APP_DEBUG ' ];
205
+ } elseif (isset ($ _ENV ['APP_DEBUG ' ])) {
206
+ $ debug = $ _ENV ['APP_DEBUG ' ];
207
+ } else {
208
+ $ debug = true ;
209
+ }
210
+
211
+ return new static::$ class ($ env , $ debug );
195
212
}
196
213
197
214
/**
You can’t perform that action at this time.
0 commit comments