fix: conflicts

This commit is contained in:
loks0n
2024-09-19 20:34:38 +01:00
parent cb66c9073c
commit 32657e22cc
2 changed files with 2 additions and 2 deletions
@@ -146,7 +146,7 @@ trait FunctionsBase
$code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
if (!file_exists($code)) {
Console::execute('cd ' . realpath(__DIR__ . "/../../../resources/functions") . "/$folder && tar --exclude code.tar.gz -czf code.tar.gz .", '', $this->stdout, $this->stderr);
Console::execute('cd ' . realpath(__DIR__ . "/../../../resources/functions") . "/$folder && tar --exclude code.tar.gz -czf code.tar.gz .", '', $this->output, $this->output);
}
if (filesize($code) > 1024 * 1024 * 5) {
throw new \Exception('Code package is too large. Use the chunked upload method instead.');
@@ -513,7 +513,7 @@ class FunctionsCustomServerTest extends Scope
$folder = 'php-large';
$code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
Console::execute('cd ' . realpath(__DIR__ . "/../../../resources/functions") . "/$folder && tar --exclude code.tar.gz -czf code.tar.gz .", '', $this->stdout, $this->stderr);
Console::execute('cd ' . realpath(__DIR__ . "/../../../resources/functions") . "/$folder && tar --exclude code.tar.gz -czf code.tar.gz .", '', $this->output, $this->output);
$chunkSize = 5 * 1024 * 1024;
$handle = @fopen($code, "rb");