Mirrors/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-02-20 19:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge b3e188e3de into d798859acd

Browse Source
This commit is contained in:
Jeremy Gonyea 2025-02-08 07:15:28 +08:00 committed by GitHub
commit 4f617c0aa9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -38,8 +38,9 @@ Icon?
Thumbs.db
*.swp
# phpstorm
# IDE related
.idea/*
.vscode/*
# testing stuff
tests/_output/*

32
system/src/Grav/Common/GPM/Installer.php
View File

@ -329,17 +329,17 @@ class Installer
}
/**
* Uninstalls one or more given package
* Uninstalls one or more given packages
*
* @param string $path The slug of the package(s)
* @param string $path The path of the package(s)
* @param array $options Options to use for uninstalling
* @return bool True if everything went fine, False otherwise.
*/
public static function uninstall($path, $options = [])
{
$options = array_merge(self::$options, $options);
if (!self::isValidDestination($path, $options['exclude_checks'])
) {
$config_folder_paths = false;
if (!self::isValidDestination($path, $options['exclude_checks'])) {
return false;
}
@ -359,7 +359,29 @@ class Installer
}
}
$result = Folder::delete($path);
// Find corresponding config yaml file for the package.
$slug = end(explode(DS, $path));
$grav = Grav::instance();
$gpm = new GPM();
$locator = Grav::instance()['locator'];
$package = $gpm->findPackage($slug);
if ($package){
$package_type = $package->package_type;
$config_folder_paths = $locator->findResource('config://' . $package_type . '/' . $slug . '.yaml');
}
if (false !== $config_folder_paths) {
$config_result = unlink($config_folder_paths);
} else {
$config_result = true;
}
// Delete package folder.
$folder_result = Folder::delete($path);
$result = ($folder_result && $config_result);
self::$message = '';
if ($result && $installer && method_exists($installer, 'postUninstall')) {