[4.0] Patch tester enhancement for joomla4 (pre-compiled diff)

administrator/components/com_patchtester/PatchTester/Controller/ResetController.php

@@ -42,43 +42,61 @@ public function execute()
 			$testsModel = new TestsModel(null, Factory::getDbo());
 
 			// Check the applied patches in the database first
-			$appliedPatches = $testsModel->getAppliedPatches();
+			$appliedPatches = $pullModel->getPatchesDividedInProcs();
 
-			if (count($appliedPatches))
+			if (count($appliedPatches['git']))
 			{
 				$revertErrored = false;
 
 				// Let's try to cleanly revert all applied patches
-				foreach ($appliedPatches as $patch)
+				foreach ($appliedPatches['git'] as $patch)
 				{
 					try
 					{
-						$pullModel->revert($patch->id);
+						$pullModel->revertWithGitHub($patch->id);
 					}
 					catch (\RuntimeException $e)
 					{
 						$revertErrored = true;
 					}
 				}
+			}
 
-				// If we errored out reverting patches, we'll need to truncate the table
-				if ($revertErrored)
+			if (count($appliedPatches['ci']))
+			{
+				$revertErrored = false;
+
+				// Let's try to cleanly revert all applied patches with ci
+				foreach ($appliedPatches['ci'] as $patch)
 				{
 					try
 					{
-						$testsModel->truncateTable();
+						$pullModel->revertWithCIServer($patch->insert_id);
 					}
 					catch (\RuntimeException $e)
 					{
-						$hasErrors = true;
-
-						$this->getApplication()->enqueueMessage(
-							Text::sprintf('COM_PATCHTESTER_ERROR_TRUNCATING_PULLS_TABLE', $e->getMessage()), 'error'
-						);
+						$revertErrored = true;
 					}
 				}
 			}
 
+			// If we errored out reverting patches, we'll need to truncate the table
+			if ($revertErrored)
+			{
+				try
+				{
+					$testsModel->truncateTable();
+				}
+				catch (\RuntimeException $e)
+				{
+					$hasErrors = true;
+
+					$this->getApplication()->enqueueMessage(
+						Text::sprintf('COM_PATCHTESTER_ERROR_TRUNCATING_PULLS_TABLE', $e->getMessage()), 'error'
+					);
+				}
+			}
+
 			// Now truncate the pulls table
 			try
 			{

administrator/components/com_patchtester/PatchTester/Helper.php

@@ -62,4 +62,34 @@ public static function initializeGithub()
 
 		return new GitHub($options);
 	}
+
+	/**
+	 * Initializes the CI Settings
+	 *
+	 * @return  Registry
+	 *
+	 * @since   3.0
+	 */
+	public static function initializeCISettings()
+	{
+		$params = ComponentHelper::getParams('com_patchtester');
+
+		$options = new Registry;
+
+		// Set CI server address for the request
+		$options->set('server.url', $params->get('ci_server', 'https://ci.joomla.org:444'));
+
+		// Set name of the zip archive
+		$options->set('zip.name', 'build.zip');
+		$options->set('zip.log.name', 'deleted_files.log');
+
+		// Set temp archive for extracting and downloading files
+		$options->set('folder.temp', Factory::getConfig()->get('tmp_path'));
+		$options->set('folder.backups', JPATH_COMPONENT . '/backups');
+
+		// Set full url for addressing the file
+		$options->set('zip.url', $options->get('server.url') . '/artifacts/joomla/joomla-cms/4.0-dev/%s/patchtester/' . $options->get('zip.name'));
+
+		return $options;
+	}
 }