Replace $_GET references with $request in Update classes

[friendica.git] / src / Core / Update.php

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 45043811834a40647a86fb4af25f75aea5519228..e5ee587dc1ca5adfa4a2d21d4712638ce55034fd 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -54,7 +54,7 @@ class Update
                }
 
                // Don't check the status if the last update was failed
-               if (DI::config()->get('system', 'update', Update::SUCCESS, true) == Update::FAILED) {
+               if (DI::config()->get('system', 'update', Update::SUCCESS) == Update::FAILED) {
                        return;
                }
 
@@ -119,7 +119,7 @@ class Update
                        DI::lock()->release('dbupdate', true);
                }
 
-               $build = DI::config()->get('system', 'build', null, true);
+               $build = DI::config()->get('system', 'build', null);
 
                if (empty($build) || ($build > DB_UPDATE_VERSION)) {
                        $build = DB_UPDATE_VERSION - 1;
@@ -132,7 +132,7 @@ class Update
                        $stored = intval($build);
                        $current = intval(DB_UPDATE_VERSION);
                        if ($stored < $current || $force) {
-                               DI::config()->load('database');
+                               DI::config()->reload();
 
                                // Compare the current structure with the defined structure
                                // If the Lock is acquired, never release it automatically to avoid double updates
@@ -141,7 +141,7 @@ class Update
                                        Logger::notice('Update starting.', ['from' => $stored, 'to' => $current]);
 
                                        // Checks if the build changed during Lock acquiring (so no double update occurs)
-                                       $retryBuild = DI::config()->get('system', 'build', null, true);
+                                       $retryBuild = DI::config()->get('system', 'build', null);
                                        if ($retryBuild !== $build) {
                                                Logger::notice('Update already done.', ['from' => $stored, 'to' => $current]);
                                                DI::lock()->release('dbupdate');
@@ -160,8 +160,10 @@ class Update
                                                        Logger::warning('Pre update failed', ['version' => $version]);
                                                        DI::config()->set('system', 'update', Update::FAILED);
                                                        DI::lock()->release('dbupdate');
-                                                       DI::config()->set('system', 'maintenance', 0);
-                                                       DI::config()->set('system', 'maintenance_reason', '');
+                                                       DI::config()->beginTransaction()
+                                                                               ->set('system', 'maintenance', false)
+                                                                               ->delete('system', 'maintenance_reason')
+                                                                               ->commit();
                                                        return $r;
                                                } else {
                                                        Logger::notice('Pre update executed.', ['version' => $version]);
@@ -181,8 +183,10 @@ class Update
                                                Logger::error('Update ERROR.', ['from' => $stored, 'to' => $current, 'retval' => $retval]);
                                                DI::config()->set('system', 'update', Update::FAILED);
                                                DI::lock()->release('dbupdate');
-                                               DI::config()->set('system', 'maintenance', 0);
-                                               DI::config()->set('system', 'maintenance_reason', '');
+                                               DI::config()->beginTransaction()
+                                                                       ->set('system', 'maintenance', false)
+                                                                       ->delete('system', 'maintenance_reason')
+                                                                       ->commit();
                                                return $retval;
                                        } else {
                                                Logger::notice('Database structure update finished.', ['from' => $stored, 'to' => $current]);
@@ -198,8 +202,10 @@ class Update
                                                        Logger::warning('Post update failed', ['version' => $version]);
                                                        DI::config()->set('system', 'update', Update::FAILED);
                                                        DI::lock()->release('dbupdate');
-                                                       DI::config()->set('system', 'maintenance', 0);
-                                                       DI::config()->set('system', 'maintenance_reason', '');
+                                                       DI::config()->beginTransaction()
+                                                                               ->set('system', 'maintenance', false)
+                                                                               ->delete('system', 'maintenance_reason')
+                                                                               ->commit();
                                                        return $r;
                                                } else {
                                                        DI::config()->set('system', 'build', $version);
@@ -210,8 +216,10 @@ class Update
                                        DI::config()->set('system', 'build', $current);
                                        DI::config()->set('system', 'update', Update::SUCCESS);
                                        DI::lock()->release('dbupdate');
-                                       DI::config()->set('system', 'maintenance', 0);
-                                       DI::config()->set('system', 'maintenance_reason', '');
+                                       DI::config()->beginTransaction()
+                                                               ->set('system', 'maintenance', false)
+                                                               ->delete('system', 'maintenance_reason')
+                                                               ->commit();
 
                                        Logger::notice('Update success.', ['from' => $stored, 'to' => $current]);
                                        if ($sendMail) {