Commit e005518e authored by csmdgl's avatar csmdgl Committed by Conrad Lara
Browse files

Issue #3273801 by awm, csmdgl: Call to a member function getKeyValue() on null... 

Issue #3273801 by awm, csmdgl: Call to a member function getKeyValue() on null in Drupal\s3fs\S3fsService->getAmazonS3Client()
parent e3a3c7c0

src/S3fsService.php

+4 −2
Original line number Diff line number Diff line
@@ -268,16 +268,18 @@ class S3fsService implements S3fsServiceInterface { 


      if ($noKeyInSettings && $this->moduleHandler->moduleExists('key')) {

        if (!$access_key && !empty($config['keymodule']['access_key_name'])) {

          /** @var \Drupal\key\KeyInterface|NULL $key */

          $key = \Drupal::service('key.repository')->getKey($config['keymodule']['access_key_name']);

          $key_value = $key->getKeyValue();

          $key_value = $key ? $key->getKeyValue() : '';

          if (!empty($key_value)) {

            $access_key = $key_value;

          }

        }



        if (!$secret_key && !empty($config['keymodule']['secret_key_name'])) {

          /** @var \Drupal\key\KeyInterface|NULL $key */

          $key = \Drupal::service('key.repository')->getKey($config['keymodule']['secret_key_name']);

          $key_value = $key->getKeyValue();

          $key_value = $key ? $key->getKeyValue() : '';

          if (!empty($key_value)) {

            $secret_key = $key_value;

          }