Better error handling for update functions in wrong files (drush-ops#…

…4471) * Update UpdateDBCommands.php * Fix coding standards spacings * my_module.install not my_module.install.php
jcnventura · Jul 21, 2020 · e4c9087 · e4c9087
1 parent 458145d
commit e4c9087
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/Commands/core/UpdateDBCommands.php b/src/Commands/core/UpdateDBCommands.php
@@ -238,7 +238,10 @@ public static function updateDoOne($module, $number, array $dependency_map, Drus
             }
         } else {
             $ret['#abort'] = ['success' => false];
-            Drush::logger()->warning(dt('Update function @function not found', ['@function' => $function]));
+            Drush::logger()->warning(dt('Update function @function not found in file @filename', [
+                '@function' => $function,
+                '@filename' => "$module.install",
+            ]));
         }
 
         if (isset($context['sandbox']['#finished'])) {
@@ -300,7 +303,8 @@ public static function updateDoOnePostUpdate($function, DrushBatchContext $conte
         }
 
         list($module, $name) = explode('_post_update_', $function, 2);
-        module_load_include('php', $module, $module . '.post_update');
+        $filename = $module . '.post_update';
+        \Drupal::moduleHandler()->loadInclude($module, 'php', $filename);
         if (function_exists($function)) {
             if (empty($context['results'][$module][$name]['type'])) {
                 Drush::logger()->notice("Update started: $function");
@@ -327,8 +331,14 @@ public static function updateDoOnePostUpdate($function, DrushBatchContext $conte
                     'query' => t('%type: @message in %function (line %line of %file).', $variables),
                 ];
             }
+        } else {
+            $ret['#abort'] = ['success' => false];
+            Drush::logger()->warning(dt('Post update function @function not found in file @filename', [
+                '@function' => $function,
+                '@filename' => "$filename.php",
+            ]));
         }
-
+        
         if (isset($context['sandbox']['#finished'])) {
             $context['finished'] = $context['sandbox']['#finished'];
             unset($context['sandbox']['#finished']);