From db7e1f5ebb693b152e37e40a69be4f8daa2e4a87 Mon Sep 17 00:00:00 2001 From: waridrox Date: Wed, 6 Oct 2021 13:23:33 +0530 Subject: [PATCH] Fixed PSR issues in Migration library Signed-off-by: waridrox --- src/Appwrite/Migration/Migration.php | 28 ++++++++++++-------------- src/Appwrite/Migration/Version/V06.php | 4 +--- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php index 2ab1ce4fd3..aed2da3acb 100644 --- a/src/Appwrite/Migration/Migration.php +++ b/src/Appwrite/Migration/Migration.php @@ -52,7 +52,7 @@ abstract class Migration /** * Migration constructor. - * + * * @param PDO $pdo */ public function __construct(PDO $db) @@ -62,11 +62,11 @@ abstract class Migration /** * Set project for migration. - * + * * @param Document $project * @param Database $projectDB - * - * @return Migration + * + * @return Migration */ public function setProject(Document $project, Database $projectDB): Migration { @@ -78,7 +78,7 @@ abstract class Migration /** * Iterates through every document. - * + * * @param callable $callback */ public function forEachDocument(callable $callback): void @@ -98,7 +98,6 @@ abstract class Migration Console::log('Migrating: ' . $offset . ' / ' . $this->projectDB->getSum()); \Co\run(function () use ($all, $callback) { - foreach ($all as $document) { go(function () use ($document, $callback) { if (empty($document->getId()) || empty($document->getCollection())) { @@ -131,24 +130,23 @@ abstract class Migration } } - public function check_diff_multi($array1, $array2){ + public function check_diff_multi($array1, $array2) + { $result = array(); - foreach($array1 as $key => $val) { - if(is_array($val) && isset($array2[$key])) { + foreach ($array1 as $key => $val) { + if (is_array($val) && isset($array2[$key])) { $tmp = $this->check_diff_multi($val, $array2[$key]); - if($tmp) { + if ($tmp) { $result[$key] = $tmp; } - } - elseif(!isset($array2[$key])) { + } elseif (!isset($array2[$key])) { $result[$key] = null; - } - elseif($val !== $array2[$key]) { + } elseif ($val !== $array2[$key]) { $result[$key] = $array2[$key]; } - if(isset($array2[$key])) { + if (isset($array2[$key])) { unset($array2[$key]); } } diff --git a/src/Appwrite/Migration/Version/V06.php b/src/Appwrite/Migration/Version/V06.php index e4fbc77718..b28ce8ac2f 100644 --- a/src/Appwrite/Migration/Version/V06.php +++ b/src/Appwrite/Migration/Version/V06.php @@ -2,7 +2,6 @@ namespace Appwrite\Migration\Version; - use Utopia\App; use Utopia\CLI\Console; use Appwrite\Database\Database; @@ -35,8 +34,7 @@ class V06 extends Migration case Database::SYSTEM_COLLECTION_KEYS: if ($document->getAttribute('secret', null)) { $json = \json_decode($document->getAttribute('secret'), true); - if (is_array($json)) - { + if (is_array($json)) { Console::log('Secret already encrypted. Skipped: ' . $document->getId()); break; }