Skip to content

Fix self callables #2518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stobrien89 merged 1 commit into from
Sep 9, 2022
Merged

Fix self callables #2518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/ClientSideMonitoring/ConfigurationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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})");
}

Expand Down Expand Up @@ -233,4 +233,4 @@ public static function unwrap($config)
throw new \InvalidArgumentException('Not a valid CSM configuration '
. 'argument.');
}
}
}
3 changes: 1 addition & 2 deletions src/Credentials/CredentialProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
);
Expand Down Expand Up @@ -900,4 +900,3 @@ public static function shouldUseEcs()
|| !empty($_SERVER[EcsCredentialProvider::ENV_FULL_URI]);
}
}

2 changes: 1 addition & 1 deletion src/DefaultsMode/ConfigurationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
6 changes: 3 additions & 3 deletions src/Endpoint/UseDualstackEndpoint/ConfigurationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down Expand Up @@ -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})");
}

Expand All @@ -170,4 +170,4 @@ public static function fallback($region)
return Promise\Create::promiseFor(new Configuration(false, $region));
};
}
}
}
6 changes: 3 additions & 3 deletions src/Endpoint/UseFipsEndpoint/ConfigurationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down Expand Up @@ -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})");
}

Expand Down Expand Up @@ -176,4 +176,4 @@ public static function fallback($region)
return Promise\Create::promiseFor($configuration);
};
}
}
}
4 changes: 2 additions & 2 deletions src/EndpointDiscovery/ConfigurationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down Expand Up @@ -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})");
}

Expand Down
2 changes: 1 addition & 1 deletion src/Retry/ConfigurationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
6 changes: 3 additions & 3 deletions src/S3/RegionalEndpoint/ConfigurationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down Expand Up @@ -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})");
}

Expand Down Expand Up @@ -192,4 +192,4 @@ public static function unwrap($config)
throw new \InvalidArgumentException('Not a valid S3 regional endpoint '
. 'configuration argument.');
}
}
}
6 changes: 3 additions & 3 deletions src/S3/UseArnRegion/ConfigurationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down Expand Up @@ -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})");
}

Expand Down Expand Up @@ -172,4 +172,4 @@ public static function fallback()
);
};
}
}
}
4 changes: 2 additions & 2 deletions src/Sts/RegionalEndpoints/ConfigurationProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down Expand Up @@ -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})");
}

Expand Down