X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=vendor%2Fdrush%2Fdrush%2Fsrc%2FCommands%2Fcore%2FUpdateDBCommands.php;fp=vendor%2Fdrush%2Fdrush%2Fsrc%2FCommands%2Fcore%2FUpdateDBCommands.php;h=3ca187562a964b44252320edd681acacf13b5ee3;hp=2e3299a4ed5ab48c9b56feda2abe5a3a10dcdf94;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hpb=74df008bdbb3a11eeea356744f39b802369bda3c

diff --git a/vendor/drush/drush/src/Commands/core/UpdateDBCommands.php b/vendor/drush/drush/src/Commands/core/UpdateDBCommands.php
index 2e3299a4e..3ca187562 100644
--- a/vendor/drush/drush/src/Commands/core/UpdateDBCommands.php
+++ b/vendor/drush/drush/src/Commands/core/UpdateDBCommands.php
@@ -16,6 +16,8 @@ class UpdateDBCommands extends DrushCommands
 {
     protected $cache_clear;
 
+    protected $maintenanceModeOriginalState;
+
     /**
      * Apply any database updates required (as with running update.php).
      *
@@ -78,6 +80,8 @@ class UpdateDBCommands extends DrushCommands
      * @bootstrap full
      * @kernel update
      * @aliases entup,entity-updates
+     * @usage drush updatedb:status --entity-updates | grep entity-update
+     *   Use updatedb:status to detect pending updates.
      *
      */
     public function entityUpdates($options = ['cache-clear' => true])
@@ -90,7 +94,9 @@ class UpdateDBCommands extends DrushCommands
             throw new \Exception('Entity updates not run.');
         }
 
-        drush_drupal_cache_clear_all();
+        if ($options['cache-clear']) {
+            drush_drupal_cache_clear_all();
+        }
 
         $this->logger()->success(dt('Finished performing updates.'));
     }
@@ -164,6 +170,11 @@ class UpdateDBCommands extends DrushCommands
     {
         $function = $module . '_update_' . $number;
 
+        // Disable config entity overrides.
+        if (!defined('MAINTENANCE_MODE')) {
+            define('MAINTENANCE_MODE', 'update');
+        }
+
         // If this update was aborted in a previous step, or has a dependency that
         // was aborted in a previous step, go no further.
         if (!empty($context['results']['#abort']) && array_intersect($context['results']['#abort'], array_merge($dependency_map, [$function]))) {
@@ -184,9 +195,12 @@ class UpdateDBCommands extends DrushCommands
                 $this->logger()->notice("Update started: $function");
                 $ret['results']['query'] = $function($context['sandbox']);
                 $ret['results']['success'] = true;
-            } // @TODO We may want to do different error handling for different exception
-            // types, but for now we'll just print the message.
-            catch (\Exception $e) {
+            } catch (\Throwable $e) {
+                // PHP 7 introduces Throwable, which covers both Error and Exception throwables.
+                $ret['#abort'] = ['success' => false, 'query' => $e->getMessage()];
+                $this->logger()->error($e->getMessage());
+            } catch (\Exception $e) {
+                // In order to be compatible with PHP 5 we also catch regular Exceptions.
                 $ret['#abort'] = ['success' => false, 'query' => $e->getMessage()];
                 $this->logger()->error($e->getMessage());
             }
@@ -246,6 +260,11 @@ class UpdateDBCommands extends DrushCommands
     {
         $ret = [];
 
+        // Disable config entity overrides.
+        if (!defined('MAINTENANCE_MODE')) {
+            define('MAINTENANCE_MODE', 'update');
+        }
+
         // If this update was aborted in a previous step, or has a dependency that was
         // aborted in a previous step, go no further.
         if (!empty($context['results']['#abort'])) {
@@ -376,10 +395,10 @@ class UpdateDBCommands extends DrushCommands
         ];
         batch_set($batch);
 
-        $maintenance_mode_original_state = \Drupal::service('state')->get('system.maintenance_mode');
+        // See updateFinished() for the restore of maint mode.
+        $this->maintenanceModeOriginalState = \Drupal::service('state')->get('system.maintenance_mode');
         \Drupal::service('state')->set('system.maintenance_mode', true);
         $result = drush_backend_batch_process('updatedb:batch-process');
-        \Drupal::service('state')->set('system.maintenance_mode', $maintenance_mode_original_state);
 
         $success = false;
         if (!is_array($result)) {
@@ -458,7 +477,7 @@ class UpdateDBCommands extends DrushCommands
     }
 
     /**
-     * Batch update callback, clears the cache if needed.
+     * Batch update callback, clears the cache if needed, and restores maint mode.
      *
      * @see \Drupal\system\Controller\DbUpdateController::batchFinished()
      * @see \Drupal\system\Controller\DbUpdateController::results()
@@ -474,6 +493,8 @@ class UpdateDBCommands extends DrushCommands
         } else {
             drupal_flush_all_caches();
         }
+
+        \Drupal::service('state')->set('system.maintenance_mode', $this->maintenanceModeOriginalState);
     }
 
     /**
@@ -577,10 +598,11 @@ class UpdateDBCommands extends DrushCommands
                 'finished' => [$this, 'updateFinished'],
             ];
             batch_set($batch);
-            $maintenance_mode_original_state = \Drupal::service('state')->get('system.maintenance_mode');
+
+            // See updateFinished() for the restore of maint mode.
+            $this->maintenanceModeOriginalState = \Drupal::service('state')->get('system.maintenance_mode');
             \Drupal::service('state')->set('system.maintenance_mode', true);
             drush_backend_batch_process();
-            \Drupal::service('state')->set('system.maintenance_mode', $maintenance_mode_original_state);
         } else {
             $this->logger()->success(dt("No entity schema updates required"));
         }