Merge pull request #1092 from TorstenDittmann/fix-migrate-0.8

fix: migration script to 0.8

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.
@@ -90,7 +90,7 @@ abstract class Migration
                             throw new Exception('Missing ID');
                         }
 
-                        if (!array_diff_assoc($new->getArrayCopy(), $old)) {
+                        if (!$this->check_diff_multi($new->getArrayCopy(), $old)) {
                             return;
                         }
 
@@ -112,6 +112,33 @@ abstract class Migration
         }
     }
 
+    public function check_diff_multi($array1, $array2){
+        $result = array();
+    
+        foreach($array1 as $key => $val) {
+            if(is_array($val) && isset($array2[$key])) {
+                $tmp = $this->check_diff_multi($val, $array2[$key]);
+                if($tmp) {
+                    $result[$key] = $tmp;
+                }
+            }
+            elseif(!isset($array2[$key])) {
+                $result[$key] = null;
+            }
+            elseif($val !== $array2[$key]) {
+                $result[$key] = $array2[$key];
+            }
+    
+            if(isset($array2[$key])) {
+                unset($array2[$key]);
+            }
+        }
+    
+        $result = array_merge($result, $array2);
+    
+        return $result;
+    }
+
     /**
      * Executes migration for set project.
      */

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,16 @@ 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;
         }