refactor(ConfigEnv): replace EnvProvider with array for environment variables

Author: roxblnfk

src/Common/EnvConfig/Client/ConfigEnv.php

@@ -4,8 +4,6 @@
 
 namespace Temporal\Common\EnvConfig\Client;
 
-use Temporal\Common\EnvConfig\EnvProvider;
-
 /**
  * Environment variable configuration parser for Temporal client.
  *
@@ -74,26 +72,26 @@ private function __construct(
         $this->configFile = $configFile === '' ? null : $configFile;
     }
 
-    public static function fromEnvProvider(EnvProvider $env): self
+    public static function fromEnv(array $env): self
     {
         return new self(
             new ConfigProfile(
-                address: $env->get('TEMPORAL_ADDRESS'),
-                namespace: $env->get('TEMPORAL_NAMESPACE'),
-                apiKey: $env->get('TEMPORAL_API_KEY'),
+                address: $env['TEMPORAL_ADDRESS'] ?? null,
+                namespace: $env['TEMPORAL_NAMESPACE'] ?? null,
+                apiKey: $env['TEMPORAL_API_KEY'] ?? null,
                 tlsConfig: self::fetchTlsConfig($env),
                 grpcMeta: self::fetchGrpcMeta($env),
                 codecConfig: self::fetchCodecConfig($env),
             ),
-            $env->get('TEMPORAL_PROFILE'),
-            $env->get('TEMPORAL_CONFIG_FILE'),
+            $env['TEMPORAL_PROFILE'] ?? null,
+            $env['TEMPORAL_CONFIG_FILE'] ?? null,
         );
     }
 
-    private static function fetchTlsConfig(EnvProvider $env): ?ConfigTls
+    private static function fetchTlsConfig(array $env): ?ConfigTls
     {
-        $tls = $env->get('TEMPORAL_TLS');
-        $tlsVars = $env->getByPrefix('TEMPORAL_TLS_', stripPrefix: true);
+        $tls = $env['TEMPORAL_TLS'] ?? null;
+        $tlsVars = self::getByPrefix($env, 'TEMPORAL_TLS_', stripPrefix: true);
 
         // If no TLS-related variables are set, return null
         if ($tls === null && $tlsVars === []) {
@@ -143,9 +141,9 @@ private static function fetchTlsConfig(EnvProvider $env): ?ConfigTls
      *
      * @return array<non-empty-string, string>
      */
-    private static function fetchGrpcMeta(EnvProvider $env): array
+    private static function fetchGrpcMeta(array $env): array
     {
-        $meta = $env->getByPrefix('TEMPORAL_GRPC_META_', stripPrefix: true);
+        $meta = self::getByPrefix($env, 'TEMPORAL_GRPC_META_', stripPrefix: true);
         $result = [];
 
         foreach ($meta as $key => $value) {
@@ -165,10 +163,10 @@ private static function fetchGrpcMeta(EnvProvider $env): array
      *
      * @return ConfigCodec|null Codec configuration or null if no codec env vars are set
      */
-    private static function fetchCodecConfig(EnvProvider $env): ?ConfigCodec
+    private static function fetchCodecConfig(array $env): ?ConfigCodec
     {
-        $endpoint = $env->get('TEMPORAL_CODEC_ENDPOINT');
-        $auth = $env->get('TEMPORAL_CODEC_AUTH');
+        $endpoint = $env['TEMPORAL_CODEC_ENDPOINT'] ?? null;
+        $auth = $env['TEMPORAL_CODEC_AUTH'] ?? null;
 
         // Return null if both are not set
         if ($endpoint === null && $auth === null) {
@@ -180,4 +178,27 @@ private static function fetchCodecConfig(EnvProvider $env): ?ConfigCodec
             auth: $auth,
         );
     }
+
+    /**
+     * Get environment variables by prefix.
+     *
+     * @param array $env Environment variables array
+     * @param string $prefix Prefix to filter by
+     * @param bool $stripPrefix Whether to strip the prefix from result keys
+     * @return array<string, string>
+     */
+    private static function getByPrefix(array $env, string $prefix, bool $stripPrefix = false): array
+    {
+        $result = [];
+        $prefixLen = \strlen($prefix);
+
+        foreach ($env as $key => $value) {
+            if (\str_starts_with($key, $prefix)) {
+                $resultKey = $stripPrefix ? \substr($key, $prefixLen) : $key;
+                $result[$resultKey] = $value;
+            }
+        }
+
+        return $result;
+    }
 }

src/Common/EnvConfig/ConfigClient.php

@@ -48,42 +48,42 @@ private function __construct(
      * Loading order (later overrides earlier):
      * 1. Profile from TOML file (if $configFile provided, or TEMPORAL_CONFIG_FILE is set,
      *    or file exists at default platform-specific location)
-     * 2. Environment variable overrides (if $envProvider provided)
+     * 2. Environment variable overrides (if $env provided)
      *
      * @param non-empty-string|null $profileName Profile name to load. If null, uses TEMPORAL_PROFILE
      *        environment variable or 'default' as fallback.
      * @param non-empty-string|null $configFile Path to TOML config file or TOML content string.
      *        If null, checks TEMPORAL_CONFIG_FILE env var, then checks if file exists at
      *        default platform-specific location.
-     * @param EnvProvider $envProvider Environment variable provider for overrides.
-     * @param bool $strict Whether to use strict TOML parsing (validates mutual exclusivity, etc.)
+     * @param array $env Environment variables array for overrides.
      *
      * @throws ProfileNotFoundException If the requested profile is not found
      * @throws InvalidConfigException If configuration file is invalid
      */
     public static function load(
         ?string $profileName = null,
         ?string $configFile = null,
-        EnvProvider $envProvider = new SystemEnvProvider(),
-        bool $strict = true,
+        array $env = [],
     ): self {
+        $env = $env ?: \getenv();
+
         // Load environment config first to get profile name if not specified
-        $envConfig = ConfigEnv::fromEnvProvider($envProvider);
+        $envConfig = ConfigEnv::fromEnv($env);
         $profileName ??= $envConfig->currentProfile ?? 'default';
         $profileNameLower = \strtolower($profileName);
 
         // Determine config file path: explicit > env var > default location
         $configFile ??= $envConfig->configFile;
         if ($configFile === null) {
-            $configFile = self::getDefaultConfigPath($envProvider);
+            $configFile = self::getDefaultConfigPath($env);
             $configFile === null or \file_exists($configFile) or $configFile = null;
         }
 
         // Load from file if it exists
         $profile = null;
         $profiles = [];
         if ($configFile !== null) {
-            $profiles = self::loadFromToml($configFile, $strict)->profiles;
+            $profiles = self::loadFromToml($configFile)->profiles;
             $profile = $profiles[$profileNameLower] ?? null;
         }
 
@@ -109,11 +109,13 @@ public static function load(
      *
      * Uses TEMPORAL_* environment variables to construct configuration.
      *
-     * @param EnvProvider $envProvider Environment variable provider.
+     * @param array $env Environment variables array.
      */
-    public static function loadFromEnv(EnvProvider $envProvider = new SystemEnvProvider()): self
+    public static function loadFromEnv(array $env = []): self
     {
-        $envConfig = ConfigEnv::fromEnvProvider($envProvider);
+        $env = $env ?: \getenv();
+
+        $envConfig = ConfigEnv::fromEnv($env);
         $profileName = $envConfig->currentProfile ?? 'default';
 
         return new self([$profileName => $envConfig->profile]);
@@ -214,20 +216,20 @@ private static function normalizeProfileNames(array $profiles): array
      * Note: This method returns the expected path regardless of whether the file exists.
      * The caller is responsible for checking file existence.
      *
-     * @param EnvProvider $envProvider Environment variable provider
+     * @param array $env Environment variables array
      * @return non-empty-string|null Path to default config file, or null if home directory cannot be determined
      */
-    private static function getDefaultConfigPath(EnvProvider $envProvider): ?string
+    private static function getDefaultConfigPath(array $env): ?string
     {
-        $home = $envProvider->get('HOME') ?? $envProvider->get('USERPROFILE');
+        $home = $env['HOME'] ?? $env['USERPROFILE'] ?? null;
         if ($home === null) {
             return null;
         }
 
         $configDir = match (\PHP_OS_FAMILY) {
-            'Windows' => $envProvider->get('APPDATA') ?? ($home . '\\AppData\\Roaming'),
+            'Windows' => $env['APPDATA'] ?? ($home . '\\AppData\\Roaming'),
             'Darwin' => $home . '/Library/Application Support',
-            default => $envProvider->get('XDG_CONFIG_HOME') ?? ($home . '/.config'),
+            default => $env['XDG_CONFIG_HOME'] ?? ($home . '/.config'),
         };
 
         return $configDir . \DIRECTORY_SEPARATOR . 'temporalio' . \DIRECTORY_SEPARATOR . 'temporal.toml';