ACMS-1861: review feedback changes.

acquia · Jun 23, 2023 · 7193da2 · 7193da2
1 parent 56d2cec
commit 7193da2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/modules/acquia_cms_common/src/Commands/AcmsCommands.php b/modules/acquia_cms_common/src/Commands/AcmsCommands.php
@@ -270,7 +270,7 @@ public function importSiteStudioPackages() {
   public function starterKit($filter = '', $options = [
     'project' => self::REQ,
     'format' => 'table',
-  ]): bool|string|array {
+  ]) {
     if ($starter_kit = $this->acmsUtilityService->getStarterKit()) {
       $data['starter-kit'] = $starter_kit;
       $result = new PropertyList($data);
@@ -286,7 +286,6 @@ function ($key, $cellData, FormatterOptions $options, $rowData) {
       return $result;
     }
     $this->output()->writeln('Starter-kit is not installed yet.');
-    return FALSE;
   }
 
 }
diff --git a/modules/acquia_cms_common/src/Services/ConfigImporterService.php b/modules/acquia_cms_common/src/Services/ConfigImporterService.php
@@ -210,7 +210,12 @@ public function doImport(StorageComparer $storage_comparer, DrushLoggerManager $
         $message = 'The import failed due to the following reasons:' . "\n";
         $message .= implode("\n", $config_importer->getErrors());
 
-        Error::logException('config_import', $e);
+        if (version_compare(\Drupal::VERSION, '10.1', '>=')) {
+          Error::logException('config_import', $e);
+        }
+        else {
+          watchdog_exception('config_import', $e);
+        }
         throw new \Exception($message);
       }
     }