summaryrefslogtreecommitdiff
path: root/vendor/aws/aws-sdk-php/src/Token/ParsesIniTrait.php
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/aws/aws-sdk-php/src/Token/ParsesIniTrait.php')
-rw-r--r--vendor/aws/aws-sdk-php/src/Token/ParsesIniTrait.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/vendor/aws/aws-sdk-php/src/Token/ParsesIniTrait.php b/vendor/aws/aws-sdk-php/src/Token/ParsesIniTrait.php
index 64afdb5..b96a6d9 100644
--- a/vendor/aws/aws-sdk-php/src/Token/ParsesIniTrait.php
+++ b/vendor/aws/aws-sdk-php/src/Token/ParsesIniTrait.php
@@ -9,15 +9,15 @@ trait ParsesIniTrait
private static function loadProfiles($filename)
{
$profileData = \Aws\parse_ini_file($filename, true, INI_SCANNER_RAW);
-
$configFilename = self::getHomeDir() . '/.aws/config';
- $configProfileData = \Aws\parse_ini_file($configFilename, true, INI_SCANNER_RAW);
- foreach ($configProfileData as $name => $profile) {
+ if (is_readable($configFilename)) {
+ $configProfiles = \Aws\parse_ini_file($configFilename, true, INI_SCANNER_RAW);
+ $profileData = array_merge($configProfiles, $profileData);
+ }
+ foreach ($profileData as $name => $profile) {
// standardize config profile names
$name = str_replace('profile ', '', $name);
- if (!isset($profileData[$name])) {
- $profileData[$name] = $profile;
- }
+ $profileData[$name] = $profile;
}
return $profileData;