Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-10-26 07:56:07 +01:00
Code Issues Packages Projects Releases Activity

preserver root files

Browse Source
This commit is contained in:
Andy Miller
2025-10-16 23:17:34 -06:00
parent 42e37c1d02
commit e6de9db77e
1 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
system/src/Grav/Common/Upgrade/SafeUpgradeService.php
View File

@@ -171,6 +171,7 @@ class SafeUpgradeService
// Ensure ignored directories are replaced with live copies.
$this->hydrateIgnoredDirectories($packagePath, $ignores);
$this->carryOverRootFiles($packagePath, $ignores);
$manifest = $this->buildManifest($stageId, $targetVersion, $packagePath, $backupPath);
$manifestPath = $stagePath . DIRECTORY_SEPARATOR . 'manifest.json';
@@ -422,6 +423,57 @@ class SafeUpgradeService
}
}
/**
* Carry over non-dot root files that are absent from the staged package.
*
* @param string $packagePath
* @param array<string> $ignores
* @return void
*/
private function carryOverRootFiles(string $packagePath, array $ignores): void
{
$strategic = $ignores ?: $this->ignoredDirs;
$skip = array_map(static function ($value) {
return trim((string)$value, '/');
}, $strategic);
$skip = array_filter($skip, static function ($value) {
return $value !== '';
});
$skip = array_values(array_unique($skip));
$iterator = new DirectoryIterator($this->rootPath);
foreach ($iterator as $entry) {
if ($entry->isDot()) {
continue;
}
$name = $entry->getFilename();
if ($name === '' || $name[0] === '.') {
continue;
}
if (in_array($name, $skip, true)) {
continue;
}
$target = $packagePath . DIRECTORY_SEPARATOR . $name;
if (file_exists($target)) {
continue;
}
$source = $entry->getPathname();
Folder::create(dirname($target));
if ($entry->isDir() && !$entry->isLink()) {
Folder::rcopy($source, $target, true);
} elseif ($entry->isFile()) {
copy($source, $target);
} elseif ($entry->isLink()) {
@symlink(readlink($source), $target);
}
}
}
/**
* Build manifest metadata for a staged upgrade.
*