Merge remote-tracking branch 'upstream/develop' into api-rework

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 85f407d36ce223e1a2d222f967bbf7a1918638ed..368b70b228bb26a76dcbbea9c0b1841e09873147 100644 (file)
--- a/update.php
+++ b/update.php
@@ -41,6 +41,7 @@
  */
 
 use Friendica\Core\Logger;
+use Friendica\Core\Storage\Capability\ICanReadFromStorage;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\Database;
@@ -54,8 +55,7 @@ use Friendica\Model\Notification;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Model\Profile;
-use Friendica\Model\Storage;
-use Friendica\Security\PermissionSet\Depository\PermissionSet;
+use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Worker\Delivery;
 
 // Post-update script of PR 5751
@@ -183,7 +183,7 @@ function update_1330()
 
        // set the name of the storage instead of the classpath as config
        if (!empty($currStorage)) {
-               /** @var Storage\IStorage $currStorage */
+               /** @var ICanReadFromStorage $currStorage */
                if (!DI::config()->set('storage', 'name', $currStorage::getName())) {
                        return Update::FAILED;
                }
@@ -989,7 +989,7 @@ function update_1434()
 
        // in case of an empty config, set "Database" as default storage backend
        if (empty($name)) {
-               DI::config()->set('storage', 'name', Storage\Database::getName());
+               DI::config()->set('storage', 'name', \Friendica\Core\Storage\Type\Database::getName());
        }
 
        // In case of a Using deprecated storage class value, set the right name for it