Address comments on #2492

.github/workflows/3x.yml

@@ -58,6 +58,8 @@ jobs:
     env:
       TERMINUS_TOKEN: ${{ secrets.TERMINUS_TOKEN }}
       TERMINUS_SITE: ${{ secrets.TERMINUS_SITE }}
+      TERMINUS_SITE_WP: ${{ secrets.TERMINUS_SITE_WP }}
+      TERMINUS_SITE_WP_NETWORK: ${{ secrets.TERMINUS_SITE_WP_NETWORK }}
       TERMINUS_ORG: ${{ secrets.TERMINUS_ORG }}
       TERMINUS_BASE_DIR: ${{ secrets.TERMINUS_BASE_DIR }}
       TERMINUS_PLUGINS_DIR: ${{ secrets.TERMINUS_PLUGINS_DIR }}

src/Collections/TerminusCollection.php

@@ -109,8 +109,16 @@ public function fetch()
                     'type' => gettype($model_data),
                     'bad_data' => $bad_data
                 ];
-                $this->logger->error($error_message, $context);
-                break;
+
+                // verbose logging for debugging
+                $this->logger->debug($error_message, $context);
+
+                // less information for more user-facing messages, but a problem has occurred and we're skipping this
+                // item so we should still surface a user-facing message
+                $this->logger->warn("Model data missing for {id}", ['id' => $id,]);
+
+                // skip this item since it lacks useful data
+                continue;
             }
             if (!isset($model_data->id)) {
                 $model_data->id = $id;

src/Commands/StructuredListTrait.php

@@ -93,6 +93,9 @@ private function addDatetimeRenderer(AbstractStructuredList $list, array $date_a
         $list->addRendererFunction(
             function ($key, $cell_data) use ($config, $date_attributes) {
                 if (!is_numeric($key) && in_array($key, $date_attributes)) {
+                    if (empty($cell_data)) {
+                        return '-';
+                    }
                     return $config->formatDatetime($cell_data);
                 }
                 return $cell_data;

src/Models/Environment.php

@@ -168,10 +168,15 @@ public function cloneDatabase(Environment $from_env, array $options = [])
         if (isset($options['updatedb'])) {
             $options['updatedb'] = (int)$options['updatedb'];
         }
-        $params = array_merge(
-            ['from_environment' => $from_env->getName(),],
-            $options
-        );
+        $params = [
+            'from_environment' => $from_env->getName(),
+            'updatedb' => $options['updatedb'] ?? 0,
+            'clear_cache' => $options['clear_cache'] ?? false,
+        ];
+        if (!empty($options['from_url']) && !empty($options['to_url'])) {
+            $params['wp_replace_siteurl']['from_url'] = $options['from_url'];
+            $params['wp_replace_siteurl']['to_url'] = $options['to_url'];
+        }
         return $this->getWorkflows()->create(
             'clone_database',
             compact('params')

src/Request/Request.php

@@ -244,6 +244,7 @@ private function createRetryDecider(): callable
                 }
             }
 
+            // It's been observed in the wild that sometimes $response is null.  Get a different error message in that case.
             if (is_object($response) && is_object($response->getBody()) && $response->getBody()->getContents() !== '') {
                 $error = $response->getBody()->getContents();
             } elseif (null !== $exception && '' != $exception->getMessage()) {

src/Terminus.php

@@ -296,6 +296,7 @@ private function addBuiltInCommandsAndHooks()
     {
         // List of all hooks and commands. Update via 'composer update-class-lists'
         $this->commands = [
+            'Consolidation\\Filter\\Hooks\\FilterHooks',
             'Pantheon\\Terminus\\Hooks\\Authorizer',
             'Pantheon\\Terminus\\Hooks\\RoleValidator',
             'Pantheon\\Terminus\\Hooks\\SiteEnvLookup',