diff --git a/app/config/site-templates.php b/app/config/site-templates.php index 9e0b36053e..52d2817c3d 100644 --- a/app/config/site-templates.php +++ b/app/config/site-templates.php @@ -27,7 +27,7 @@ const TEMPLATE_FRAMEWORKS = [ 'outputDirectory' => './build', 'buildRuntime' => 'node-22', 'adapter' => 'ssr', - 'fallbackFile' => null, + 'fallbackFile' => '', ], 'NEXTJS' => [ 'key' => 'nextjs', @@ -37,7 +37,7 @@ const TEMPLATE_FRAMEWORKS = [ 'outputDirectory' => './.next', 'buildRuntime' => 'node-22', 'adapter' => 'ssr', - 'fallbackFile' => null, + 'fallbackFile' => '', ], 'NUXT' => [ 'key' => 'nuxt', @@ -47,7 +47,7 @@ const TEMPLATE_FRAMEWORKS = [ 'outputDirectory' => './.output', 'buildRuntime' => 'node-22', 'adapter' => 'ssr', - 'fallbackFile' => null, + 'fallbackFile' => '', ], 'REMIX' => [ 'key' => 'remix', @@ -57,7 +57,7 @@ const TEMPLATE_FRAMEWORKS = [ 'outputDirectory' => './build', 'buildRuntime' => 'node-22', 'adapter' => 'ssr', - 'fallbackFile' => null, + 'fallbackFile' => '', ], 'ASTRO' => [ 'key' => 'astro', @@ -67,7 +67,7 @@ const TEMPLATE_FRAMEWORKS = [ 'outputDirectory' => './dist', 'buildRuntime' => 'node-22', 'adapter' => 'ssr', - 'fallbackFile' => null, + 'fallbackFile' => '', ], 'FLUTTER' => [ 'key' => 'flutter', @@ -77,7 +77,7 @@ const TEMPLATE_FRAMEWORKS = [ 'outputDirectory' => './build/web', 'buildRuntime' => 'flutter-3.24', 'adapter' => 'static', - 'fallbackFile' => null, + 'fallbackFile' => '', ], 'OTHER' => [ 'key' => 'other', diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php index c5310378b9..e970b6213d 100644 --- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php +++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php @@ -39,8 +39,6 @@ use Utopia\Storage\Device\Local; use Utopia\System\System; use Utopia\VCS\Adapter\Git\GitHub; -use function PHPUnit\Framework\isEmpty; - class Builds extends Action { public static function getName(): string @@ -710,7 +708,7 @@ class Builds extends Action throw new \Exception('Build size should be less than ' . number_format($buildSizeLimit / 1048576, 2) . ' MBs.'); } - if ($resource->getCollection() === 'sites' && isEmpty($resource->getAttribute('adapter'))) { + if ($resource->getCollection() === 'sites' && empty($resource->getAttribute('adapter'))) { $listFilesCommand = "cd /usr/local/build && cd " . \escapeshellarg($resource->getAttribute('outputDirectory')) . " && find . -name 'node_modules' -prune -o -type f -print"; $command = $executor->createCommand( deploymentId: $deployment->getId(), diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php index fd5f9e7e66..12721e3dc8 100644 --- a/tests/e2e/Services/Sites/SitesCustomServerTest.php +++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php @@ -64,7 +64,7 @@ class SitesCustomServerTest extends Scope */ $site = $this->createSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -112,7 +112,7 @@ class SitesCustomServerTest extends Scope 'framework' => 'other', 'buildRuntime' => 'node-22', 'outputDirectory' => './', - 'fallbackFile' => null, + 'fallbackFile' => '', ]); $this->assertNotEmpty($siteId); @@ -178,7 +178,7 @@ class SitesCustomServerTest extends Scope { $site = $this->createSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -531,7 +531,7 @@ class SitesCustomServerTest extends Scope */ $siteId = $this->setupSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -611,7 +611,7 @@ class SitesCustomServerTest extends Scope */ $siteId2 = $this->setupSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site 2', 'outputDirectory' => './', @@ -667,7 +667,7 @@ class SitesCustomServerTest extends Scope { $siteId = $this->setupSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -700,7 +700,7 @@ class SitesCustomServerTest extends Scope { $site = $this->createSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -717,7 +717,7 @@ class SitesCustomServerTest extends Scope $site = $this->updateSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site Updated', 'outputDirectory' => './', @@ -818,7 +818,7 @@ class SitesCustomServerTest extends Scope { $siteId = $this->setupSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -879,7 +879,7 @@ class SitesCustomServerTest extends Scope { $siteId = $this->setupSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -931,7 +931,7 @@ class SitesCustomServerTest extends Scope { $siteId = $this->setupSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -976,7 +976,7 @@ class SitesCustomServerTest extends Scope { $siteId = $this->setupSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -1155,7 +1155,7 @@ class SitesCustomServerTest extends Scope { $siteId = $this->setupSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -1206,7 +1206,7 @@ class SitesCustomServerTest extends Scope { $siteId = $this->setupSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -1223,7 +1223,7 @@ class SitesCustomServerTest extends Scope // Change the function specs $site = $this->updateSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -1240,7 +1240,7 @@ class SitesCustomServerTest extends Scope // Change the specs to 1vcpu 512mb $site = $this->updateSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -1260,7 +1260,7 @@ class SitesCustomServerTest extends Scope $site = $this->updateSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -1280,7 +1280,7 @@ class SitesCustomServerTest extends Scope { $siteId = $this->setupSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -1324,7 +1324,7 @@ class SitesCustomServerTest extends Scope { $siteId = $this->setupSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'outputDirectory' => './', @@ -1830,7 +1830,7 @@ class SitesCustomServerTest extends Scope { $siteId = $this->setupSite([ 'buildRuntime' => 'node-22', - 'fallbackFile' => null, + 'fallbackFile' => '', 'framework' => 'other', 'name' => 'Test Site', 'adapter' => 'static',