crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-09 09:55:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix windows test failures: path separators and arch normalization

Browse Source
This commit is contained in:
Luther Monson
2026-05-19 21:59:18 -07:00
parent 3f7bad75ec
commit 52d234f1f4
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/StaticPHP/Artifact/Artifact.php
View File

@@ -327,7 +327,7 @@ class Artifact
public function getSourceRoot(): string public function getSourceRoot(): string
{ {
if (isset($this->config['metadata']['source-root'])) { if (isset($this->config['metadata']['source-root'])) {
return $this->getSourceDir() . '/' . ltrim($this->config['metadata']['source-root'], '/'); return FileSystem::convertPath($this->getSourceDir() . '/' . ltrim($this->config['metadata']['source-root'], '/'));
} }
return $this->getSourceDir(); return $this->getSourceDir();
} }

4
src/StaticPHP/Artifact/ArtifactCache.php
View File

@@ -223,8 +223,8 @@ class ArtifactCache
public function getCacheFullPath(array $cache_info): string public function getCacheFullPath(array $cache_info): string
{ {
return match ($cache_info['cache_type']) { return match ($cache_info['cache_type']) {
'archive', 'file' => DOWNLOAD_PATH . '/' . $cache_info['filename'], 'archive', 'file' => FileSystem::convertPath(DOWNLOAD_PATH . '/' . $cache_info['filename']),
'git' => DOWNLOAD_PATH . '/' . $cache_info['dirname'], 'git' => FileSystem::convertPath(DOWNLOAD_PATH . '/' . $cache_info['dirname']),
'local' => $cache_info['dirname'], // local dirname is absolute path 'local' => $cache_info['dirname'], // local dirname is absolute path
default => throw new SPCInternalException("Unknown cache type: {$cache_info['cache_type']}"), default => throw new SPCInternalException("Unknown cache type: {$cache_info['cache_type']}"),
}; };

15
tests/StaticPHP/Artifact/ArtifactTest.php
View File

@@ -254,11 +254,16 @@ class ArtifactTest extends TestCase
ApplicationContext::initialize(); ApplicationContext::initialize();
ApplicationContext::set(ArtifactCache::class, $cache); ApplicationContext::set(ArtifactCache::class, $cache);
// Use a platform-appropriate absolute path: a Unix-style /tmp/... isn't
// absolute on Windows (no drive letter), so the test would otherwise
// fall through into the SOURCE_PATH-prefixed branch on Windows.
$extract = DIRECTORY_SEPARATOR === '\\' ? 'C:\tmp\my-pkg-extract' : '/tmp/my-pkg-extract';
$artifact = new Artifact('my-pkg', [ $artifact = new Artifact('my-pkg', [
'source' => ['type' => 'url', 'url' => 'https://example.com/file.tar.gz', 'extract' => '/tmp/my-pkg-extract'], 'source' => ['type' => 'url', 'url' => 'https://example.com/file.tar.gz', 'extract' => $extract],
]); ]);
$expected = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, '/tmp/my-pkg-extract'); $expected = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $extract);
$this->assertSame($expected, $artifact->getSourceDir()); $this->assertSame($expected, $artifact->getSourceDir());
} }
@@ -703,11 +708,7 @@ class ArtifactTest extends TestCase
'Windows' => 'windows', 'Windows' => 'windows',
default => 'linux', default => 'linux',
}; };
$arch = php_uname('m'); return "{$os}-" . arch2gnu(php_uname('m'));
if ($arch === 'arm64') {
$arch = 'aarch64';
}
return "{$os}-{$arch}";
} }
private function injectArtifactConfig(string $name, array $config): void private function injectArtifactConfig(string $name, array $config): void