From f6aa9e8108c59862d1a8c7dac9b279ef545eb4c6 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 15 Apr 2021 19:13:29 +0200 Subject: [PATCH] fix: migration tests --- src/Appwrite/Migration/Migration.php | 8 ++++---- src/Appwrite/Migration/Version/V07.php | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php index bcfaae4726..a1370029a5 100644 --- a/src/Appwrite/Migration/Migration.php +++ b/src/Appwrite/Migration/Migration.php @@ -14,22 +14,22 @@ abstract class Migration /** * @var PDO */ - protected PDO $db; + protected $db; /** * @var int */ - protected int $limit = 50; + protected $limit = 50; /** * @var Document */ - protected Document $project; + protected $project; /** * @var Database */ - protected Database $projectDB; + protected $projectDB; /** * Migration constructor. diff --git a/src/Appwrite/Migration/Version/V07.php b/src/Appwrite/Migration/Version/V07.php index 0b97a83f80..7cd3b8fefd 100644 --- a/src/Appwrite/Migration/Version/V07.php +++ b/src/Appwrite/Migration/Version/V07.php @@ -26,10 +26,10 @@ class V07 extends Migration switch ($document->getAttribute('$collection')) { case Database::SYSTEM_COLLECTION_USERS: + /** + * Remove deprecated OAuth2 properties in the Users Documents. + */ foreach ($providers as $key => $provider) { - /** - * Remove deprecated OAuth2 properties in the Users Documents. - */ if (!empty($document->getAttribute('oauth2' . \ucfirst($key)))) { $document->removeAttribute('oauth2' . \ucfirst($key)); } @@ -37,17 +37,17 @@ class V07 extends Migration if (!empty($document->getAttribute('oauth2' . \ucfirst($key) . 'AccessToken'))) { $document->removeAttribute('oauth2' . \ucfirst($key) . 'AccessToken'); } - - /** - * Invalidate all Login Tokens, since they can't be migrated to the new structure. - * Reason for it is the missing distinction between E-Mail and OAuth2 tokens. - */ - $tokens = array_filter($document->getAttribute('tokens', []), function($token) { - return ($token->getAttribute('type') != Auth::TOKEN_TYPE_LOGIN); - }); - - $document->setAttribute('tokens', array_values($tokens)); } + + /** + * Invalidate all Login Tokens, since they can't be migrated to the new structure. + * Reason for it is the missing distinction between E-Mail and OAuth2 tokens. + */ + $tokens = array_filter($document->getAttribute('tokens', []), function ($token) { + return ($token->getAttribute('type') != Auth::TOKEN_TYPE_LOGIN); + }); + $document->setAttribute('tokens', array_values($tokens)); + break; }