@@ -448,42 +448,33 @@ public static function getEnvironmentConfig() {
448448 * @return array
449449 */
450450 private static function getDefaultConfig () {
451- $ conf = [
451+ static $ conf = [
452452 'Address ' => '127.0.0.1:8500 ' ,
453453 'Scheme ' => 'http ' ,
454454 ];
455455
456456 // parse env vars
457457 foreach (static ::getEnvironmentConfig () as $ k => $ v ) {
458- switch ($ k ) {
459- case Consul::HTTPAddrEnvName:
460- $ conf ['Address ' ] = $ v ;
461- break ;
462- case Consul::HTTPTokenEnvName:
463- $ conf ['Token ' ] = $ v ;
464- break ;
465- case Consul::HTTPAuthEnvName:
466- $ conf ['HttpAuth ' ] = $ v ;
467- break ;
468- case Consul::HTTPCAFileEnvName:
469- $ conf ['CAFile ' ] = $ v ;
470- break ;
471- case Consul::HTTPClientCertEnvName:
472- $ conf ['CertFile ' ] = $ v ;
473- break ;
474- case Consul::HTTPClientKeyEnvName:
475- $ conf ['KeyFile ' ] = $ v ;
476- break ;
477- case Consul::HTTPSSLEnvName:
478- if ((bool )$ v ) {
479- $ conf ['Scheme ' ] = 'https ' ;
480- }
481- break ;
482- case Consul::HTTPSSLVerifyEnvName:
483- if ((bool )$ v ) {
484- $ conf ['InsecureSkipVerify ' ] = true ;
485- }
486- break ;
458+ if (Consul::HTTPAddrEnvName === $ k ) {
459+ $ conf ['Address ' ] = $ v ;
460+ } else if (Consul::HTTPTokenEnvName === $ k ) {
461+ $ conf ['Token ' ] = $ v ;
462+ } else if (Consul::HTTPAuthEnvName === $ k ) {
463+ $ conf ['HttpAuth ' ] = $ v ;
464+ } else if (Consul::HTTPCAFileEnvName === $ k ) {
465+ $ conf ['CAFile ' ] = $ v ;
466+ } else if (Consul::HTTPClientCertEnvName === $ k ) {
467+ $ conf ['CertFile ' ] = $ v ;
468+ } else if (Consul::HTTPClientKeyEnvName === $ k ) {
469+ $ conf ['KeyFile ' ] = $ v ;
470+ } else if (Consul::HTTPSSLEnvName === $ k ) {
471+ if ((bool )$ v ) {
472+ $ conf ['Scheme ' ] = 'https ' ;
473+ }
474+ } else if (Consul::HTTPSSLVerifyEnvName === $ k ) {
475+ if ((bool )$ v ) {
476+ $ conf ['InsecureSkipVerify ' ] = true ;
477+ }
487478 }
488479 }
489480
0 commit comments