From 8ad759e1f258e3ffa983baa245a24d90e8136e3f Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Thu, 8 Sep 2022 14:33:39 +0200 Subject: [PATCH] Fix self callables --- src/ClientSideMonitoring/ConfigurationProvider.php | 6 +++--- src/Credentials/CredentialProvider.php | 3 +-- src/DefaultsMode/ConfigurationProvider.php | 2 +- src/Endpoint/UseDualstackEndpoint/ConfigurationProvider.php | 6 +++--- src/Endpoint/UseFipsEndpoint/ConfigurationProvider.php | 6 +++--- src/EndpointDiscovery/ConfigurationProvider.php | 4 ++-- src/Retry/ConfigurationProvider.php | 2 +- src/S3/RegionalEndpoint/ConfigurationProvider.php | 6 +++--- src/S3/UseArnRegion/ConfigurationProvider.php | 6 +++--- src/Sts/RegionalEndpoints/ConfigurationProvider.php | 4 ++-- 10 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/ClientSideMonitoring/ConfigurationProvider.php b/src/ClientSideMonitoring/ConfigurationProvider.php index 78bcc9ece2..b83de70f84 100644 --- a/src/ClientSideMonitoring/ConfigurationProvider.php +++ b/src/ClientSideMonitoring/ConfigurationProvider.php @@ -87,7 +87,7 @@ public static function defaultProvider(array $config = []) $configProviders[] = self::fallback(); $memo = self::memoize( - call_user_func_array('self::chain', $configProviders) + call_user_func_array([ConfigurationProvider::class, 'chain'], $configProviders) ); if (isset($config['csm']) && $config['csm'] instanceof CacheInterface) { @@ -172,7 +172,7 @@ public static function ini($profile = null, $filename = null) return self::reject("'$profile' not found in config file"); } if (!isset($data[$profile]['csm_enabled'])) { - return self::reject("Required CSM config values not present in + return self::reject("Required CSM config values not present in INI profile '{$profile}' ({$filename})"); } @@ -233,4 +233,4 @@ public static function unwrap($config) throw new \InvalidArgumentException('Not a valid CSM configuration ' . 'argument.'); } -} \ No newline at end of file +} diff --git a/src/Credentials/CredentialProvider.php b/src/Credentials/CredentialProvider.php index 70ddf868d5..e10af42a6d 100644 --- a/src/Credentials/CredentialProvider.php +++ b/src/Credentials/CredentialProvider.php @@ -133,7 +133,7 @@ public static function defaultProvider(array $config = []) return self::memoize( call_user_func_array( - 'self::chain', + [CredentialProvider::class, 'chain'], array_values($defaultChain) ) ); @@ -900,4 +900,3 @@ public static function shouldUseEcs() || !empty($_SERVER[EcsCredentialProvider::ENV_FULL_URI]); } } - diff --git a/src/DefaultsMode/ConfigurationProvider.php b/src/DefaultsMode/ConfigurationProvider.php index 77b07af40f..86229aca4c 100644 --- a/src/DefaultsMode/ConfigurationProvider.php +++ b/src/DefaultsMode/ConfigurationProvider.php @@ -82,7 +82,7 @@ public static function defaultProvider(array $config = []) $configProviders[] = self::fallback(); $memo = self::memoize( - call_user_func_array('self::chain', $configProviders) + call_user_func_array([ConfigurationProvider::class, 'chain'], $configProviders) ); if (isset($config['defaultsMode']) diff --git a/src/Endpoint/UseDualstackEndpoint/ConfigurationProvider.php b/src/Endpoint/UseDualstackEndpoint/ConfigurationProvider.php index f727a9c398..b7d8e531a6 100644 --- a/src/Endpoint/UseDualstackEndpoint/ConfigurationProvider.php +++ b/src/Endpoint/UseDualstackEndpoint/ConfigurationProvider.php @@ -80,7 +80,7 @@ public static function defaultProvider(array $config = []) $configProviders[] = self::fallback($region); $memo = self::memoize( - call_user_func_array('self::chain', $configProviders) + call_user_func_array([ConfigurationProvider::class, 'chain'], $configProviders) ); if (isset($config['use_dual_stack_endpoint']) @@ -144,7 +144,7 @@ public static function ini($region, $profile = null, $filename = null) return self::reject("'$profile' not found in config file"); } if (!isset($data[$profile][self::INI_USE_DUAL_STACK_ENDPOINT])) { - return self::reject("Required use dualstack endpoint config values + return self::reject("Required use dualstack endpoint config values not present in INI profile '{$profile}' ({$filename})"); } @@ -170,4 +170,4 @@ public static function fallback($region) return Promise\Create::promiseFor(new Configuration(false, $region)); }; } -} \ No newline at end of file +} diff --git a/src/Endpoint/UseFipsEndpoint/ConfigurationProvider.php b/src/Endpoint/UseFipsEndpoint/ConfigurationProvider.php index 7a07655da1..0b344488aa 100644 --- a/src/Endpoint/UseFipsEndpoint/ConfigurationProvider.php +++ b/src/Endpoint/UseFipsEndpoint/ConfigurationProvider.php @@ -79,7 +79,7 @@ public static function defaultProvider(array $config = []) $configProviders[] = self::fallback($config['region']); $memo = self::memoize( - call_user_func_array('self::chain', $configProviders) + call_user_func_array([ConfigurationProvider::class, 'chain'], $configProviders) ); if (isset($config['use_fips_endpoint']) @@ -143,7 +143,7 @@ public static function ini($profile = null, $filename = null) return self::reject("'$profile' not found in config file"); } if (!isset($data[$profile][self::INI_USE_FIPS_ENDPOINT])) { - return self::reject("Required use fips endpoint config values + return self::reject("Required use fips endpoint config values not present in INI profile '{$profile}' ({$filename})"); } @@ -176,4 +176,4 @@ public static function fallback($region) return Promise\Create::promiseFor($configuration); }; } -} \ No newline at end of file +} diff --git a/src/EndpointDiscovery/ConfigurationProvider.php b/src/EndpointDiscovery/ConfigurationProvider.php index 17130c4611..77404a81d0 100644 --- a/src/EndpointDiscovery/ConfigurationProvider.php +++ b/src/EndpointDiscovery/ConfigurationProvider.php @@ -83,7 +83,7 @@ public static function defaultProvider(array $config = []) $configProviders[] = self::fallback($config); $memo = self::memoize( - call_user_func_array('self::chain', $configProviders) + call_user_func_array([ConfigurationProvider::class, 'chain'], $configProviders) ); if (isset($config['endpoint_discovery']) @@ -190,7 +190,7 @@ public static function ini( return self::reject("'$profile' not found in config file"); } if (!isset($data[$profile]['endpoint_discovery_enabled'])) { - return self::reject("Required endpoint discovery config values + return self::reject("Required endpoint discovery config values not present in INI profile '{$profile}' ({$filename})"); } diff --git a/src/Retry/ConfigurationProvider.php b/src/Retry/ConfigurationProvider.php index f225a01ddb..db641f2204 100644 --- a/src/Retry/ConfigurationProvider.php +++ b/src/Retry/ConfigurationProvider.php @@ -85,7 +85,7 @@ public static function defaultProvider(array $config = []) $configProviders[] = self::fallback(); $memo = self::memoize( - call_user_func_array('self::chain', $configProviders) + call_user_func_array([ConfigurationProvider::class, 'chain'], $configProviders) ); if (isset($config['retries']) diff --git a/src/S3/RegionalEndpoint/ConfigurationProvider.php b/src/S3/RegionalEndpoint/ConfigurationProvider.php index 0a232ddfff..eaed23505b 100644 --- a/src/S3/RegionalEndpoint/ConfigurationProvider.php +++ b/src/S3/RegionalEndpoint/ConfigurationProvider.php @@ -80,7 +80,7 @@ public static function defaultProvider(array $config = []) $configProviders[] = self::fallback(); $memo = self::memoize( - call_user_func_array('self::chain', $configProviders) + call_user_func_array([ConfigurationProvider::class, 'chain'], $configProviders) ); if (isset($config['s3_us_east_1_regional_endpoint']) @@ -139,7 +139,7 @@ public static function ini( return self::reject("'$profile' not found in config file"); } if (!isset($data[$profile][self::INI_ENDPOINTS_TYPE])) { - return self::reject("Required S3 regional endpoint config values + return self::reject("Required S3 regional endpoint config values not present in INI profile '{$profile}' ({$filename})"); } @@ -192,4 +192,4 @@ public static function unwrap($config) throw new \InvalidArgumentException('Not a valid S3 regional endpoint ' . 'configuration argument.'); } -} \ No newline at end of file +} diff --git a/src/S3/UseArnRegion/ConfigurationProvider.php b/src/S3/UseArnRegion/ConfigurationProvider.php index 6143c3dde0..c9389b62ea 100644 --- a/src/S3/UseArnRegion/ConfigurationProvider.php +++ b/src/S3/UseArnRegion/ConfigurationProvider.php @@ -80,7 +80,7 @@ public static function defaultProvider(array $config = []) $configProviders[] = self::fallback(); $memo = self::memoize( - call_user_func_array('self::chain', $configProviders) + call_user_func_array([ConfigurationProvider::class, 'chain'], $configProviders) ); if (isset($config['use_arn_region']) @@ -144,7 +144,7 @@ public static function ini($profile = null, $filename = null) return self::reject("'$profile' not found in config file"); } if (!isset($data[$profile][self::INI_USE_ARN_REGION])) { - return self::reject("Required S3 Use Arn Region config values + return self::reject("Required S3 Use Arn Region config values not present in INI profile '{$profile}' ({$filename})"); } @@ -172,4 +172,4 @@ public static function fallback() ); }; } -} \ No newline at end of file +} diff --git a/src/Sts/RegionalEndpoints/ConfigurationProvider.php b/src/Sts/RegionalEndpoints/ConfigurationProvider.php index cf47399dec..5c89ed6a7d 100644 --- a/src/Sts/RegionalEndpoints/ConfigurationProvider.php +++ b/src/Sts/RegionalEndpoints/ConfigurationProvider.php @@ -82,7 +82,7 @@ public static function defaultProvider(array $config = []) $configProviders[] = self::fallback(); $memo = self::memoize( - call_user_func_array('self::chain', $configProviders) + call_user_func_array([ConfigurationProvider::class, 'chain'], $configProviders) ); if (isset($config['sts_regional_endpoints']) @@ -160,7 +160,7 @@ public static function ini( return self::reject("'$profile' not found in config file"); } if (!isset($data[$profile][self::INI_ENDPOINTS_TYPE])) { - return self::reject("Required STS regional endpoints config values + return self::reject("Required STS regional endpoints config values not present in INI profile '{$profile}' ({$filename})"); }