diff --git a/administrator/components/com_patchtester/PatchTester/Model/PullModel.php b/administrator/components/com_patchtester/PatchTester/Model/PullModel.php index 69bcd6f..cfe8645 100644 --- a/administrator/components/com_patchtester/PatchTester/Model/PullModel.php +++ b/administrator/components/com_patchtester/PatchTester/Model/PullModel.php @@ -337,6 +337,12 @@ class PullModel extends AbstractModel // Write or create patch chain for correct order of patching $this->appendPatchChain($lastInserted, $id); + // On Joomla 4 or later, remove the autoloader file + if (version_compare(JVERSION, '4', 'ge') && file_exists(JPATH_LIBRARIES . '/autoload_psr4.php')) + { + File::delete(JPATH_LIBRARIES . '/autoload_psr4.php'); + } + // Change the media version $version = new Version; $version->refreshMediaVersion(); @@ -506,6 +512,12 @@ class PullModel extends AbstractModel $this->saveAppliedPatch($pull->number, $parsedFiles, $pull->head->sha); + // On Joomla 4 or later, remove the autoloader file + if (version_compare(JVERSION, '4', 'ge') && file_exists(JPATH_LIBRARIES . '/autoload_psr4.php')) + { + File::delete(JPATH_LIBRARIES . '/autoload_psr4.php'); + } + // Change the media version $version = new Version; $version->refreshMediaVersion(); @@ -713,6 +725,12 @@ class PullModel extends AbstractModel Folder::delete($backupsPath); + // On Joomla 4 or later, remove the autoloader file + if (version_compare(JVERSION, '4', 'ge') && file_exists(JPATH_LIBRARIES . '/autoload_psr4.php')) + { + File::delete(JPATH_LIBRARIES . '/autoload_psr4.php'); + } + // Change the media version $version = new Version; $version->refreshMediaVersion(); @@ -822,6 +840,12 @@ class PullModel extends AbstractModel } } + // On Joomla 4 or later, remove the autoloader file + if (version_compare(JVERSION, '4', 'ge') && file_exists(JPATH_LIBRARIES . '/autoload_psr4.php')) + { + File::delete(JPATH_LIBRARIES . '/autoload_psr4.php'); + } + // Change the media version $version = new Version; $version->refreshMediaVersion();