Skip to content

Commit 4582154

Browse files
committed
Merge branch 'main' of https://github.com/utopia-php/migration into joins
# Conflicts: # composer.json # composer.lock
2 parents ac60b6d + c5c7544 commit 4582154

26 files changed

Lines changed: 1511 additions & 66 deletions

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"ext-curl": "*",
2727
"ext-openssl": "*",
2828
"appwrite/appwrite": "19.*",
29-
"utopia-php/database": "dev-joins8 as 5.0.0",
30-
"utopia-php/storage": "0.18.*",
29+
"utopia-php/database": "dev-joins8 as 5.3.1",
30+
"utopia-php/storage": "1.0.*",
3131
"utopia-php/dsn": "0.2.*",
3232
"halaxa/json-machine": "^1.2"
3333
},

composer.lock

Lines changed: 47 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Migration/Cache.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Utopia\Migration\Resources\Database\Row;
88
use Utopia\Migration\Resources\Database\Table;
99
use Utopia\Migration\Resources\Functions\Deployment;
10+
use Utopia\Migration\Resources\Sites\Deployment as SiteDeployment;
1011
use Utopia\Migration\Resources\Storage\File;
1112

1213
/**
@@ -69,6 +70,11 @@ public function resolveResourceCacheKey(Resource $resource): string
6970
$keys[] = $resource->getFunction()->getSequence();
7071
break;
7172

73+
case Resource::TYPE_SITE_DEPLOYMENT:
74+
/** @var SiteDeployment $resource */
75+
$keys[] = $resource->getSite()->getSequence();
76+
break;
77+
7278
default:
7379
break;
7480
}
@@ -99,8 +105,8 @@ public function add(Resource $resource): void
99105
return;
100106
}
101107

102-
if ($resource->getName() == Resource::TYPE_FILE || $resource->getName() == Resource::TYPE_DEPLOYMENT) {
103-
/** @var File|Deployment $resource */
108+
if ($resource->getName() == Resource::TYPE_FILE || $resource->getName() == Resource::TYPE_DEPLOYMENT || $resource->getName() == Resource::TYPE_SITE_DEPLOYMENT) {
109+
/** @var File|Deployment|SiteDeployment $resource */
104110
$resource->setData(''); // Prevent Memory Leak
105111
}
106112

0 commit comments

Comments
 (0)